Title: [146605] trunk/Source/WebKit2
Revision
146605
Author
[email protected]
Date
2013-03-22 07:24:50 -0700 (Fri, 22 Mar 2013)

Log Message

Fix an assert when opening the Web Inspector window for the first time.

rdar://problem/13471765
https://webkit.org/b/113053

Reviewed by Eric Carlson.

* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::WebInspectorProxy::createInspectorWindow): Assign m_inspectorWindow
earlier so it is ready for when center is called and windowDidMove: gets called.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (146604 => 146605)


--- trunk/Source/WebKit2/ChangeLog	2013-03-22 14:22:21 UTC (rev 146604)
+++ trunk/Source/WebKit2/ChangeLog	2013-03-22 14:24:50 UTC (rev 146605)
@@ -1,3 +1,16 @@
+2013-03-22  Timothy Hatcher  <[email protected]>
+
+        Fix an assert when opening the Web Inspector window for the first time.
+
+        rdar://problem/13471765
+        https://webkit.org/b/113053
+
+        Reviewed by Eric Carlson.
+
+        * UIProcess/mac/WebInspectorProxyMac.mm:
+        (WebKit::WebInspectorProxy::createInspectorWindow): Assign m_inspectorWindow
+        earlier so it is ready for when center is called and windowDidMove: gets called.
+
 2013-03-21  Tim Horton  <[email protected]>
 
         [wk2] Page Overlays: Don't create backing store until the client asks us to paint

Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (146604 => 146605)


--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm	2013-03-22 14:22:21 UTC (rev 146604)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm	2013-03-22 14:24:50 UTC (rev 146605)
@@ -250,6 +250,8 @@
     [window setContentBorderThickness:windowContentBorderThickness forEdge:NSMaxYEdge];
     WKNSWindowMakeBottomCornersSquare(window);
 
+    m_inspectorWindow.adoptNS(window);
+
     NSView *contentView = [window contentView];
 
     // Create a full screen button so we can turn it into a dock button.
@@ -298,8 +300,6 @@
     if (NSIsEmptyRect(savedWindowFrame))
         [window center];
 
-    m_inspectorWindow.adoptNS(window);
-
     updateInspectorWindowTitle();
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to