webkitgtk-2.4.9webkitgtk-2.4.9

1 files changed, 7 insertions, 10 deletions

diff --git a/Source/JavaScriptCore/heap/HeapTimer.cpp b/Source/JavaScriptCore/heap/HeapTimer.cpp
index 15e5484db..1331b0ac0 100644
--- a/Source/JavaScriptCore/heap/HeapTimer.cpp
+++ b/Source/JavaScriptCore/heap/HeapTimer.cpp
@@ -26,11 +26,10 @@
 #include "config.h"
 #include "HeapTimer.h"
 
-#include "GCActivityCallback.h"
-#include "IncrementalSweeper.h"
+#include "APIShims.h"
 #include "JSObject.h"
 #include "JSString.h"
-#include "JSCInlines.h"
+
 #include <wtf/MainThread.h>
 #include <wtf/Threading.h>
 
@@ -63,7 +62,7 @@ HeapTimer::HeapTimer(VM* vm, CFRunLoopRef runLoop)
     m_context.info = &vm->apiLock();
     m_context.retain = retainAPILock;
     m_context.release = releaseAPILock;
-    m_timer = adoptCF(CFRunLoopTimerCreate(kCFAllocatorDefault, s_decade, s_decade, 0, 0, HeapTimer::timerDidFire, &m_context));
+    m_timer = adoptCF(CFRunLoopTimerCreate(0, s_decade, s_decade, 0, 0, HeapTimer::timerDidFire, &m_context));
     CFRunLoopAddTimer(m_runLoop.get(), m_timer.get(), kCFRunLoopCommonModes);
 }
 
@@ -86,17 +85,15 @@ void HeapTimer::timerDidFire(CFRunLoopTimerRef timer, void* context)
     }
 
     HeapTimer* heapTimer = 0;
-    if (vm->heap.fullActivityCallback() && vm->heap.fullActivityCallback()->m_timer.get() == timer)
-        heapTimer = vm->heap.fullActivityCallback();
-    else if (vm->heap.edenActivityCallback() && vm->heap.edenActivityCallback()->m_timer.get() == timer)
-        heapTimer = vm->heap.edenActivityCallback();
+    if (vm->heap.activityCallback() && vm->heap.activityCallback()->m_timer.get() == timer)
+        heapTimer = vm->heap.activityCallback();
     else if (vm->heap.sweeper()->m_timer.get() == timer)
         heapTimer = vm->heap.sweeper();
     else
         RELEASE_ASSERT_NOT_REACHED();
 
     {
-        JSLockHolder locker(vm);
+        APIEntryShim shim(vm);
         heapTimer->doWork();
     }
 
@@ -134,7 +131,7 @@ bool HeapTimer::timerEvent(void* info)
 {
     HeapTimer* agent = static_cast<HeapTimer*>(info);
     
-    JSLockHolder locker(agent->m_vm);
+    APIEntryShim shim(agent->m_vm);
     agent->doWork();
     agent->m_timer = 0;