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

Unified Diff: content/browser/devtools/embedded_worker_devtools_agent_host.cc

Issue 470923004: DevTools: DevToolsAgentHost::Close/GetURL for service workers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed crash Created 6 years, 4 months 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: content/browser/devtools/embedded_worker_devtools_agent_host.cc
diff --git a/content/browser/devtools/embedded_worker_devtools_agent_host.cc b/content/browser/devtools/embedded_worker_devtools_agent_host.cc
index 9f604001134b61ba4a11c8e40974e723e8b516e5..315953d0ce6ad3acc703a3c55b0b333ee2d5b725 100644
--- a/content/browser/devtools/embedded_worker_devtools_agent_host.cc
+++ b/content/browser/devtools/embedded_worker_devtools_agent_host.cc
@@ -7,12 +7,37 @@
#include "content/browser/devtools/devtools_manager_impl.h"
#include "content/browser/devtools/devtools_protocol.h"
#include "content/browser/devtools/devtools_protocol_constants.h"
+#include "content/browser/service_worker/service_worker_context_core.h"
+#include "content/browser/service_worker/service_worker_version.h"
+#include "content/browser/shared_worker/shared_worker_service_impl.h"
#include "content/common/devtools_messages.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_process_host.h"
namespace content {
+namespace {
+
+void TerminateSharedWorkerOnIO(
+ EmbeddedWorkerDevToolsAgentHost::WorkerId worker_id) {
+ SharedWorkerServiceImpl::GetInstance()->TerminateWorker(
+ worker_id.first, worker_id.second);
+}
+
+void StatusNoOp(ServiceWorkerStatusCode status) {
+}
+
+void TerminateServiceWorkerOnIO(
+ base::WeakPtr<ServiceWorkerContextCore> context_weak,
+ int64 version_id) {
+ if (ServiceWorkerContextCore* context = context_weak.get()) {
+ if (ServiceWorkerVersion* version = context->GetLiveVersion(version_id))
+ version->StopWorker(base::Bind(&StatusNoOp));
+ }
+}
+
+}
+
EmbeddedWorkerDevToolsAgentHost::EmbeddedWorkerDevToolsAgentHost(
WorkerId worker_id,
const SharedWorkerInstance& shared_worker)
@@ -38,6 +63,30 @@ bool EmbeddedWorkerDevToolsAgentHost::IsWorker() const {
return true;
}
+GURL EmbeddedWorkerDevToolsAgentHost::GetURL() {
+ if (shared_worker_)
+ return shared_worker_->url();
+ if (service_worker_)
+ return service_worker_->url();
+ return GURL();
+}
+
+bool EmbeddedWorkerDevToolsAgentHost::Close() {
+ if (shared_worker_) {
+ BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+ base::Bind(&TerminateSharedWorkerOnIO, worker_id_));
+ return true;
+ }
+ if (service_worker_) {
+ BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+ base::Bind(&TerminateServiceWorkerOnIO,
+ service_worker_->context_weak(),
+ service_worker_->version_id()));
+ return true;
+ }
+ return false;
+}
+
void EmbeddedWorkerDevToolsAgentHost::SendMessageToAgent(
IPC::Message* message_raw) {
scoped_ptr<IPC::Message> message(message_raw);

Powered by Google App Engine
This is Rietveld 408576698