[BlackBerry] Disable GCController timer for PLATFORM(BLACKBERRY)
authoryoli@rim.com <yoli@rim.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 31 Aug 2012 17:28:30 +0000 (17:28 +0000)
committeryoli@rim.com <yoli@rim.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 31 Aug 2012 17:28:30 +0000 (17:28 +0000)
https://bugs.webkit.org/show_bug.cgi?id=93007

Reviewed by Rob Buis.

Disable GCController timer.

* bindings/js/GCController.cpp:
(WebCore::GCController::GCController):
(WebCore::GCController::garbageCollectSoon):
(WebCore):
* bindings/js/GCController.h:
(GCController):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@127278 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/bindings/js/GCController.cpp
Source/WebCore/bindings/js/GCController.h

index 37170bb..769ae1b 100644 (file)
@@ -1,3 +1,19 @@
+2012-08-31  Yong Li  <yoli@rim.com>
+
+        [BlackBerry] Disable GCController timer for PLATFORM(BLACKBERRY)
+        https://bugs.webkit.org/show_bug.cgi?id=93007
+
+        Reviewed by Rob Buis.
+
+        Disable GCController timer.
+
+        * bindings/js/GCController.cpp:
+        (WebCore::GCController::GCController):
+        (WebCore::GCController::garbageCollectSoon):
+        (WebCore):
+        * bindings/js/GCController.h:
+        (GCController):
+
 2012-08-31  Michael Saboff  <msaboff@apple.com>
 
         CSS Parser should directly parse 8 bit source strings
index 7950968..85272a8 100644 (file)
@@ -49,7 +49,7 @@ GCController& gcController()
 }
 
 GCController::GCController()
-#if !USE(CF)
+#if !USE(CF) && !PLATFORM(BLACKBERRY)
     : m_GCTimer(this, &GCController::gcTimerFired)
 #endif
 {
@@ -62,7 +62,7 @@ void GCController::garbageCollectSoon()
     // systems with CoreFoundation. If and when the notion of a run loop is pushed 
     // down into WTF so that more platforms can take advantage of it, we will be 
     // able to use reportAbandonedObjectGraph on more platforms.
-#if USE(CF)
+#if USE(CF) || PLATFORM(BLACKBERRY)
     JSLockHolder lock(JSDOMWindow::commonJSGlobalData());
     JSDOMWindow::commonJSGlobalData()->heap.reportAbandonedObjectGraph();
 #else
@@ -71,7 +71,7 @@ void GCController::garbageCollectSoon()
 #endif
 }
 
-#if !USE(CF)
+#if !USE(CF) && !PLATFORM(BLACKBERRY)
 void GCController::gcTimerFired(Timer<GCController>*)
 {
     collect(0);
index 40c8a7d..3479b4d 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef GCController_h
 #define GCController_h
 
-#if USE(CF)
+#if USE(CF) || PLATFORM(BLACKBERRY)
 #include <wtf/FastAllocBase.h>
 #include <wtf/Noncopyable.h>
 #else
@@ -50,7 +50,7 @@ namespace WebCore {
     private:
         GCController(); // Use gcController() instead
 
-#if !USE(CF)
+#if !USE(CF) && !PLATFORM(BLACKBERRY)
         void gcTimerFired(Timer<GCController>*);
         Timer<GCController> m_GCTimer;
 #endif