Title: [87540] branches/safari-534-branch/Source/WebKit2
- Revision
- 87540
- Author
- mr...@apple.com
- Date
- 2011-05-27 13:10:49 -0700 (Fri, 27 May 2011)
Log Message
Merge r87275.
Modified Paths
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (87539 => 87540)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-27 19:53:45 UTC (rev 87539)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-27 20:10:49 UTC (rev 87540)
@@ -1,3 +1,21 @@
+2011-05-27 Mark Rowe <mr...@apple.com>
+
+ Merge r87275.
+
+ 2011-05-24 Timothy Hatcher <timo...@apple.com>
+
+ Make the Web Inspector bring the right window to the front when docked.
+
+ rdar://problem/9464685
+ https://webkit.org/b/61420
+
+ Reviewed by Brian Weinstein.
+
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::platformBringToFront): Order front the parent window of the Inspector's WKView.
+ * UIProcess/win/WebInspectorProxyWin.cpp:
+ (WebKit::WebInspectorProxy::platformBringToFront): Ditto.
+
2011-05-26 Lucas Forschler <lforsch...@apple.com>
Merge r87225.
Modified: branches/safari-534-branch/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (87539 => 87540)
--- branches/safari-534-branch/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2011-05-27 19:53:45 UTC (rev 87539)
+++ branches/safari-534-branch/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2011-05-27 20:10:49 UTC (rev 87540)
@@ -154,9 +154,8 @@
void WebInspectorProxy::platformBringToFront()
{
- // FIXME: support bring to front in docked mode here.
-
- [m_inspectorWindow.get() makeKeyAndOrderFront:nil];
+ // FIXME: this will not bring a background tab in Safari to the front, only its window.
+ [m_inspectorView.get().window makeKeyAndOrderFront:nil];
}
void WebInspectorProxy::platformInspectedURLChanged(const String& urlString)
Modified: branches/safari-534-branch/Source/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp (87539 => 87540)
--- branches/safari-534-branch/Source/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp 2011-05-27 19:53:45 UTC (rev 87539)
+++ branches/safari-534-branch/Source/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp 2011-05-27 20:10:49 UTC (rev 87540)
@@ -227,13 +227,13 @@
void WebInspectorProxy::platformBringToFront()
{
- // FIXME: support bring to front in docked mode here.
-
- if (!m_inspectorWindow)
+ // FIXME: this will not bring a background tab in Safari to the front, only its window.
+ HWND parentWindow = m_isAttached ? ::GetAncestor(m_page->nativeWindow(), GA_ROOT) : m_inspectorWindow;
+ if (!parentWindow)
return;
- ASSERT(::IsWindow(m_inspectorWindow));
- ::SetWindowPos(m_inspectorWindow, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE);
+ ASSERT(::IsWindow(parentWindow));
+ ::SetWindowPos(parentWindow, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE);
}
void WebInspectorProxy::platformInspectedURLChanged(const String& urlString)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
