Changeset 155153 in webkit

Timestamp:

Sep 5, 2013, 3:06:31 PM (12 years ago)

Author:

ap@apple.com

Message:

WKFullScreenWindowController extends lifetime of WKView, deleting it at a wrong time
​https://bugs.webkit.org/show_bug.cgi?id=120792
<rdar://problem/14884666>

Reviewed by Jer Noble.

• UIProcess/API/mac/WKView.mm: (-[WKView fullScreenWindowController]): Use a newly minted initializer for the controller.

• UIProcess/mac/WKFullScreenWindowController.h: Removed unused web view accessors. Changed the class to take web view at initialization time.

• UIProcess/mac/WKFullScreenWindowController.mm: (-[WKFullScreenWindowController initWithWindow:webView:]): Initialize the controller inone step. (-[WKFullScreenWindowController dealloc]): WebView is now a raw pointer, no need to zero it. (-[WKFullScreenWindowController close]): Make sure to not leave a dangling WKView pointer (this method is indirectly but inevitably called when WKView is deallocated).

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (1 diff)
• UIProcess/mac/WKFullScreenWindowController.h (modified) (2 diffs)
• UIProcess/mac/WKFullScreenWindowController.mm (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-09-05  Alexey Proskuryakov  <ap@apple.com>
+
+        WKFullScreenWindowController extends lifetime of WKView, deleting it at a wrong time
+        https://bugs.webkit.org/show_bug.cgi?id=120792
+        <rdar://problem/14884666>
+
+        Reviewed by Jer Noble.
+
+        * UIProcess/API/mac/WKView.mm: (-[WKView fullScreenWindowController]):
+        Use a newly minted initializer for the controller.
+
+        * UIProcess/mac/WKFullScreenWindowController.h: Removed unused web view accessors.
+        Changed the class to take web view at initialization time.
+
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (-[WKFullScreenWindowController initWithWindow:webView:]): Initialize the controller
+        inone step.
+        (-[WKFullScreenWindowController dealloc]): WebView is now a raw pointer, no need
+        to zero it.
+        (-[WKFullScreenWindowController close]): Make sure to not leave a dangling WKView
+        pointer (this method is indirectly but inevitably called when WKView is deallocated).
+
 2013-09-05  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -2938 +2938 @@
 - (WKFullScreenWindowController*)fullScreenWindowController
 {
-    if (!_data->_fullScreenWindowController) {
-        _data->_fullScreenWindowController = adoptNS([[WKFullScreenWindowController alloc] initWithWindow:[self createFullScreenWindow]]);
-        [_data->_fullScreenWindowController.get() setWebView:self];
-    }
+    if (!_data->_fullScreenWindowController)
+        _data->_fullScreenWindowController = adoptNS([[WKFullScreenWindowController alloc] initWithWindow:[self createFullScreenWindow] webView:self]);
+
     return _data->_fullScreenWindowController.get();
 }

trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h

@@ -47 +47 @@
 @interface WKFullScreenWindowController : NSWindowController<NSWindowDelegate> {
 @private
-    WKView *_webView;
+    WKView *_webView; // Cannot be retained, see <rdar://problem/14884666>.
     RetainPtr<WebCoreFullScreenPlaceholderView> _webViewPlaceholder;
     RetainPtr<WebWindowScaleAnimation> _scaleAnimation;
@@ -61 +61 @@
 }
 
-- (WKView*)webView;
-- (void)setWebView:(WKView*)webView;
+- (id)initWithWindow:(NSWindow *)window webView:(WKView *)webView;
 
 - (WebCoreFullScreenPlaceholderView*)webViewPlaceholder;

trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm

@@ -90 +90 @@
 #pragma mark -
 #pragma mark Initialization
-- (id)initWithWindow:(NSWindow *)window
+- (id)initWithWindow:(NSWindow *)window webView:(WKView *)webView
 {
     self = [super initWithWindow:window];
@@ -98 +98 @@
     [window setCollectionBehavior:([window collectionBehavior] | NSWindowCollectionBehaviorFullScreenPrimary)];
     [self windowDidLoad];
+    _webView = webView;
     
     return self;
@@ -104 +105 @@
 - (void)dealloc
 {
-    [self setWebView:nil];
     [[self window] setDelegate:nil];
     
@@ -122 +122 @@
 #pragma mark -
 #pragma mark Accessors
-
-- (WKView*)webView
-{
-    return _webView;
-}
-
-- (void)setWebView:(WKView *)webView
-{
-    [webView retain];
-    [_webView release];
-    _webView = webView;
-}
 
 - (BOOL)isFullScreen
@@ -444 +432 @@
         [self finishedExitFullScreenAnimation:YES];
 
+    _webView = nil;
+
     [super close];
 }