[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[antonm at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 482929bea56c8329794615d82aea0c8924db20ee
Author: antonm at chromium.org <antonm at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 3 18:44:07 2010 +0000

    2010-08-03  Anton Muhin  <antonm at chromium.org>
    
            Reviewed by David Levin.
    
            [v8] Get current memory usage and make it available on stack before crashing due to out of memory
            https://bugs.webkit.org/show_bug.cgi?id=43426
    
            That should allow us to diagnose the cases when the process just ran out of memory
            and hence V8 failed to allocate more OS pages.
    
            * bindings/v8/V8DOMWindowShell.cpp:
            (WebCore::reportFatalErrorInV8):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64572 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4180fa1..9f78132 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-03  Anton Muhin  <antonm at chromium.org>
+
+        Reviewed by David Levin.
+
+        [v8] Get current memory usage and make it available on stack before crashing due to out of memory
+        https://bugs.webkit.org/show_bug.cgi?id=43426
+
+        That should allow us to diagnose the cases when the process just ran out of memory
+        and hence V8 failed to allocate more OS pages.
+
+        * bindings/v8/V8DOMWindowShell.cpp:
+        (WebCore::reportFatalErrorInV8):
+
 2010-08-03  Leandro Pereira  <leandro at profusion.mobi>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/bindings/v8/V8DOMWindowShell.cpp b/WebCore/bindings/v8/V8DOMWindowShell.cpp
index e370469..a13b562 100644
--- a/WebCore/bindings/v8/V8DOMWindowShell.cpp
+++ b/WebCore/bindings/v8/V8DOMWindowShell.cpp
@@ -82,7 +82,11 @@ static void reportFatalErrorInV8(const char* location, const char* message)
     // V8 is shutdown, we cannot use V8 api.
     // The only thing we can do is to disable JavaScript.
     // FIXME: clean up V8Proxy and disable JavaScript.
-    printf("V8 error: %s (%s)\n", message, location);
+    int memoryUsageMB = -1;
+#if PLATFORM(CHROMIUM)
+    memoryUsageMB = ChromiumBridge::memoryUsageMB();
+#endif
+    printf("V8 error: %s (%s).  Current memory usage: %d MB\n", message, location, memoryUsageMB);
     handleFatalErrorInV8();
 }
 

-- 
WebKit Debian packaging