[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 83cdb0638b6356288ec54e7dd921d546102f84d8
Author: antonm at chromium.org <antonm at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 20:49:44 2010 +0000

    2010-09-09  Anton Muhin  <antonm at chromium.org>
    
            Reviewed by Adam Barth.
    
            [v8] bypass caches when query memory usage from post GC and in crash handler.
            https://bugs.webkit.org/show_bug.cgi?id=45036
    
            Second part of the whole change: now use API introduced in
            http://trac.webkit.org/changeset/66818 and now backed by Chromium.
    
            * bindings/v8/V8DOMWindowShell.cpp:
            (WebCore::reportFatalErrorInV8):
            * bindings/v8/V8GCController.cpp:
            (WebCore::V8GCController::gcEpilogue):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67111 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 84c9c59..663dd14 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-09  Anton Muhin  <antonm at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [v8] bypass caches when query memory usage from post GC and in crash handler.
+        https://bugs.webkit.org/show_bug.cgi?id=45036
+
+        Second part of the whole change: now use API introduced in
+        http://trac.webkit.org/changeset/66818 and now backed by Chromium.
+
+        * bindings/v8/V8DOMWindowShell.cpp:
+        (WebCore::reportFatalErrorInV8):
+        * bindings/v8/V8GCController.cpp:
+        (WebCore::V8GCController::gcEpilogue):
+
 2010-09-09  Kwang Yul Seo  <skyul at company100.net>
 
         Reviewed by James Robinson.
diff --git a/WebCore/bindings/v8/V8DOMWindowShell.cpp b/WebCore/bindings/v8/V8DOMWindowShell.cpp
index 0748cb6..b07f6fc 100644
--- a/WebCore/bindings/v8/V8DOMWindowShell.cpp
+++ b/WebCore/bindings/v8/V8DOMWindowShell.cpp
@@ -85,7 +85,7 @@ static void reportFatalErrorInV8(const char* location, const char* message)
     // FIXME: clean up V8Proxy and disable JavaScript.
     int memoryUsageMB = -1;
 #if PLATFORM(CHROMIUM)
-    memoryUsageMB = ChromiumBridge::memoryUsageMB();
+    memoryUsageMB = ChromiumBridge::actualMemoryUsageMB();
 #endif
     printf("V8 error: %s (%s).  Current memory usage: %d MB\n", message, location, memoryUsageMB);
     handleFatalErrorInV8();
diff --git a/WebCore/bindings/v8/V8GCController.cpp b/WebCore/bindings/v8/V8GCController.cpp
index c27e1d5..36beece 100644
--- a/WebCore/bindings/v8/V8GCController.cpp
+++ b/WebCore/bindings/v8/V8GCController.cpp
@@ -406,6 +406,15 @@ int getMemoryUsageInMB()
 #endif
 }
 
+int getActualMemoryUsageInMB()
+{
+#if PLATFORM(CHROMIUM)
+    return ChromiumBridge::actualMemoryUsageMB();
+#else
+    return 0;
+#endif
+}
+
 }  // anonymous namespace
 
 void V8GCController::gcEpilogue()
@@ -417,7 +426,7 @@ void V8GCController::gcEpilogue()
     GCEpilogueVisitor epilogueVisitor;
     visitActiveDOMObjectsInCurrentThread(&epilogueVisitor);
 
-    workingSetEstimateMB = getMemoryUsageInMB();
+    workingSetEstimateMB = getActualMemoryUsageInMB();
 
 #ifndef NDEBUG
     // Check all survivals are weak.

-- 
WebKit Debian packaging