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

Unified Diff: content/browser/service_worker/service_worker_version.cc

Issue 493373002: ServiceWorker: Add prepare_callback in DispatchFetchEvent to notify the end of SW preparation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Incorporate the reviewers comment 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/service_worker/service_worker_version.cc
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
index 161b89489a55a96e88365f061a00337245f047c0..3c0ad0847fa096d82b13ff96b6e099a836fa9f27 100644
--- a/content/browser/service_worker/service_worker_version.cc
+++ b/content/browser/service_worker/service_worker_version.cc
@@ -287,27 +287,32 @@ void ServiceWorkerVersion::DispatchActivateEvent(
void ServiceWorkerVersion::DispatchFetchEvent(
const ServiceWorkerFetchRequest& request,
- const FetchCallback& callback) {
+ const base::Closure& prepare_callback,
+ const FetchCallback& fetch_callback) {
DCHECK_EQ(ACTIVATED, status()) << status();
if (running_status() != RUNNING) {
// Schedule calling this method after starting the worker.
StartWorker(base::Bind(&RunTaskAfterStartWorker,
weak_factory_.GetWeakPtr(),
- base::Bind(&RunErrorFetchCallback, callback),
+ base::Bind(&RunErrorFetchCallback, fetch_callback),
base::Bind(&self::DispatchFetchEvent,
weak_factory_.GetWeakPtr(),
- request, callback)));
+ request,
+ prepare_callback,
+ fetch_callback)));
return;
}
- int request_id = fetch_callbacks_.Add(new FetchCallback(callback));
+ prepare_callback.Run();
+
+ int request_id = fetch_callbacks_.Add(new FetchCallback(fetch_callback));
ServiceWorkerStatusCode status = embedded_worker_->SendMessage(
ServiceWorkerMsg_FetchEvent(request_id, request));
if (status != SERVICE_WORKER_OK) {
fetch_callbacks_.Remove(request_id);
RunSoon(base::Bind(&RunErrorFetchCallback,
- callback,
+ fetch_callback,
SERVICE_WORKER_ERROR_FAILED));
}
}

Powered by Google App Engine
This is Rietveld 408576698