Attachment 66531 Details for Bug 45036 – Patch

[patch] Patch

bug-45036-20100903231503.patch (text/plain), 3.55 KB, created by anton muhin on 2010-09-03 12:15:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: anton muhin

Created: 2010-09-03 12:15:05 PDT

Size: 3.55 KB

patch

obsolete

>diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
>index 24a19d0f148a38112fcd33f38d28c4a46425e962..f6f47fa30945a53423084d0ee5c0090e151a91d8 100644
>--- a/WebCore/ChangeLog
>+++ b/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2010-09-03  Anton Muhin  <antonm@chromium.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [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-03  Chris Rogers  <crogers@google.com>
> 
>         Reviewed by Kenneth Russell.
>diff --git a/WebCore/platform/chromium/ChromiumBridge.h b/WebCore/platform/chromium/ChromiumBridge.h
>index bc86de2bb98a03da3da3965874354a95a2bbaa0f..894799ca7a1442cd6c0241e354159d9e994f8274 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 ca17eb914809f1c0ef990ec144e71d454d0fb927..dbca3daafd1e7edea29590d5688911ed5cc192b4 100644
>--- a/WebKit/chromium/ChangeLog
>+++ b/WebKit/chromium/ChangeLog
>@@ -1,3 +1,17 @@
>+2010-09-03  Anton Muhin  <antonm@chromium.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [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-03  Tony Chang  <tony@chromium.org>
> 
>         Unreviewed, remove svn:executable flag from images and css files.
>diff --git a/WebKit/chromium/public/WebKitClient.h b/WebKit/chromium/public/WebKitClient.h
>index 9c0b4c2a579f4b273b6c015eff9762e1ef1b24c7..0f282e0a04dc64e196bfc5de9884ed33b919a5b9 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 911dcf39fd988cfc0d698f84b58e152a6ee2271b..3ced7b8c909ff0a47f9745273b5a6ba39413c4e2 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);

Actions: View | Formatted Diff | Diff

Attachments on bug 45036: 66212 | 66531 | 66906