| Differences between
and this patch
- a/WebCore/ChangeLog +11 lines
Lines 1-3 a/WebCore/ChangeLog_sec1
1
2010-09-03  Anton Muhin  <antonm@chromium.org>
2
3
        Reviewed by NOBODY (OOPS!).
4
5
        [v8] bypass caches when query memory usage from post GC and in crash handler.
6
        https://bugs.webkit.org/show_bug.cgi?id=45036
7
8
        Add Chromium-specific API to query actual memory usage which bypasses any caches.
9
10
        * platform/chromium/ChromiumBridge.h:
11
1
2010-09-03  Chris Rogers  <crogers@google.com>
12
2010-09-03  Chris Rogers  <crogers@google.com>
2
13
3
        Reviewed by Kenneth Russell.
14
        Reviewed by Kenneth Russell.
- a/WebCore/platform/chromium/ChromiumBridge.h +3 lines
Lines 190-195 namespace WebCore { a/WebCore/platform/chromium/ChromiumBridge.h_sec1
190
        // That is committed size for Windows and virtual memory size for POSIX
190
        // That is committed size for Windows and virtual memory size for POSIX
191
        static int memoryUsageMB();
191
        static int memoryUsageMB();
192
192
193
        // Same as above, but always returns actual value, without any caches.
194
        static int actualMemoryUsageMB();
195
193
        // MimeType -----------------------------------------------------------
196
        // MimeType -----------------------------------------------------------
194
        static bool isSupportedImageMIMEType(const String& mimeType);
197
        static bool isSupportedImageMIMEType(const String& mimeType);
195
        static bool isSupportedJavaScriptMIMEType(const String& mimeType);
198
        static bool isSupportedJavaScriptMIMEType(const String& mimeType);
- a/WebKit/chromium/ChangeLog +14 lines
Lines 1-3 a/WebKit/chromium/ChangeLog_sec1
1
2010-09-03  Anton Muhin  <antonm@chromium.org>
2
3
        Reviewed by NOBODY (OOPS!).
4
5
        [v8] bypass caches when query memory usage from post GC and in crash handler.
6
        https://bugs.webkit.org/show_bug.cgi?id=45036
7
8
        Add Chromium-specific API to query actual memory usage which bypasses any caches.
9
10
        * public/WebKitClient.h:
11
        (WebKit::WebKitClient::actualMemoryUsageMB):
12
        * src/ChromiumBridge.cpp:
13
        (WebCore::ChromiumBridge::actualMemoryUsageMB):
14
1
2010-09-03  Tony Chang  <tony@chromium.org>
15
2010-09-03  Tony Chang  <tony@chromium.org>
2
16
3
        Unreviewed, remove svn:executable flag from images and css files.
17
        Unreviewed, remove svn:executable flag from images and css files.
- a/WebKit/chromium/public/WebKitClient.h +3 lines
Lines 163-168 public: a/WebKit/chromium/public/WebKitClient.h_sec1
163
    // That is committed size for Windows and virtual memory size for POSIX
163
    // That is committed size for Windows and virtual memory size for POSIX
164
    virtual size_t memoryUsageMB() { return 0; }
164
    virtual size_t memoryUsageMB() { return 0; }
165
165
166
    // Same as above, but always returns actual value, without any caches.
167
    virtual size_t actualMemoryUsageMB() { return 0; }
168
166
169
167
    // Message Ports -------------------------------------------------------
170
    // Message Ports -------------------------------------------------------
168
171
- a/WebKit/chromium/src/ChromiumBridge.cpp +5 lines
Lines 823-828 int ChromiumBridge::memoryUsageMB() a/WebKit/chromium/src/ChromiumBridge.cpp_sec1
823
    return static_cast<int>(webKitClient()->memoryUsageMB());
823
    return static_cast<int>(webKitClient()->memoryUsageMB());
824
}
824
}
825
825
826
int ChromiumBridge::actualMemoryUsageMB()
827
{
828
    return static_cast<int>(webKitClient()->actualMemoryUsageMB());
829
}
830
826
int ChromiumBridge::screenDepth(Widget* widget)
831
int ChromiumBridge::screenDepth(Widget* widget)
827
{
832
{
828
    WebWidgetClient* client = toWebWidgetClient(widget);
833
    WebWidgetClient* client = toWebWidgetClient(widget);

Return to Bug 45036