Title: [132402] trunk/Source/WebKit/mac
- Revision
- 132402
- Author
- timo...@apple.com
- Date
- 2012-10-24 14:37:19 -0700 (Wed, 24 Oct 2012)
Log Message
Fix a crash seen during the Inspector tests on the WebKit1 bots.
Reviewed by Filip Pizlo.
* WebCoreSupport/WebInspectorClient.mm:
(WebInspectorFrontendClient::bringToFront): Use the window from the WebView since m_windowController's window
is not the same when the Inspector is docked.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (132401 => 132402)
--- trunk/Source/WebKit/mac/ChangeLog 2012-10-24 21:36:57 UTC (rev 132401)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-10-24 21:37:19 UTC (rev 132402)
@@ -1,3 +1,13 @@
+2012-10-24 Timothy Hatcher <timo...@apple.com>
+
+ Fix a crash seen during the Inspector tests on the WebKit1 bots.
+
+ Reviewed by Filip Pizlo.
+
+ * WebCoreSupport/WebInspectorClient.mm:
+ (WebInspectorFrontendClient::bringToFront): Use the window from the WebView since m_windowController's window
+ is not the same when the Inspector is docked.
+
2012-10-24 Brady Eidson <beid...@apple.com>
Add a strategy for loader customization.
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (132401 => 132402)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2012-10-24 21:36:57 UTC (rev 132401)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2012-10-24 21:37:19 UTC (rev 132402)
@@ -200,8 +200,13 @@
void WebInspectorFrontendClient::bringToFront()
{
updateWindowTitle();
+
[m_windowController.get() showWindow:nil];
- [[m_windowController.get() window] makeFirstResponder:[m_windowController.get() webView]];
+
+ // Use the window from the WebView since m_windowController's window
+ // is not the same when the Inspector is docked.
+ WebView *webView = [m_windowController.get() webView];
+ [[webView window] makeFirstResponder:webView];
}
void WebInspectorFrontendClient::closeWindow()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
