Changeset 104873 in webkit

Timestamp:

Jan 12, 2012 3:59:53 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Patch by Yongjun Zhang <​yongjun_zhang@apple.com> on 2012-01-12
Reviewed by Benjamin Poulain.

​https://bugs.webkit.org/show_bug.cgi?id=75991
Make the code in MemoryPressureHandler::respondToMemoryPressure shareable.

Move memory pressure handling code inside a new function (releaseMemory) so that
we could shared it between mac and iOS.

• Configurations/WebCore.xcconfig: add MemoryPressureHandlerMac.mm into iOS build.
• platform/MemoryPressureHandler.h:
• platform/mac/MemoryPressureHandlerMac.mm:

(WebCore::MemoryPressureHandler::respondToMemoryPressure):
(WebCore::MemoryPressureHandler::releaseMemory):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Configurations/WebCore.xcconfig (modified) (1 diff)
• platform/MemoryPressureHandler.cpp (modified) (1 diff)
• platform/MemoryPressureHandler.h (modified) (1 diff)
• platform/mac/MemoryPressureHandlerMac.mm (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-12  Yongjun Zhang  <yongjun_zhang@apple.com>
+
+        Reviewed by Benjamin Poulain.
+
+        https://bugs.webkit.org/show_bug.cgi?id=75991
+        Make the code in MemoryPressureHandler::respondToMemoryPressure shareable.
+
+        Move memory pressure handling code inside a new function (releaseMemory) so that
+        we could shared it between mac and iOS.
+
+        * Configurations/WebCore.xcconfig: add MemoryPressureHandlerMac.mm into iOS build.
+        * platform/MemoryPressureHandler.h:
+        * platform/mac/MemoryPressureHandlerMac.mm:
+        (WebCore::MemoryPressureHandler::respondToMemoryPressure):
+        (WebCore::MemoryPressureHandler::releaseMemory):
+
 2012-01-12  Eric Seidel  <eric@webkit.org>
 

trunk/Source/WebCore/Configurations/WebCore.xcconfig

@@ -82 +82 @@
 
 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(REAL_PLATFORM_NAME)) $(EXCLUDED_SOURCE_FILE_NAMES_SVG_DOM_OBJC_BINDINGS);
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png Cursor.cpp CursorMac.mm EventHandlerMac.mm HTMLConverter.mm KillRingMac.mm MemoryPressureHandlerMac.mm PlatformEventFactoryMac.mm SSLKeyGeneratorMac.cpp SearchPopupMenuMac.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm localizedStrings.js;
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png Cursor.cpp CursorMac.mm EventHandlerMac.mm HTMLConverter.mm KillRingMac.mm PlatformEventFactoryMac.mm SSLKeyGeneratorMac.cpp SearchPopupMenuMac.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm localizedStrings.js;
 EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
 EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm KillRingNone.cpp

trunk/Source/WebCore/platform/MemoryPressureHandler.cpp

@@ -43 +43 @@
 }
 
-#if !PLATFORM(MAC) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
+#if !PLATFORM(MAC) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD) || PLATFORM(IOS)
 void MemoryPressureHandler::install() { }
 

trunk/Source/WebCore/platform/MemoryPressureHandler.h

@@ -46 +46 @@
 
     void respondToMemoryPressure();
+    void releaseMemory(bool critical);
 
     bool m_installed;

trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm

@@ -33 +33 @@
 #import <wtf/FastMalloc.h>
 
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) && !PLATFORM(IOS)
 #import "WebCoreSystemInterface.h"
 #import <notify.h>
@@ -42 +42 @@
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 
+#if !PLATFORM(IOS)
 static dispatch_source_t _cache_event_source = 0;
 static dispatch_source_t _timer_event_source = 0;
@@ -115 +116 @@
     holdOff(s_secondsBetweenMemoryCleanup);
 
+    releaseMemory(false);
+}
+#endif // !PLATFORM(IOS)
+
+void MemoryPressureHandler::releaseMemory(bool critical)
+{
     int savedPageCacheCapacity = pageCache()->capacity();
-    pageCache()->setCapacity(pageCache()->pageCount()/2);
+    pageCache()->setCapacity(critical ? 0 : pageCache()->pageCount() / 2);
     pageCache()->setCapacity(savedPageCacheCapacity);
     pageCache()->releaseAutoreleasedPagesNow();
@@ -122 +129 @@
     NSURLCache *nsurlCache = [NSURLCache sharedURLCache];
     NSUInteger savedNsurlCacheMemoryCapacity = [nsurlCache memoryCapacity];
-    [nsurlCache setMemoryCapacity:[nsurlCache currentMemoryUsage]/2];
+    [nsurlCache setMemoryCapacity:critical ? 0 : [nsurlCache currentMemoryUsage] / 2];
     [nsurlCache setMemoryCapacity:savedNsurlCacheMemoryCapacity];
- 
+
     fontCache()->purgeInactiveFontData();
 
-    memoryCache()->pruneToPercentage(0.5f);
+    memoryCache()->pruneToPercentage(critical ? 0 : 0.5f);
 
     gcController().garbageCollectNow();