summaryrefslogtreecommitdiffstats
path: root/WebCore/bindings/js/GCController.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/bindings/js/GCController.cpp')
-rw-r--r--WebCore/bindings/js/GCController.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/WebCore/bindings/js/GCController.cpp b/WebCore/bindings/js/GCController.cpp
index 3e5645f..d5a1789 100644
--- a/WebCore/bindings/js/GCController.cpp
+++ b/WebCore/bindings/js/GCController.cpp
@@ -71,7 +71,9 @@ void GCController::gcTimerFired(Timer<GCController>*)
void GCController::garbageCollectNow()
{
- collect(0);
+ JSLock lock(SilenceAssertionsOnly);
+ if (!JSDOMWindow::commonJSGlobalData()->heap.isBusy())
+ collect(0);
}
void GCController::garbageCollectOnAlternateThreadForDebugging(bool waitUntilDone)