Changeset 33038 in webkit for trunk/JavaScriptCore/API/JSBase.cpp

Timestamp:

May 12, 2008, 12:12:31 AM (17 years ago)

Author:

[email protected]

Message:

Roll out recent threading changes (r32807, r32810, r32819, r32822) to simplify
SquirrelFish merging.

File:

• trunk/JavaScriptCore/API/JSBase.cpp (modified) (1 diff)

trunk/JavaScriptCore/API/JSBase.cpp

@@ -85 +85 @@
 
     JSLock lock;
-
-    // It might seem that we have a context passed to this function, and can use toJS(ctx)->heap(), but the parameter is likely to be NULL.
-    // The performance difference should be negligible anyway.
-    Heap* heap = Heap::threadHeap();
-    if (!heap->isBusy())
-        heap->collect();
+    if (!Collector::isBusy())
+        Collector::collect();
     // FIXME: Perhaps we should trigger a second mark and sweep
     // once the garbage collector is done if this is called when