Changeset 85051 in webkit

Timestamp:

Apr 27, 2011 8:10:12 AM (13 years ago)

Author:

yurys@chromium.org

Message:

2011-04-27 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

REGRESSION: Crash occurs at objc_msgSend when closing a window that is displaying the web inspector
​https://bugs.webkit.org/show_bug.cgi?id=44230

Use RetainPtr access inspected view from the inspector one to avoid inspected view being deleted before
inspector is closed.

• WebCoreSupport/WebInspectorClient.mm: store reference to inspected view in RetainPtr. Despite the removed comment in initWithInspectedWebView this doesn't introduce cyclic reference since there are no retaining pointers to the WebInspectorWindowController from the inspected page or from the WebInspectorClient. There is only one reference to it from WebInspectorFrontendClient which is held by the inspector front-end page.

Drive-by fix: removed several unused methods which are currently implemented in mac/WebInspector/WebInspector.mm
(-[WebInspectorWindowController initWithInspectedWebView:]):
(-[WebInspectorWindowController close]):
(-[WebInspectorWindowController showWindow:]):
(-[WebInspectorWindowController setAttachedWindowHeight:]):
(-[WebInspectorWindowController destroyInspectorView:]):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebInspectorClient.mm (modified) (8 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-04-27  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        REGRESSION: Crash occurs at objc_msgSend when closing a window that is displaying the web inspector
+        https://bugs.webkit.org/show_bug.cgi?id=44230
+
+        Use RetainPtr access inspected view from the inspector one to avoid inspected view being deleted before
+        inspector is closed.
+
+        * WebCoreSupport/WebInspectorClient.mm: store reference to inspected view in RetainPtr. Despite the removed
+        comment in initWithInspectedWebView this doesn't introduce cyclic reference since there are no retaining
+        pointers to the WebInspectorWindowController from the inspected page or from the WebInspectorClient.
+        There is only one reference to it from WebInspectorFrontendClient which is held by the inspector
+        front-end page.
+
+        Drive-by fix: removed several unused methods which are currently implemented in mac/WebInspector/WebInspector.mm
+        (-[WebInspectorWindowController initWithInspectedWebView:]):
+        (-[WebInspectorWindowController close]):
+        (-[WebInspectorWindowController showWindow:]):
+        (-[WebInspectorWindowController setAttachedWindowHeight:]):
+        (-[WebInspectorWindowController destroyInspectorView:]):
+
 2011-04-26  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm

@@ -50 +50 @@
 @interface WebInspectorWindowController : NSWindowController <NSWindowDelegate> {
 @private
-    WebView *_inspectedWebView;
+    RetainPtr<WebView> _inspectedWebView;
     WebView *_webView;
     WebInspectorFrontendClient* _frontendClient;
@@ -264 +264 @@
         return nil;
 
-    // Don't retain to avoid a circular reference.
     _inspectedWebView = webView;
     return self;
@@ -324 +323 @@
 
     if (_attachedToInspectedWebView) {
-        if ([_inspectedWebView _isClosed])
+        if ([_inspectedWebView.get() _isClosed])
             return;
 
         [_webView removeFromSuperview];
 
-        WebFrameView *frameView = [[_inspectedWebView mainFrame] frameView];
+        WebFrameView *frameView = [[_inspectedWebView.get() mainFrame] frameView];
         NSRect frameViewRect = [frameView frame];
 
@@ -340 +339 @@
         [frameView setFrame:frameViewRect];
 
-        [_inspectedWebView displayIfNeeded];
+        [_inspectedWebView.get() displayIfNeeded];
     } else
         [super close];
@@ -361 +360 @@
 
     if (_shouldAttach) {
-        WebFrameView *frameView = [[_inspectedWebView mainFrame] frameView];
+        WebFrameView *frameView = [[_inspectedWebView.get() mainFrame] frameView];
 
         [_webView removeFromSuperview];
-        [_inspectedWebView addSubview:_webView positioned:NSWindowBelow relativeTo:(NSView *)frameView];
+        [_inspectedWebView.get() addSubview:_webView positioned:NSWindowBelow relativeTo:(NSView *)frameView];
 
         [_webView setAutoresizingMask:(NSViewWidthSizable | NSViewHeightSizable | NSViewMaxYMargin)];
@@ -432 +431 @@
         return;
 
-    WebFrameView *frameView = [[_inspectedWebView mainFrame] frameView];
+    WebFrameView *frameView = [[_inspectedWebView.get() mainFrame] frameView];
     NSRect frameViewRect = [frameView frame];
 
@@ -457 +456 @@
 
     if (notifyInspectorController) {
-        if (Page* inspectedPage = [_inspectedWebView page])
+        if (Page* inspectedPage = [_inspectedWebView.get() page])
             inspectedPage->inspectorController()->disconnectFrontend();
 
@@ -474 +473 @@
 }
 
-// MARK: -
-
-// These methods can be used by UI elements such as menu items and toolbar buttons when the inspector is the key window.
-
-// This method is really only implemented to keep any UI elements enabled.
-- (void)showWebInspector:(id)sender
-{
-    [[_inspectedWebView inspector] show:sender];
-}
-
-- (void)showErrorConsole:(id)sender
-{
-    [[_inspectedWebView inspector] showConsole:sender];
-}
-
-- (void)toggleDebuggingJavaScript:(id)sender
-{
-    [[_inspectedWebView inspector] toggleDebuggingJavaScript:sender];
-}
-
-- (void)toggleProfilingJavaScript:(id)sender
-{
-    [[_inspectedWebView inspector] toggleProfilingJavaScript:sender];
-}
-
-- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item
-{
-    BOOL isMenuItem = [(id)item isKindOfClass:[NSMenuItem class]];
-    if ([item action] == @selector(toggleDebuggingJavaScript:) && isMenuItem) {
-        NSMenuItem *menuItem = (NSMenuItem *)item;
-        if ([[_inspectedWebView inspector] isDebuggingJavaScript])
-            [menuItem setTitle:UI_STRING_INTERNAL("Stop Debugging JavaScript", "title for Stop Debugging JavaScript menu item")];
-        else
-            [menuItem setTitle:UI_STRING_INTERNAL("Start Debugging JavaScript", "title for Start Debugging JavaScript menu item")];
-    } else if ([item action] == @selector(toggleProfilingJavaScript:) && isMenuItem) {
-        NSMenuItem *menuItem = (NSMenuItem *)item;
-        if ([[_inspectedWebView inspector] isProfilingJavaScript])
-            [menuItem setTitle:UI_STRING_INTERNAL("Stop Profiling JavaScript", "title for Stop Profiling JavaScript menu item")];
-        else
-            [menuItem setTitle:UI_STRING_INTERNAL("Start Profiling JavaScript", "title for Start Profiling JavaScript menu item")];
-    }
-
-    return YES;
-}
-
 @end