diff options
Diffstat (limited to 'Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp')
| -rw-r--r-- | Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp b/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp index 76ebc8f..2922485 100644 --- a/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp +++ b/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp @@ -173,7 +173,7 @@ void WebInspectorClient::openInspectorFrontend(InspectorController* inspectorCon return; m_frontendPage = core(frontendWebView.get()); - WebInspectorFrontendClient* frontendClient = new WebInspectorFrontendClient(m_inspectedWebView, m_inspectedWebViewHwnd, frontendHwnd, frontendWebView, frontendWebViewHwnd, this); + WebInspectorFrontendClient* frontendClient = new WebInspectorFrontendClient(m_inspectedWebView, m_inspectedWebViewHwnd, frontendHwnd, frontendWebView, frontendWebViewHwnd, this, createFrontendSettings()); m_frontendPage->inspectorController()->setInspectorFrontendClient(frontendClient); m_frontendHwnd = frontendHwnd; } @@ -206,8 +206,8 @@ void WebInspectorClient::updateHighlight() m_highlight->update(); } -WebInspectorFrontendClient::WebInspectorFrontendClient(WebView* inspectedWebView, HWND inspectedWebViewHwnd, HWND frontendHwnd, const COMPtr<WebView>& frontendWebView, HWND frontendWebViewHwnd, WebInspectorClient* inspectorClient) - : InspectorFrontendClientLocal(inspectedWebView->page()->inspectorController(), core(frontendWebView.get())) +WebInspectorFrontendClient::WebInspectorFrontendClient(WebView* inspectedWebView, HWND inspectedWebViewHwnd, HWND frontendHwnd, const COMPtr<WebView>& frontendWebView, HWND frontendWebViewHwnd, WebInspectorClient* inspectorClient, PassOwnPtr<Settings> settings) + : InspectorFrontendClientLocal(inspectedWebView->page()->inspectorController(), core(frontendWebView.get()), settings) , m_inspectedWebView(inspectedWebView) , m_inspectedWebViewHwnd(inspectedWebViewHwnd) , m_inspectorClient(inspectorClient) @@ -271,8 +271,7 @@ void WebInspectorFrontendClient::attachWindow() if (m_attached) return; - // FIXME: This flag can be saved to the flags storage directly. - m_inspectedWebView->page()->inspectorController()->setInspectorStartsAttached(true); + m_inspectorClient->setInspectorStartsAttached(true); closeWindowWithoutNotifications(); showWindowWithoutNotifications(); @@ -283,8 +282,7 @@ void WebInspectorFrontendClient::detachWindow() if (!m_attached) return; - // FIXME: This flag can be saved to the flags storage directly. - m_inspectedWebView->page()->inspectorController()->setInspectorStartsAttached(false); + m_inspectorClient->setInspectorStartsAttached(false); closeWindowWithoutNotifications(); showWindowWithoutNotifications(); @@ -365,7 +363,7 @@ void WebInspectorFrontendClient::showWindowWithoutNotifications() else { // If no preference is set - default to an attached window. This is important for inspector LayoutTests. // FIXME: This flag can be fetched directly from the flags storage. - shouldAttach = m_inspectedWebView->page()->inspectorController()->inspectorStartsAttached(); + shouldAttach = m_inspectorClient->inspectorStartsAttached(); if (shouldAttach && !canAttachWindow()) shouldAttach = false; |