Attachment 139387 Details for Bug 84844 – Patch

[patch] Patch

bug-84844-20120428235440.patch (text/plain), 5.62 KB, created by Mark Pilgrim (Google) on 2012-04-28 20:54:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Pilgrim (Google)

Created: 2012-04-28 20:54:44 PDT

Size: 5.62 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 115591)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,25 @@
>+2012-04-28  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Call highUsageDeltaMB directly
>+        https://bugs.webkit.org/show_bug.cgi?id=84844
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+
>+        * bindings/v8/V8GCController.cpp:
>+        (WebCore::V8GCController::checkMemoryUsage):
>+        * platform/MemoryUsageSupport.cpp:
>+        (WebCore):
>+        (WebCore::MemoryUsageSupport::highUsageDeltaMB):
>+        * platform/MemoryUsageSupport.h:
>+        (MemoryUsageSupport):
>+        * platform/chromium/MemoryUsageSupportChromium.cpp:
>+        (WebCore::MemoryUsageSupport::highUsageDeltaMB):
>+        (WebCore):
>+        * platform/chromium/PlatformSupport.h:
>+        (PlatformSupport):
>+
> 2012-04-28  Sam Weinig  <sam@webkit.org>
> 
>         Smooth scrolling needs a new key
>Index: Source/WebCore/bindings/v8/V8GCController.cpp
>===================================================================
>--- Source/WebCore/bindings/v8/V8GCController.cpp	(revision 115591)
>+++ Source/WebCore/bindings/v8/V8GCController.cpp	(working copy)
>@@ -516,7 +516,7 @@ void V8GCController::checkMemoryUsage()
> #if PLATFORM(CHROMIUM) || PLATFORM(QT)
>     const int lowMemoryUsageMB = MemoryUsageSupport::lowMemoryUsageMB();
>     const int highMemoryUsageMB = MemoryUsageSupport::highMemoryUsageMB();
>-    const int highUsageDeltaMB = PlatformSupport::highUsageDeltaMB();
>+    const int highUsageDeltaMB = MemoryUsageSupport::highUsageDeltaMB();
>     int memoryUsageMB = getMemoryUsageInMB();
>     if ((memoryUsageMB > lowMemoryUsageMB && memoryUsageMB > 2 * workingSetEstimateMB) || (memoryUsageMB > highMemoryUsageMB && memoryUsageMB > workingSetEstimateMB + highUsageDeltaMB))
>         v8::V8::LowMemoryNotification();
>Index: Source/WebCore/platform/MemoryUsageSupport.cpp
>===================================================================
>--- Source/WebCore/platform/MemoryUsageSupport.cpp	(revision 115591)
>+++ Source/WebCore/platform/MemoryUsageSupport.cpp	(working copy)
>@@ -52,5 +52,10 @@ int MemoryUsageSupport::highMemoryUsageM
> {
>     return 0;
> }
>+
>+int MemoryUsageSupport::highUsageDeltaMB()
>+{
>+    return 0;
>+}
>     
> } // namespace WebCore
>Index: Source/WebCore/platform/MemoryUsageSupport.h
>===================================================================
>--- Source/WebCore/platform/MemoryUsageSupport.h	(revision 115591)
>+++ Source/WebCore/platform/MemoryUsageSupport.h	(working copy)
>@@ -48,6 +48,10 @@ public:
> 
>     // If memory usage is above this threshold, force GC more aggressively.
>     static int highMemoryUsageMB();
>+
>+    // Delta of memory usage growth (vs. last actualMemoryUsageMB())
>+    // to force GC when memory usage is high.
>+    static int highUsageDeltaMB();
> };
> 
> } // namespace WebCore
>Index: Source/WebCore/platform/chromium/MemoryUsageSupportChromium.cpp
>===================================================================
>--- Source/WebCore/platform/chromium/MemoryUsageSupportChromium.cpp	(revision 115591)
>+++ Source/WebCore/platform/chromium/MemoryUsageSupportChromium.cpp	(working copy)
>@@ -55,4 +55,9 @@ int MemoryUsageSupport::highMemoryUsageM
>     return WebKit::Platform::current()->highMemoryUsageMB();
> }
> 
>+int MemoryUsageSupport::highUsageDeltaMB()
>+{
>+    return WebKit::Platform::current()->highUsageDeltaMB();
>+}
>+
> } // namespace WebCore
>Index: Source/WebCore/platform/chromium/PlatformSupport.h
>===================================================================
>--- Source/WebCore/platform/chromium/PlatformSupport.h	(revision 115591)
>+++ Source/WebCore/platform/chromium/PlatformSupport.h	(working copy)
>@@ -194,10 +194,6 @@ public:
>     // LayoutTestMode -----------------------------------------------------
>     static bool layoutTestMode();
> 
>-    // Memory -------------------------------------------------------------
>-    // Delta of memory usage growth (vs. last actualMemoryUsageMB()) to force GC when memory usage is high.
>-    static int highUsageDeltaMB();
>-
>     // Plugin -------------------------------------------------------------
>     static bool plugins(bool refresh, Vector<PluginInfo>*);
>     static NPObject* pluginScriptableObject(Widget*);
>Index: Source/WebKit/chromium/ChangeLog
>===================================================================
>--- Source/WebKit/chromium/ChangeLog	(revision 115591)
>+++ Source/WebKit/chromium/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2012-04-28  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Call highUsageDeltaMB directly
>+        https://bugs.webkit.org/show_bug.cgi?id=84844
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+
>+        * src/PlatformSupport.cpp:
>+        (WebCore):
>+
> 2012-04-28  Ilya Tikhonovsky  <loislo@chromium.org>
> 
>         Web Inspector: InspectorFrontendHost.append has to be implemented for saving heap snapshots.
>Index: Source/WebKit/chromium/src/PlatformSupport.cpp
>===================================================================
>--- Source/WebKit/chromium/src/PlatformSupport.cpp	(revision 115591)
>+++ Source/WebKit/chromium/src/PlatformSupport.cpp	(working copy)
>@@ -914,11 +914,6 @@ void PlatformSupport::notifyJSOutOfMemor
>     webFrame->client()->didExhaustMemoryAvailableForScript(webFrame);
> }
> 
>-int PlatformSupport::highUsageDeltaMB()
>-{
>-    return static_cast<int>(webKitPlatformSupport()->highUsageDeltaMB());
>-}
>-
> int PlatformSupport::screenHorizontalDPI(Widget* widget)
> {
>     WebWidgetClient* client = toWebWidgetClient(widget);

Actions: View | Formatted Diff | Diff

Attachments on bug 84844: 138783 | 139387 | 139388 | 139395