summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/runtime/GCActivityCallback.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/JavaScriptCore/runtime/GCActivityCallback.h')
-rw-r--r--Source/JavaScriptCore/runtime/GCActivityCallback.h22
1 files changed, 14 insertions, 8 deletions
diff --git a/Source/JavaScriptCore/runtime/GCActivityCallback.h b/Source/JavaScriptCore/runtime/GCActivityCallback.h
index 3522e6c8e..a7aec6a8d 100644
--- a/Source/JavaScriptCore/runtime/GCActivityCallback.h
+++ b/Source/JavaScriptCore/runtime/GCActivityCallback.h
@@ -52,14 +52,20 @@ public:
protected:
#if USE(CF)
- GCActivityCallback(JSGlobalData* globalData, CFRunLoopRef runLoop)
- : HeapTimer(globalData, runLoop)
+ GCActivityCallback(VM* vm, CFRunLoopRef runLoop)
+ : HeapTimer(vm, runLoop)
, m_enabled(true)
{
}
+#elif PLATFORM(EFL)
+ GCActivityCallback(VM* vm, bool flag)
+ : HeapTimer(vm)
+ , m_enabled(flag)
+ {
+ }
#else
- GCActivityCallback(JSGlobalData* globalData)
- : HeapTimer(globalData)
+ GCActivityCallback(VM* vm)
+ : HeapTimer(vm)
, m_enabled(true)
{
}
@@ -70,7 +76,7 @@ protected:
class DefaultGCActivityCallback : public GCActivityCallback {
public:
- static DefaultGCActivityCallback* create(Heap*);
+ static PassOwnPtr<DefaultGCActivityCallback> create(Heap*);
DefaultGCActivityCallback(Heap*);
@@ -84,7 +90,7 @@ public:
protected:
DefaultGCActivityCallback(Heap*, CFRunLoopRef);
#endif
-#if USE(CF) || PLATFORM(QT)
+#if USE(CF) || PLATFORM(QT) || PLATFORM(EFL)
protected:
void cancelTimer();
void scheduleTimer(double);
@@ -94,9 +100,9 @@ private:
#endif
};
-inline DefaultGCActivityCallback* DefaultGCActivityCallback::create(Heap* heap)
+inline PassOwnPtr<DefaultGCActivityCallback> DefaultGCActivityCallback::create(Heap* heap)
{
- return new DefaultGCActivityCallback(heap);
+ return adoptPtr(new DefaultGCActivityCallback(heap));
}
}