diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-18 13:59:13 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-18 13:59:28 +0200 |
| commit | 4d6084feccab99c0a7b3ecef26bb49c41dd50201 (patch) | |
| tree | fd1195897f551eee6d5a15d07ff5733b15aa2a5c /Source/WebKit2/WebProcess/WebPage/WebInspector.cpp | |
| parent | ae901828d4689ab9e89113f6b6ea8042b37a9fda (diff) | |
Imported WebKit commit ff52235a78888e5cb8e286a828a8698042200e67 (http://svn.webkit.org/repository/webkit/trunk@122948)
New snapshot that should fix the rendering issues recently introduced
Diffstat (limited to 'Source/WebKit2/WebProcess/WebPage/WebInspector.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebPage/WebInspector.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp b/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp index 68d3b0c41..7fa40e14f 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp +++ b/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp @@ -27,7 +27,6 @@ #include "WebInspector.h" #if ENABLE(INSPECTOR) - #include "WebFrame.h" #include "WebInspectorFrontendClient.h" #include "WebInspectorProxyMessages.h" @@ -35,21 +34,23 @@ #include "WebPageCreationParameters.h" #include "WebProcess.h" #include <WebCore/InspectorController.h> +#include <WebCore/InspectorFrontendChannel.h> #include <WebCore/Page.h> using namespace WebCore; namespace WebKit { -PassRefPtr<WebInspector> WebInspector::create(WebPage* page) +PassRefPtr<WebInspector> WebInspector::create(WebPage* page, InspectorFrontendChannel* frontendChannel) { - return adoptRef(new WebInspector(page)); + return adoptRef(new WebInspector(page, frontendChannel)); } -WebInspector::WebInspector(WebPage* page) +WebInspector::WebInspector(WebPage* page, InspectorFrontendChannel* frontendChannel) : m_page(page) , m_inspectorPage(0) , m_frontendClient(0) + , m_frontendChannel(frontendChannel) #if ENABLE(INSPECTOR_SERVER) , m_remoteFrontendConnected(false) #endif @@ -91,6 +92,7 @@ void WebInspector::destroyInspectorPage() { m_inspectorPage = 0; m_frontendClient = 0; + m_frontendChannel = 0; } // Called from WebInspectorFrontendClient @@ -255,8 +257,8 @@ void WebInspector::remoteFrontendConnected() ASSERT(!m_remoteFrontendConnected); // Switching between in-process and remote inspectors isn't supported yet. ASSERT(!m_inspectorPage); - - m_page->corePage()->inspectorController()->connectFrontend(); + + m_page->corePage()->inspectorController()->connectFrontend(m_frontendChannel); m_remoteFrontendConnected = true; } |