diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-03-14 14:11:02 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-18 17:25:46 +0100 |
| commit | a2e0d7c96a21cc48aa089938609669502cfdf407 (patch) | |
| tree | 7b05c790efb1d607cefcd009fffc8055a5320078 /Source/JavaScriptCore/runtime/GCActivityCallback.h | |
| parent | 597984021ca00fd98a0dfe2effd742c6e7bd4190 (diff) | |
| download | qtwebkit-a2e0d7c96a21cc48aa089938609669502cfdf407.tar.gz | |
[Qt] Implement GCActivityCallback
https://bugs.webkit.org/show_bug.cgi?id=103998
Reviewed by Simon Hausmann.
Source/JavaScriptCore:
Implements the activity triggered garbage collector.
* runtime/GCActivityCallback.cpp:
(JSC::DefaultGCActivityCallback::DefaultGCActivityCallback):
(JSC::DefaultGCActivityCallback::scheduleTimer):
(JSC::DefaultGCActivityCallback::cancelTimer):
* runtime/GCActivityCallback.h:
(GCActivityCallback):
(DefaultGCActivityCallback):
Source/WebCore:
Implements the activity triggered garbage collector,
and disables the timer based fallback.
* bindings/js/GCController.cpp:
(WebCore::GCController::GCController):
(WebCore::GCController::garbageCollectSoon):
* bindings/js/GCController.h:
(GCController):
Change-Id: Idd8f714e71871b3cc991f8d1866cdd271a47eff4
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@141114 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'Source/JavaScriptCore/runtime/GCActivityCallback.h')
| -rw-r--r-- | Source/JavaScriptCore/runtime/GCActivityCallback.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/runtime/GCActivityCallback.h b/Source/JavaScriptCore/runtime/GCActivityCallback.h index c112a7120..3522e6c8e 100644 --- a/Source/JavaScriptCore/runtime/GCActivityCallback.h +++ b/Source/JavaScriptCore/runtime/GCActivityCallback.h @@ -57,7 +57,7 @@ protected: , m_enabled(true) { } -# else +#else GCActivityCallback(JSGlobalData* globalData) : HeapTimer(globalData) , m_enabled(true) @@ -83,10 +83,12 @@ public: #if USE(CF) protected: DefaultGCActivityCallback(Heap*, CFRunLoopRef); - +#endif +#if USE(CF) || PLATFORM(QT) +protected: void cancelTimer(); void scheduleTimer(double); - + private: double m_delay; #endif |