diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
| commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
| tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebKit2/WebProcess/WebPage/WebInspector.cpp | |
| parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebKit2/WebProcess/WebPage/WebInspector.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebPage/WebInspector.cpp | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp b/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp index 417837df6..87573f9ea 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp +++ b/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp @@ -50,6 +50,9 @@ WebInspector::WebInspector(WebPage* page) : m_page(page) , m_inspectorPage(0) , m_frontendClient(0) +#if ENABLE(INSPECTOR_SERVER) + , m_remoteFrontendConnected(false) +#endif { } @@ -99,6 +102,7 @@ void WebInspector::didLoadInspectorPage() void WebInspector::didClose() { WebProcess::shared().connection()->send(Messages::WebInspectorProxy::DidClose(), m_page->pageID()); + destroyInspectorPage(); } void WebInspector::bringToFront() @@ -236,6 +240,36 @@ void WebInspector::updateDockingAvailability() m_frontendClient->setDockingUnavailable(!m_frontendClient->canAttachWindow()); } +#if ENABLE(INSPECTOR_SERVER) +void WebInspector::sendMessageToRemoteFrontend(const String& message) +{ + ASSERT(m_remoteFrontendConnected); + WebProcess::shared().connection()->send(Messages::WebInspectorProxy::SendMessageToRemoteFrontend(message), m_page->pageID()); +} + +void WebInspector::dispatchMessageFromRemoteFrontend(const String& message) +{ + m_page->corePage()->inspectorController()->dispatchMessageFromFrontend(message); +} + +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_remoteFrontendConnected = true; +} + +void WebInspector::remoteFrontendDisconnected() +{ + ASSERT(m_remoteFrontendConnected); + m_page->corePage()->inspectorController()->disconnectFrontend(); + m_remoteFrontendConnected = false; +} +#endif + } // namespace WebKit #endif // ENABLE(INSPECTOR) |