Changeset 167338 in webkit

Timestamp:

Apr 15, 2014 5:01:33 PM (10 years ago)

Author:

akling@apple.com

Message:

[iOS WebKit2] Listen for system memory pressure notifications.
<​https://webkit.org/b/131653>
<rdar://problem/16208123>

Reviewed by Antti Koivisto.

• platform/cocoa/MemoryPressureHandlerCocoa.mm:

(WebCore::MemoryPressureHandler::install):

Use the right invocation to summon the memory pressure handler.

(WebCore::MemoryPressureHandler::install):
(WebCore::MemoryPressureHandler::uninstall):
(WebCore::MemoryPressureHandler::holdOff):
(WebCore::MemoryPressureHandler::respondToMemoryPressure):

Make stubbed out functions !PLATFORM(COCOA)

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/MemoryPressureHandler.cpp (modified) (1 diff)
• platform/cocoa/MemoryPressureHandlerCocoa.mm (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-15  Andreas Kling  <akling@apple.com>
+
+        [iOS WebKit2] Listen for system memory pressure notifications.
+        <https://webkit.org/b/131653>
+        <rdar://problem/16208123>
+
+        Reviewed by Antti Koivisto.
+
+        * platform/cocoa/MemoryPressureHandlerCocoa.mm:
+        (WebCore::MemoryPressureHandler::install):
+
+            Use the right invocation to summon the memory pressure handler.
+
+        (WebCore::MemoryPressureHandler::install):
+        (WebCore::MemoryPressureHandler::uninstall):
+        (WebCore::MemoryPressureHandler::holdOff):
+        (WebCore::MemoryPressureHandler::respondToMemoryPressure):
+
+            Make stubbed out functions !PLATFORM(COCOA)
+
 2014-04-14  Morten Stenshorne  <mstensho@opera.com>
 

trunk/Source/WebCore/platform/MemoryPressureHandler.cpp

@@ -96 +96 @@
 }
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 void MemoryPressureHandler::install() { }
 void MemoryPressureHandler::uninstall() { }
 void MemoryPressureHandler::holdOff(unsigned) { }
 void MemoryPressureHandler::respondToMemoryPressure() { }
-#endif
-
-#if !PLATFORM(COCOA)
 void MemoryPressureHandler::platformReleaseMemory(bool) { }
 #endif

trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm

@@ -39 +39 @@
 #import "SystemMemory.h"
 #import "WebCoreThread.h"
+#import <dispatch/private.h>
 #endif
 
@@ -52 +53 @@
 #endif
 }
-
-#if PLATFORM(MAC)
 
 static dispatch_source_t _cache_event_source = 0;
@@ -74 +73 @@
 
     dispatch_async(dispatch_get_main_queue(), ^{
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
+        _cache_event_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYSTATUS, 0, DISPATCH_MEMORYSTATUS_PRESSURE_WARN, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0));
+#elif PLATFORM(MAC) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
         _cache_event_source = wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue();
 #else
@@ -81 +82 @@
         if (_cache_event_source) {
             dispatch_set_context(_cache_event_source, this);
-            dispatch_source_set_event_handler(_cache_event_source, ^{ memoryPressureHandler().respondToMemoryPressure();});
+            dispatch_source_set_event_handler(_cache_event_source, ^{
+                memoryPressureHandler().respondToMemoryPressure();
+            });
             dispatch_resume(_cache_event_source);
         }
@@ -157 +160 @@
 }
 
-#else // !PLATFORM(MAC)
-
+#if PLATFORM(IOS)
 static void respondToMemoryPressureCallback(CFRunLoopObserverRef observer, CFRunLoopActivity /*activity*/, void* /*info*/)
 {