Diff
Modified: trunk/Source/WebCore/ChangeLog (115520 => 115521)
--- trunk/Source/WebCore/ChangeLog 2012-04-28 00:10:23 UTC (rev 115520)
+++ trunk/Source/WebCore/ChangeLog 2012-04-28 00:34:57 UTC (rev 115521)
@@ -1,3 +1,25 @@
+2012-04-27 Mark Pilgrim <[email protected]>
+
+ [Chromium] Call lowMemoryUsageMB directly
+ https://bugs.webkit.org/show_bug.cgi?id=84840
+
+ Reviewed by Kentaro Hara.
+
+ Part of a refactoring series. See tracking bug 82948.
+
+ * bindings/v8/V8GCController.cpp:
+ (WebCore::V8GCController::checkMemoryUsage):
+ * platform/MemoryUsageSupport.cpp:
+ (WebCore::MemoryUsageSupport::lowMemoryUsageMB):
+ (WebCore):
+ * platform/MemoryUsageSupport.h:
+ (MemoryUsageSupport):
+ * platform/chromium/MemoryUsageSupportChromium.cpp:
+ (WebCore::MemoryUsageSupport::lowMemoryUsageMB):
+ (WebCore):
+ * platform/chromium/PlatformSupport.h:
+ (PlatformSupport):
+
2012-04-27 Yi Shen <[email protected]>
REGRESSION(113723): Pressing enter in this list example deletes the whole list
Modified: trunk/Source/WebCore/bindings/v8/V8GCController.cpp (115520 => 115521)
--- trunk/Source/WebCore/bindings/v8/V8GCController.cpp 2012-04-28 00:10:23 UTC (rev 115520)
+++ trunk/Source/WebCore/bindings/v8/V8GCController.cpp 2012-04-28 00:34:57 UTC (rev 115521)
@@ -514,7 +514,7 @@
void V8GCController::checkMemoryUsage()
{
#if PLATFORM(CHROMIUM) || PLATFORM(QT)
- const int lowMemoryUsageMB = PlatformSupport::lowMemoryUsageMB();
+ const int lowMemoryUsageMB = MemoryUsageSupport::lowMemoryUsageMB();
const int highMemoryUsageMB = PlatformSupport::highMemoryUsageMB();
const int highUsageDeltaMB = PlatformSupport::highUsageDeltaMB();
int memoryUsageMB = getMemoryUsageInMB();
Modified: trunk/Source/WebCore/platform/MemoryUsageSupport.cpp (115520 => 115521)
--- trunk/Source/WebCore/platform/MemoryUsageSupport.cpp 2012-04-28 00:10:23 UTC (rev 115520)
+++ trunk/Source/WebCore/platform/MemoryUsageSupport.cpp 2012-04-28 00:34:57 UTC (rev 115521)
@@ -43,4 +43,9 @@
return 0;
}
+int MemoryUsageSupport::lowMemoryUsageMB()
+{
+ return 0;
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/MemoryUsageSupport.h (115520 => 115521)
--- trunk/Source/WebCore/platform/MemoryUsageSupport.h 2012-04-28 00:10:23 UTC (rev 115520)
+++ trunk/Source/WebCore/platform/MemoryUsageSupport.h 2012-04-28 00:34:57 UTC (rev 115521)
@@ -42,6 +42,9 @@
// Same as above, but always returns actual value, without any
// caches.
static int actualMemoryUsageMB();
+
+ // If memory usage is below this threshold, do not bother forcing GC.
+ static int lowMemoryUsageMB();
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/chromium/MemoryUsageSupportChromium.cpp (115520 => 115521)
--- trunk/Source/WebCore/platform/chromium/MemoryUsageSupportChromium.cpp 2012-04-28 00:10:23 UTC (rev 115520)
+++ trunk/Source/WebCore/platform/chromium/MemoryUsageSupportChromium.cpp 2012-04-28 00:34:57 UTC (rev 115521)
@@ -45,4 +45,9 @@
return WebKit::Platform::current()->actualMemoryUsageMB();
}
+int MemoryUsageSupport::lowMemoryUsageMB()
+{
+ return WebKit::Platform::current()->lowMemoryUsageMB();
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (115520 => 115521)
--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-04-28 00:10:23 UTC (rev 115520)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-04-28 00:34:57 UTC (rev 115521)
@@ -195,8 +195,6 @@
static bool layoutTestMode();
// Memory -------------------------------------------------------------
- // If memory usage is below this threshold, do not bother forcing GC.
- static int lowMemoryUsageMB();
// 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.
Modified: trunk/Source/WebKit/chromium/ChangeLog (115520 => 115521)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-28 00:10:23 UTC (rev 115520)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-28 00:34:57 UTC (rev 115521)
@@ -1,3 +1,15 @@
+2012-04-27 Mark Pilgrim <[email protected]>
+
+ [Chromium] Call lowMemoryUsageMB directly
+ https://bugs.webkit.org/show_bug.cgi?id=84840
+
+ Reviewed by Kentaro Hara.
+
+ Part of a refactoring series. See tracking bug 82948.
+
+ * src/PlatformSupport.cpp:
+ (WebCore):
+
2012-04-27 Ian Vollick <[email protected]>
[chromium] Add pause and resume support for accelerated css animations.
Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (115520 => 115521)
--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-04-28 00:10:23 UTC (rev 115520)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-04-28 00:34:57 UTC (rev 115521)
@@ -914,11 +914,6 @@
webFrame->client()->didExhaustMemoryAvailableForScript(webFrame);
}
-int PlatformSupport::lowMemoryUsageMB()
-{
- return static_cast<int>(webKitPlatformSupport()->lowMemoryUsageMB());
-}
-
int PlatformSupport::highMemoryUsageMB()
{
return static_cast<int>(webKitPlatformSupport()->highMemoryUsageMB());
