Changeset 175733 in webkit

Timestamp:

Nov 6, 2014 6:11:16 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Wrap the bulk of -[WebView dealloc] with an autorelease pool.
​https://bugs.webkit.org/show_bug.cgi?id=138443

Patch by Daniel Jalkut <​jalkut@red-sweater.com> on 2014-11-06
Reviewed by Anders Carlsson.

Wrapping the dealloc method in its own autorelease pool avoids the problem of
complex tear-downs leading to the WebView itself being added to an autorelease
pool that is not drained until after the instance has been dealloc'd.

• WebView/WebView.mm:

(-[WebView dealloc]):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebView.mm (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-11-06  Daniel Jalkut  <jalkut@red-sweater.com>
+
+        Wrap the bulk of -[WebView dealloc] with an autorelease pool.
+        https://bugs.webkit.org/show_bug.cgi?id=138443
+
+        Reviewed by Anders Carlsson.
+
+        Wrapping the dealloc method in its own autorelease pool avoids the problem of
+        complex tear-downs leading to the WebView itself being added to an autorelease
+        pool that is not drained until after the instance has been dealloc'd.
+ 
+        * WebView/WebView.mm:
+        (-[WebView dealloc]):
+
 2014-11-05  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -5086 +5086 @@
         return;
 
-#if PLATFORM(IOS)
-    if (_private)
-        [_private->_geolocationProvider stopTrackingWebView:self];
-#endif
-
-    // call close to ensure we tear-down completely
-    // this maintains our old behavior for existing applications
-    [self close];
-
-    if ([[self class] shouldIncludeInWebKitStatistics])
-        --WebViewCount;
-
-#if !PLATFORM(IOS)
-    if ([self _needsFrameLoadDelegateRetainQuirk])
-        [_private->frameLoadDelegate release];
-#endif
-        
-    [_private release];
-    // [super dealloc] can end up dispatching against _private (3466082)
-    _private = nil;
+    // Because the machinations of the view's shutdown may cause self to be added to
+    // active autorelease pool, we capture any such releases here to ensure they are
+    // carried out before we are dealloc'd.
+    @autoreleasepool {
+
+#if PLATFORM(IOS)
+        if (_private)
+            [_private->_geolocationProvider stopTrackingWebView:self];
+#endif
+
+        // call close to ensure we tear-down completely
+        // this maintains our old behavior for existing applications
+        [self close];
+
+        if ([[self class] shouldIncludeInWebKitStatistics])
+            --WebViewCount;
+
+#if !PLATFORM(IOS)
+        if ([self _needsFrameLoadDelegateRetainQuirk])
+            [_private->frameLoadDelegate release];
+#endif
+
+        [_private release];
+        // [super dealloc] can end up dispatching against _private (3466082)
+        _private = nil;
+    }
 
     [super dealloc];