Changeset 87275 in webkit

Timestamp:

May 24, 2011 11:37:42 PM (13 years ago)

Author:

timothy@apple.com

Message:

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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WebInspectorProxyMac.mm (modified) (1 diff)
• UIProcess/win/WebInspectorProxyWin.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-24  Timothy Hatcher  <timothy@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-24  Keishi Hattori  <keishi@webkit.org>
 

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

@@ -155 +155 @@
 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];
 }
 

trunk/Source/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp

@@ -228 +228 @@
 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);
 }