Changeset 179720 in webkit

Timestamp:

Feb 5, 2015 3:47:35 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

[iOS] Remove False Positive dispatch_source Leak in WebMemoryPressureHandler singleton
​https://bugs.webkit.org/show_bug.cgi?id=141307

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2015-02-05
Reviewed by Anders Carlsson.

• UIProcess/ios/WebMemoryPressureHandlerIOS.h:
• UIProcess/ios/WebMemoryPressureHandlerIOS.mm:

(WebKit::WebMemoryPressureHandler::WebMemoryPressureHandler):
We want to keep the dispatch_source around, so just tie it to the
singleton so that it is not reported as a leak.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WebMemoryPressureHandlerIOS.h (modified) (2 diffs)
• UIProcess/ios/WebMemoryPressureHandlerIOS.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-02-05  Joseph Pecoraro  <pecoraro@apple.com>
+
+        [iOS] Remove False Positive dispatch_source Leak in WebMemoryPressureHandler singleton
+        https://bugs.webkit.org/show_bug.cgi?id=141307
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/ios/WebMemoryPressureHandlerIOS.h:
+        * UIProcess/ios/WebMemoryPressureHandlerIOS.mm:
+        (WebKit::WebMemoryPressureHandler::WebMemoryPressureHandler):
+        We want to keep the dispatch_source around, so just tie it to the
+        singleton so that it is not reported as a leak.
+
 2015-02-05  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.h

@@ -29 +29 @@
 #if PLATFORM(IOS)
 
-#include <wtf/NeverDestroyed.h>
+#import <dispatch/dispatch.h>
+#import <wtf/NeverDestroyed.h>
 
 namespace WebKit {
@@ -40 +41 @@
 private:
     WebMemoryPressureHandler();
+    dispatch_source_t _source;
 };
 

trunk/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.mm

@@ -46 +46 @@
     // and you can only have one WebCore::MemoryPressureHandler.
 
-    dispatch_source_t source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYSTATUS, 0, DISPATCH_MEMORYSTATUS_PRESSURE_WARN, dispatch_get_main_queue());
-    dispatch_set_context(source, this);
-    dispatch_source_set_event_handler(source, ^{
+    _source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYSTATUS, 0, DISPATCH_MEMORYSTATUS_PRESSURE_WARN, dispatch_get_main_queue());
+    dispatch_set_context(_source, this);
+    dispatch_source_set_event_handler(_source, ^{
         ViewSnapshotStore::singleton().discardSnapshotImages();
     });
-    dispatch_resume(source);
+    dispatch_resume(_source);
 }