Changeset 58227 in webkit

Timestamp:

Apr 25, 2010 4:37:44 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-25 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: inspector client shouldn't check if it can be opened
docked if it is already in that state.

​https://bugs.webkit.org/show_bug.cgi?id=37946

• WebCoreSupport/WebInspectorClient.cpp: (WebInspectorFrontendClient::WebInspectorFrontendClient): (WebInspectorFrontendClient::showWindowWithoutNotifications):
• WebCoreSupport/WebInspectorClient.h:

Location:

trunk/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebInspectorClient.cpp (modified) (2 diffs)
• WebCoreSupport/WebInspectorClient.h (modified) (1 diff)

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2010-04-25  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: inspector client shouldn't check if it can be opened
+        docked if it is already in that state.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37946
+
+        * WebCoreSupport/WebInspectorClient.cpp:
+        (WebInspectorFrontendClient::WebInspectorFrontendClient):
+        (WebInspectorFrontendClient::showWindowWithoutNotifications):
+        * WebCoreSupport/WebInspectorClient.h:
+
 2010-04-24  Steve Falkenburg  <sfalken@apple.com>
 

trunk/WebKit/win/WebCoreSupport/WebInspectorClient.cpp

@@ -214 +214 @@
     , m_frontendWebView(frontendWebView)
     , m_frontendWebViewHwnd(frontendWebViewHwnd)
-    , m_shouldAttachWhenShown(false)
     , m_attached(false)
     , m_destroyingInspectorView(false)
@@ -355 +354 @@
     ASSERT(m_inspectedWebViewHwnd);
 
-    // If no preference is set - default to an attached window. This is important for inspector LayoutTests.
-    String shouldAttach = m_inspectedWebView->page()->inspectorController()->setting(InspectorController::inspectorStartsAttachedSettingName());
-    m_shouldAttachWhenShown = shouldAttach != "false";
-        
-    if (m_shouldAttachWhenShown && !canAttachWindow())
-        m_shouldAttachWhenShown = false;
-    
-    if (!m_shouldAttachWhenShown) {
+    bool shouldAttach = false;
+    if (m_attached)
+        shouldAttach = true;
+    else {
+        // If no preference is set - default to an attached window. This is important for inspector LayoutTests.
+        String shouldAttachPref = m_inspectedWebView->page()->inspectorController()->setting(InspectorController::inspectorStartsAttachedSettingName());
+        shouldAttach = shouldAttachPref != "false";
+
+        if (shouldAttach && !canAttachWindow())
+            shouldAttach = false;
+    }
+
+    if (!shouldAttach) {
         // Put the Inspector's WebView inside our window and show it.
         m_frontendWebView->setHostWindow(reinterpret_cast<OLE_HANDLE>(m_frontendHwnd));

trunk/WebKit/win/WebCoreSupport/WebInspectorClient.h

@@ -113 +113 @@
     HWND m_frontendWebViewHwnd;
 
-    bool m_shouldAttachWhenShown;
     bool m_attached;