Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(227)

Unified Diff: third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp

Issue 1437283003: [DevTools] filter any messages from previous session in DevToolsAgentHostImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
index e2df066d290d410652b85a96a77c77078e7c2880..9839da9a8e0a9a79af075e04490852726478e0ce 100644
--- a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
+++ b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
@@ -197,9 +197,9 @@ int64_t WebSharedWorkerImpl::serviceWorkerID(WebDataSource& dataSource)
return m_networkProvider->serviceWorkerID(dataSource);
}
-void WebSharedWorkerImpl::sendProtocolMessage(int callId, const WebString& message, const WebString& state)
+void WebSharedWorkerImpl::sendProtocolMessage(int sessionId, int callId, const WebString& message, const WebString& state)
{
- m_client->sendDevToolsMessage(callId, message, state);
+ m_client->sendDevToolsMessage(sessionId, callId, message, state);
}
void WebSharedWorkerImpl::resumeStartup()
@@ -364,18 +364,18 @@ void WebSharedWorkerImpl::pauseWorkerContextOnStart()
m_pauseWorkerContextOnStart = true;
}
-void WebSharedWorkerImpl::attachDevTools(const WebString& hostId)
+void WebSharedWorkerImpl::attachDevTools(const WebString& hostId, int sessionId)
{
WebDevToolsAgent* devtoolsAgent = m_mainFrame->devToolsAgent();
if (devtoolsAgent)
- devtoolsAgent->attach(hostId);
+ devtoolsAgent->attach(hostId, sessionId);
}
-void WebSharedWorkerImpl::reattachDevTools(const WebString& hostId, const WebString& savedState)
+void WebSharedWorkerImpl::reattachDevTools(const WebString& hostId, int sessionId, const WebString& savedState)
{
WebDevToolsAgent* devtoolsAgent = m_mainFrame->devToolsAgent();
if (devtoolsAgent)
- devtoolsAgent->reattach(hostId, savedState);
+ devtoolsAgent->reattach(hostId, sessionId, savedState);
resumeStartup();
}
@@ -386,13 +386,13 @@ void WebSharedWorkerImpl::detachDevTools()
devtoolsAgent->detach();
}
-void WebSharedWorkerImpl::dispatchDevToolsMessage(const WebString& message)
+void WebSharedWorkerImpl::dispatchDevToolsMessage(int sessionId, const WebString& message)
{
if (m_askedToTerminate)
return;
WebDevToolsAgent* devtoolsAgent = m_mainFrame->devToolsAgent();
if (devtoolsAgent)
- devtoolsAgent->dispatchOnInspectorBackend(message);
+ devtoolsAgent->dispatchOnInspectorBackend(sessionId, message);
}
WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client)
« no previous file with comments | « third_party/WebKit/Source/web/WebSharedWorkerImpl.h ('k') | third_party/WebKit/public/web/WebDevToolsAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698