[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[cwzwarich at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 2486712cbca0e81557d4f19486a29a4329924131
Author: cwzwarich at webkit.org <cwzwarich at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 15 21:56:13 2010 +0000

    2010-03-15  Cameron Zwarich  <zwarich at apple.com>
    
    Reviewed by Geoff Garen.
    
    Bug 36135 - GCController::garbageCollectNow() crashes when called from garbage collection
    <https://bugs.webkit.org/show_bug.cgi?id=36135>
    <rdar://problem/7752552>
    
    * bindings/js/GCController.cpp:
    (WebCore::GCController::garbageCollectNow): Fail silently if garbage collection is
    active rather than hitting the CRASH() reentrancy guard.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56018 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bbc755e..2bfbf1d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-15  Cameron Zwarich  <zwarich at apple.com>
+
+        Reviewed by Geoff Garen.
+
+        Bug 36135 - GCController::garbageCollectNow() crashes when called from garbage collection
+        <https://bugs.webkit.org/show_bug.cgi?id=36135>
+        <rdar://problem/7752552>
+
+        * bindings/js/GCController.cpp:
+        (WebCore::GCController::garbageCollectNow): Fail silently if garbage collection is
+        active rather than hitting the CRASH() reentrancy guard.
+
 2010-03-15  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein.
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)

-- 
WebKit Debian packaging