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

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

Issue 164753006: Start of Chrome-side plumbing for ServiceWorker fetch (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove empty line Created 6 years, 10 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 7948df57d1dccef5b3b9651a76fbf6b6afd6dfd9..c4cd44b6d71205ca68628a8e775e06874f08507a 100644
--- a/content/browser/service_worker/service_worker_version.cc
+++ b/content/browser/service_worker/service_worker_version.cc
@@ -74,6 +74,20 @@ void HandleInstallFinished(const StatusCallback& callback,
callback.Run(SERVICE_WORKER_OK);
}
+void HandleFetchResponse(const ServiceWorkerVersion::FetchCallback& callback,
+ ServiceWorkerStatusCode status,
+ const IPC::Message& message) {
+ Tuple1<ServiceWorkerFetchResponse> response;
+ if (message.type() != ServiceWorkerHostMsg_FetchEventFinished::ID) {
+ NOTREACHED() << "Got unexpected response for FetchEvent: "
+ << message.type();
+ callback.Run(SERVICE_WORKER_ERROR_FAILED, response.a);
+ return;
+ }
+ ServiceWorkerHostMsg_FetchEventFinished::Read(&message, &response);
+ callback.Run(status, response.a);
+}
+
} // namespace
ServiceWorkerVersion::ServiceWorkerVersion(
@@ -194,13 +208,12 @@ void ServiceWorkerVersion::DispatchInstallEvent(
base::Bind(&HandleInstallFinished, callback));
}
-bool ServiceWorkerVersion::DispatchFetchEvent(
- const ServiceWorkerFetchRequest& request) {
- if (status() != RUNNING)
- return false;
- return embedded_worker_->SendMessage(
- kInvalidRequestId, ServiceWorkerMsg_FetchEvent(request))
- == SERVICE_WORKER_OK;
+void ServiceWorkerVersion::DispatchFetchEvent(
+ const ServiceWorkerFetchRequest& request,
+ const FetchCallback& callback) {
+ SendMessageAndRegisterCallback(
+ ServiceWorkerMsg_FetchEvent(request),
+ base::Bind(&HandleFetchResponse, callback));
}
void ServiceWorkerVersion::AddProcessToWorker(int process_id) {
« no previous file with comments | « content/browser/service_worker/service_worker_version.h ('k') | content/common/service_worker/service_worker_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698