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

Unified Diff: content/browser/service_worker/embedded_worker_instance.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
« no previous file with comments | « content/browser/devtools/embedded_worker_devtools_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/service_worker/embedded_worker_instance.cc
diff --git a/content/browser/service_worker/embedded_worker_instance.cc b/content/browser/service_worker/embedded_worker_instance.cc
index 4ede1ce0b233a4e4b412e2458a2ee1ac4f6c9863..a0e85dad68e3e406f6a9e9495e190e5528844681 100644
--- a/content/browser/service_worker/embedded_worker_instance.cc
+++ b/content/browser/service_worker/embedded_worker_instance.cc
@@ -56,8 +56,10 @@ void NotifyWorkerDestroyed(int worker_process_id, int worker_route_id) {
void RegisterToWorkerDevToolsManager(
int process_id,
- const ServiceWorkerContextCore* const service_worker_context,
+ const ServiceWorkerContextCore* service_worker_context,
+ base::WeakPtr<ServiceWorkerContextCore> service_worker_context_weak,
int64 service_worker_version_id,
+ const GURL& url,
const base::Callback<void(int worker_devtools_agent_route_id,
bool wait_for_debugger)>& callback) {
if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
@@ -66,7 +68,9 @@ void RegisterToWorkerDevToolsManager(
base::Bind(RegisterToWorkerDevToolsManager,
process_id,
service_worker_context,
+ service_worker_context_weak,
service_worker_version_id,
+ url,
callback));
return;
}
@@ -80,7 +84,10 @@ void RegisterToWorkerDevToolsManager(
process_id,
worker_devtools_agent_route_id,
EmbeddedWorkerDevToolsManager::ServiceWorkerIdentifier(
- service_worker_context, service_worker_version_id));
+ service_worker_context,
+ service_worker_context_weak,
+ service_worker_version_id,
+ url));
}
BrowserThread::PostTask(
BrowserThread::IO,
@@ -223,10 +230,13 @@ void EmbeddedWorkerInstance::ProcessAllocated(
}
const int64 service_worker_version_id = params->service_worker_version_id;
process_id_ = process_id;
+ GURL script_url(params->script_url);
RegisterToWorkerDevToolsManager(
process_id,
context_.get(),
+ context_,
service_worker_version_id,
+ script_url,
base::Bind(&EmbeddedWorkerInstance::SendStartWorker,
weak_factory_.GetWeakPtr(),
base::Passed(&params),
« no previous file with comments | « content/browser/devtools/embedded_worker_devtools_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698