[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 4839e46526f4b211715b574b336ac2e5c82e3c0d
Author: antonm at chromium.org <antonm at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 6 08:31:08 2010 +0000

    2010-09-06  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
    
            Add Chromium-specific API to query actual memory usage which bypasses any caches.
    
            * platform/chromium/ChromiumBridge.h:
    2010-09-06  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
    
            Add Chromium-specific API to query actual memory usage which bypasses any caches.
    
            * public/WebKitClient.h:
            (WebKit::WebKitClient::actualMemoryUsageMB):
            * src/ChromiumBridge.cpp:
            (WebCore::ChromiumBridge::actualMemoryUsageMB):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66818 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 09479c0..11abfff 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-06  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
+
+        Add Chromium-specific API to query actual memory usage which bypasses any caches.
+
+        * platform/chromium/ChromiumBridge.h:
+
 2010-09-06  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/chromium/ChromiumBridge.h b/WebCore/platform/chromium/ChromiumBridge.h
index bc86de2..894799c 100644
--- a/WebCore/platform/chromium/ChromiumBridge.h
+++ b/WebCore/platform/chromium/ChromiumBridge.h
@@ -190,6 +190,9 @@ namespace WebCore {
         // That is committed size for Windows and virtual memory size for POSIX
         static int memoryUsageMB();
 
+        // Same as above, but always returns actual value, without any caches.
+        static int actualMemoryUsageMB();
+
         // MimeType -----------------------------------------------------------
         static bool isSupportedImageMIMEType(const String& mimeType);
         static bool isSupportedJavaScriptMIMEType(const String& mimeType);
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 5cce799..6378e63 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-06  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
+
+        Add Chromium-specific API to query actual memory usage which bypasses any caches.
+
+        * public/WebKitClient.h:
+        (WebKit::WebKitClient::actualMemoryUsageMB):
+        * src/ChromiumBridge.cpp:
+        (WebCore::ChromiumBridge::actualMemoryUsageMB):
+
 2010-09-05  Peter Kasting  <pkasting at google.com>
 
         Reviewed by Adam Barth.
diff --git a/WebKit/chromium/public/WebKitClient.h b/WebKit/chromium/public/WebKitClient.h
index 9c0b4c2..0f282e0 100644
--- a/WebKit/chromium/public/WebKitClient.h
+++ b/WebKit/chromium/public/WebKitClient.h
@@ -163,6 +163,9 @@ public:
     // That is committed size for Windows and virtual memory size for POSIX
     virtual size_t memoryUsageMB() { return 0; }
 
+    // Same as above, but always returns actual value, without any caches.
+    virtual size_t actualMemoryUsageMB() { return 0; }
+
 
     // Message Ports -------------------------------------------------------
 
diff --git a/WebKit/chromium/src/ChromiumBridge.cpp b/WebKit/chromium/src/ChromiumBridge.cpp
index 911dcf3..3ced7b8 100644
--- a/WebKit/chromium/src/ChromiumBridge.cpp
+++ b/WebKit/chromium/src/ChromiumBridge.cpp
@@ -823,6 +823,11 @@ int ChromiumBridge::memoryUsageMB()
     return static_cast<int>(webKitClient()->memoryUsageMB());
 }
 
+int ChromiumBridge::actualMemoryUsageMB()
+{
+    return static_cast<int>(webKitClient()->actualMemoryUsageMB());
+}
+
 int ChromiumBridge::screenDepth(Widget* widget)
 {
     WebWidgetClient* client = toWebWidgetClient(widget);

-- 
WebKit Debian packaging