Title: [115595] trunk/Source
- Revision
- 115595
- Author
- [email protected]
- Date
- 2012-04-29 01:58:05 -0700 (Sun, 29 Apr 2012)
Log Message
[Chromium] Call highUsageDeltaMB directly
https://bugs.webkit.org/show_bug.cgi?id=84844
Reviewed by Kentaro Hara.
Part of a refactoring series. See tracking bug 82948.
Source/WebCore:
* 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):
Source/WebKit/chromium:
* src/PlatformSupport.cpp:
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (115594 => 115595)
--- trunk/Source/WebCore/ChangeLog 2012-04-29 08:07:50 UTC (rev 115594)
+++ trunk/Source/WebCore/ChangeLog 2012-04-29 08:58:05 UTC (rev 115595)
@@ -1,3 +1,25 @@
+2012-04-29 Mark Pilgrim <[email protected]>
+
+ [Chromium] Call highUsageDeltaMB directly
+ https://bugs.webkit.org/show_bug.cgi?id=84844
+
+ Reviewed by Kentaro Hara.
+
+ 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-29 Kentaro Hara <[email protected]>
REGRESSION(r113086): onresize event handler can be deleted in popup window
Modified: trunk/Source/WebCore/bindings/v8/V8GCController.cpp (115594 => 115595)
--- trunk/Source/WebCore/bindings/v8/V8GCController.cpp 2012-04-29 08:07:50 UTC (rev 115594)
+++ trunk/Source/WebCore/bindings/v8/V8GCController.cpp 2012-04-29 08:58:05 UTC (rev 115595)
@@ -516,7 +516,7 @@
#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();
Modified: trunk/Source/WebCore/platform/MemoryUsageSupport.cpp (115594 => 115595)
--- trunk/Source/WebCore/platform/MemoryUsageSupport.cpp 2012-04-29 08:07:50 UTC (rev 115594)
+++ trunk/Source/WebCore/platform/MemoryUsageSupport.cpp 2012-04-29 08:58:05 UTC (rev 115595)
@@ -52,5 +52,10 @@
{
return 0;
}
+
+int MemoryUsageSupport::highUsageDeltaMB()
+{
+ return 0;
+}
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/MemoryUsageSupport.h (115594 => 115595)
--- trunk/Source/WebCore/platform/MemoryUsageSupport.h 2012-04-29 08:07:50 UTC (rev 115594)
+++ trunk/Source/WebCore/platform/MemoryUsageSupport.h 2012-04-29 08:58:05 UTC (rev 115595)
@@ -48,6 +48,10 @@
// 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
Modified: trunk/Source/WebCore/platform/chromium/MemoryUsageSupportChromium.cpp (115594 => 115595)
--- trunk/Source/WebCore/platform/chromium/MemoryUsageSupportChromium.cpp 2012-04-29 08:07:50 UTC (rev 115594)
+++ trunk/Source/WebCore/platform/chromium/MemoryUsageSupportChromium.cpp 2012-04-29 08:58:05 UTC (rev 115595)
@@ -55,4 +55,9 @@
return WebKit::Platform::current()->highMemoryUsageMB();
}
+int MemoryUsageSupport::highUsageDeltaMB()
+{
+ return WebKit::Platform::current()->highUsageDeltaMB();
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (115594 => 115595)
--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-04-29 08:07:50 UTC (rev 115594)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-04-29 08:58:05 UTC (rev 115595)
@@ -194,10 +194,6 @@
// 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*);
Modified: trunk/Source/WebKit/chromium/ChangeLog (115594 => 115595)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-29 08:07:50 UTC (rev 115594)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-29 08:58:05 UTC (rev 115595)
@@ -1,3 +1,15 @@
+2012-04-29 Mark Pilgrim <[email protected]>
+
+ [Chromium] Call highUsageDeltaMB directly
+ https://bugs.webkit.org/show_bug.cgi?id=84844
+
+ Reviewed by Kentaro Hara.
+
+ Part of a refactoring series. See tracking bug 82948.
+
+ * src/PlatformSupport.cpp:
+ (WebCore):
+
2012-04-28 Ilya Tikhonovsky <[email protected]>
Web Inspector: InspectorFrontendHost.append has to be implemented for saving heap snapshots.
Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (115594 => 115595)
--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-04-29 08:07:50 UTC (rev 115594)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-04-29 08:58:05 UTC (rev 115595)
@@ -914,11 +914,6 @@
webFrame->client()->didExhaustMemoryAvailableForScript(webFrame);
}
-int PlatformSupport::highUsageDeltaMB()
-{
- return static_cast<int>(webKitPlatformSupport()->highUsageDeltaMB());
-}
-
int PlatformSupport::screenHorizontalDPI(Widget* widget)
{
WebWidgetClient* client = toWebWidgetClient(widget);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
