Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (114796 => 114797)
--- trunk/Source/WebCore/CMakeLists.txt 2012-04-20 23:18:16 UTC (rev 114796)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-04-20 23:31:23 UTC (rev 114797)
@@ -1101,6 +1101,7 @@
platform/Length.cpp
platform/LinkHash.cpp
platform/Logging.cpp
+ platform/MemoryUsageSupport.cpp
platform/MIMETypeRegistry.cpp
platform/MemoryPressureHandler.cpp
platform/PlatformEvent.cpp
Modified: trunk/Source/WebCore/ChangeLog (114796 => 114797)
--- trunk/Source/WebCore/ChangeLog 2012-04-20 23:18:16 UTC (rev 114796)
+++ trunk/Source/WebCore/ChangeLog 2012-04-20 23:31:23 UTC (rev 114797)
@@ -1,3 +1,42 @@
+2012-04-20 Mark Pilgrim <[email protected]>
+
+ [Chromium] Call memoryUsageMB directly
+ https://bugs.webkit.org/show_bug.cgi?id=84376
+
+ Reviewed by Kentaro Hara.
+
+ Now that memoryUsageMB has been moved from PlatformSupport.h to
+ Platform.h, we need to be able to call it directly
+ from WebCore/bindings/v8/V8GCController.cpp.
+ That means we need a new MemoryUsageSupport class in
+ WebCore/platform/ and an implementation in
+ WebCore/platform/chromium/MemoryUsageSupportChromium.cpp.
+ Other ports are welcome to implement their memory usage
+ functions if they wish. This pattern was based on the
+ HistogramSupport/HistogramSupportChromium classes.
+
+ Part of a refactoring series. See tracking bug 82948.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * Target.pri:
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/v8/V8GCController.cpp:
+ (WebCore):
+ * platform/MemoryUsageSupport.cpp: Added.
+ (WebCore):
+ (WebCore::MemoryUsageSupport::memoryUsageMB):
+ * platform/MemoryUsageSupport.h: Added.
+ (WebCore):
+ (MemoryUsageSupport):
+ * platform/chromium/MemoryUsageSupportChromium.cpp: Added.
+ (WebCore):
+ (WebCore::MemoryUsageSupport::memoryUsageMB):
+ * platform/chromium/PlatformSupport.h:
+ (PlatformSupport):
+
2012-04-20 Anders Carlsson <[email protected]>
Re-land. The non-fast scrollable region is now always updated after layout, and frameViewScrollableAreasDidChange has been removed.
Modified: trunk/Source/WebCore/GNUmakefile.list.am (114796 => 114797)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-04-20 23:18:16 UTC (rev 114796)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-04-20 23:31:23 UTC (rev 114797)
@@ -3366,6 +3366,8 @@
Source/WebCore/platform/MIMETypeRegistry.h \
Source/WebCore/platform/MemoryPressureHandler.cpp \
Source/WebCore/platform/MemoryPressureHandler.h \
+ Source/WebCore/platform/MemoryUsageSupport.cpp \
+ Source/WebCore/platform/MemoryUsageSupport.h \
Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp \
Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h \
Source/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp \
Modified: trunk/Source/WebCore/Target.pri (114796 => 114797)
--- trunk/Source/WebCore/Target.pri 2012-04-20 23:18:16 UTC (rev 114796)
+++ trunk/Source/WebCore/Target.pri 2012-04-20 23:31:23 UTC (rev 114797)
@@ -1140,6 +1140,7 @@
platform/LinkHash.cpp \
platform/Logging.cpp \
platform/MemoryPressureHandler.cpp \
+ platform/MemoryUsageSupport.cpp \
platform/MIMETypeRegistry.cpp \
platform/mock/DeviceOrientationClientMock.cpp \
platform/mock/GeolocationClientMock.cpp \
@@ -2293,6 +2294,7 @@
platform/Logging.h \
platform/Language.h \
platform/MemoryPressureHandler.h \
+ platform/MemoryUsageSupport.h \
platform/MIMETypeRegistry.h \
platform/network/AuthenticationChallengeBase.h \
platform/network/AuthenticationClient.h \
Modified: trunk/Source/WebCore/WebCore.gypi (114796 => 114797)
--- trunk/Source/WebCore/WebCore.gypi 2012-04-20 23:18:16 UTC (rev 114796)
+++ trunk/Source/WebCore/WebCore.gypi 2012-04-20 23:31:23 UTC (rev 114797)
@@ -288,6 +288,7 @@
'platform/LocalizedStrings.h',
'platform/Logging.h',
'platform/MemoryPressureHandler.h',
+ 'platform/MemoryUsageSupport.h',
'platform/MIMETypeRegistry.h',
'platform/NotImplemented.h',
'platform/PlatformEvent.cpp',
@@ -3284,6 +3285,7 @@
'platform/chromium/KeyboardCodes.h',
'platform/chromium/LanguageChromium.cpp',
'platform/chromium/LinkHashChromium.cpp',
+ 'platform/chromium/MemoryUsageSupportChromium.cpp',
'platform/chromium/MIMETypeRegistryChromium.cpp',
'platform/chromium/PasteboardChromium.cpp',
'platform/chromium/PasteboardPrivate.h',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (114796 => 114797)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-04-20 23:18:16 UTC (rev 114796)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-04-20 23:31:23 UTC (rev 114797)
@@ -27606,6 +27606,14 @@
>
</File>
<File
+ RelativePath="..\platform\MemoryUsageSupport.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\platform\MemoryUsageSupport.h"
+ >
+ </File>
+ <File
RelativePath="..\platform\MIMETypeRegistry.cpp"
>
</File>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (114796 => 114797)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-04-20 23:18:16 UTC (rev 114796)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-04-20 23:31:23 UTC (rev 114797)
@@ -5806,12 +5806,14 @@
D619A308144E00BE004BC302 /* ChildListMutationScope.h in Headers */ = {isa = PBXBuildFile; fileRef = D619A306144E00BE004BC302 /* ChildListMutationScope.h */; };
D630E2AC149BF344005B2F93 /* HistogramSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = D630E2AB149BF344005B2F93 /* HistogramSupport.h */; };
D630E2AC149BF344005B2F94 /* StatsCounter.h in Headers */ = {isa = PBXBuildFile; fileRef = D630E2AB149BF344005B2F94 /* StatsCounter.h */; };
+ D630E2AC149BF344005B2F95 /* MemoryUsageSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = D630E2AB149BF344005B2F95 /* MemoryUsageSupport.h */; };
D6E276AF14637455001D280A /* MutationObserverRegistration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6E276AD14637455001D280A /* MutationObserverRegistration.cpp */; };
D6E276B014637455001D280A /* MutationObserverRegistration.h in Headers */ = {isa = PBXBuildFile; fileRef = D6E276AE14637455001D280A /* MutationObserverRegistration.h */; };
D6E528A3149A926D00EFE1F3 /* MutationObserverInterestGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6E528A1149A926D00EFE1F3 /* MutationObserverInterestGroup.cpp */; };
D6E528A4149A926D00EFE1F3 /* MutationObserverInterestGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = D6E528A2149A926D00EFE1F3 /* MutationObserverInterestGroup.h */; };
D6FDAEF3149C06190037B1E1 /* HistogramSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6FDAEF2149C06190037B1E1 /* HistogramSupport.cpp */; };
D6FDAEF3149C06190037B1E2 /* StatsCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6FDAEF2149C06190037B1E2 /* StatsCounter.cpp */; };
+ D6FDAEF3149C06190037B1E3 /* MemoryUsageSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6FDAEF2149C06190037B1E3 /* MemoryUsageSupport.cpp */; };
D70AD65713E1342B005B50B4 /* RenderRegion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D70AD65513E1342B005B50B4 /* RenderRegion.cpp */; };
D70AD65813E1342B005B50B4 /* RenderRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = D70AD65613E1342B005B50B4 /* RenderRegion.h */; };
D72F6D79153159A3001EE44E /* FlowThreadController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D72F6D77153159A3001EE44E /* FlowThreadController.cpp */; };
@@ -12934,12 +12936,14 @@
D619A306144E00BE004BC302 /* ChildListMutationScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildListMutationScope.h; sourceTree = "<group>"; };
D630E2AB149BF344005B2F93 /* HistogramSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistogramSupport.h; sourceTree = "<group>"; };
D630E2AB149BF344005B2F94 /* StatsCounter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatsCounter.h; sourceTree = "<group>"; };
+ D630E2AB149BF344005B2F95 /* MemoryUsageSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryUsageSupport.h; sourceTree = "<group>"; };
D6E276AD14637455001D280A /* MutationObserverRegistration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MutationObserverRegistration.cpp; sourceTree = "<group>"; };
D6E276AE14637455001D280A /* MutationObserverRegistration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MutationObserverRegistration.h; sourceTree = "<group>"; };
D6E528A1149A926D00EFE1F3 /* MutationObserverInterestGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MutationObserverInterestGroup.cpp; sourceTree = "<group>"; };
D6E528A2149A926D00EFE1F3 /* MutationObserverInterestGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MutationObserverInterestGroup.h; sourceTree = "<group>"; };
D6FDAEF2149C06190037B1E1 /* HistogramSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HistogramSupport.cpp; sourceTree = "<group>"; };
D6FDAEF2149C06190037B1E2 /* StatsCounter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StatsCounter.cpp; sourceTree = "<group>"; };
+ D6FDAEF2149C06190037B1E3 /* MemoryUsageSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryUsageSupport.cpp; sourceTree = "<group>"; };
D70AD65513E1342B005B50B4 /* RenderRegion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderRegion.cpp; sourceTree = "<group>"; };
D70AD65613E1342B005B50B4 /* RenderRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderRegion.h; sourceTree = "<group>"; };
D72F6D77153159A3001EE44E /* FlowThreadController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FlowThreadController.cpp; sourceTree = "<group>"; };
@@ -20248,6 +20252,8 @@
A8239DFF09B3CF8A00B60641 /* Logging.h */,
657EDA061385CB97004E0645 /* MemoryPressureHandler.cpp */,
657EDA071385CB97004E0645 /* MemoryPressureHandler.h */,
+ D6FDAEF2149C06190037B1E3 /* MemoryUsageSupport.cpp */,
+ D630E2AB149BF344005B2F95 /* MemoryUsageSupport.h */,
BC772C4C0C4EB3040083285F /* MIMETypeRegistry.cpp */,
BC772C4D0C4EB3040083285F /* MIMETypeRegistry.h */,
98EB1F941313FE0500D0E1EA /* NotImplemented.h */,
@@ -23721,6 +23727,7 @@
BCB16C180979C3BD00467741 /* MemoryCache.h in Headers */,
9FFE3E7B11B59C5D0037874E /* MemoryInfo.h in Headers */,
6571DCC81385E6A400702DD0 /* MemoryPressureHandler.h in Headers */,
+ D630E2AC149BF344005B2F95 /* MemoryUsageSupport.h in Headers */,
93309DFA099E64920056E581 /* MergeIdenticalElementsCommand.h in Headers */,
E1ADECCE0E76AD8B004A1A5E /* MessageChannel.h in Headers */,
75793E840D0CE0B3007FC0AC /* MessageEvent.h in Headers */,
@@ -26938,6 +26945,7 @@
9FFE3E7A11B59C5D0037874E /* MemoryInfo.cpp in Sources */,
657EDA081385CB97004E0645 /* MemoryPressureHandler.cpp in Sources */,
657EDA0B1385CBD8004E0645 /* MemoryPressureHandlerMac.mm in Sources */,
+ D6FDAEF3149C06190037B1E3 /* MemoryUsageSupport.cpp in Sources */,
93309DF9099E64920056E581 /* MergeIdenticalElementsCommand.cpp in Sources */,
E1ADECCF0E76AD8B004A1A5E /* MessageChannel.cpp in Sources */,
75793E830D0CE0B3007FC0AC /* MessageEvent.cpp in Sources */,
Modified: trunk/Source/WebCore/bindings/v8/V8GCController.cpp (114796 => 114797)
--- trunk/Source/WebCore/bindings/v8/V8GCController.cpp 2012-04-20 23:18:16 UTC (rev 114796)
+++ trunk/Source/WebCore/bindings/v8/V8GCController.cpp 2012-04-20 23:31:23 UTC (rev 114797)
@@ -37,6 +37,7 @@
#include "DOMImplementation.h"
#include "HTMLImageElement.h"
#include "HTMLNames.h"
+#include "MemoryUsageSupport.h"
#include "MessagePort.h"
#include "PlatformSupport.h"
#include "RetainedDOMInfo.h"
@@ -468,7 +469,7 @@
int getMemoryUsageInMB()
{
#if PLATFORM(CHROMIUM)
- return PlatformSupport::memoryUsageMB();
+ return MemoryUsageSupport::memoryUsageMB();
#else
return 0;
#endif
Added: trunk/Source/WebCore/platform/MemoryUsageSupport.cpp (0 => 114797)
--- trunk/Source/WebCore/platform/MemoryUsageSupport.cpp (rev 0)
+++ trunk/Source/WebCore/platform/MemoryUsageSupport.cpp 2012-04-20 23:31:23 UTC (rev 114797)
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "MemoryUsageSupport.h"
+
+namespace WebCore {
+
+int MemoryUsageSupport::memoryUsageMB()
+{
+ return 0;
+}
+
+} // namespace WebCore
Added: trunk/Source/WebCore/platform/MemoryUsageSupport.h (0 => 114797)
--- trunk/Source/WebCore/platform/MemoryUsageSupport.h (rev 0)
+++ trunk/Source/WebCore/platform/MemoryUsageSupport.h 2012-04-20 23:31:23 UTC (rev 114797)
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef MemoryUsageSupport_h
+#define MemoryUsageSupport_h
+
+namespace WebCore {
+
+class MemoryUsageSupport {
+public:
+ // Returns the current space allocated for the pagefile, in MB.
+ // That is committed size for Windows and virtual memory size for POSIX.
+ static int memoryUsageMB();
+};
+
+} // namespace WebCore
+
+#endif // MemoryUsageSupport_h
Added: trunk/Source/WebCore/platform/chromium/MemoryUsageSupportChromium.cpp (0 => 114797)
--- trunk/Source/WebCore/platform/chromium/MemoryUsageSupportChromium.cpp (rev 0)
+++ trunk/Source/WebCore/platform/chromium/MemoryUsageSupportChromium.cpp 2012-04-20 23:31:23 UTC (rev 114797)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "MemoryUsageSupport.h"
+
+#include <public/Platform.h>
+
+namespace WebCore {
+
+int MemoryUsageSupport::memoryUsageMB()
+{
+ return WebKit::Platform::current()->memoryUsageMB();
+}
+
+} // namespace WebCore
Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (114796 => 114797)
--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-04-20 23:18:16 UTC (rev 114796)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-04-20 23:31:23 UTC (rev 114797)
@@ -195,9 +195,6 @@
static bool layoutTestMode();
// Memory -------------------------------------------------------------
- // Returns the current space allocated for the pagefile, in MB.
- // 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();
// If memory usage is below this threshold, do not bother forcing GC.
Modified: trunk/Source/WebKit/chromium/ChangeLog (114796 => 114797)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-20 23:18:16 UTC (rev 114796)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-20 23:31:23 UTC (rev 114797)
@@ -1,3 +1,15 @@
+2012-04-20 Mark Pilgrim <[email protected]>
+
+ [Chromium] Call memoryUsageMB directly
+ https://bugs.webkit.org/show_bug.cgi?id=84376
+
+ Reviewed by Kentaro Hara.
+
+ Part of a refactoring series. See tracking bug 82948.
+
+ * src/PlatformSupport.cpp:
+ (WebCore):
+
2012-04-20 Adrienne Walker <[email protected]>
[chromium] Clip TransparencyWin to prevent OOM from large Skia canvas
Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (114796 => 114797)
--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-04-20 23:18:16 UTC (rev 114796)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-04-20 23:31:23 UTC (rev 114797)
@@ -914,11 +914,6 @@
webFrame->client()->didExhaustMemoryAvailableForScript(webFrame);
}
-int PlatformSupport::memoryUsageMB()
-{
- return static_cast<int>(webKitPlatformSupport()->memoryUsageMB());
-}
-
int PlatformSupport::actualMemoryUsageMB()
{
return static_cast<int>(webKitPlatformSupport()->actualMemoryUsageMB());
