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

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

Issue 2352173004: Mojoify FetchEvent of Service Worker. (Closed)
Patch Set: incorporated dcheng's comment Created 4 years, 2 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_fetch_dispatcher.cc
diff --git a/content/browser/service_worker/service_worker_fetch_dispatcher.cc b/content/browser/service_worker/service_worker_fetch_dispatcher.cc
index 7d71218ea20a8d40d78047ee7aee788d5f6ac9d5..601f64fe3806c7c2492ddcac0aeee4405080b862 100644
--- a/content/browser/service_worker/service_worker_fetch_dispatcher.cc
+++ b/content/browser/service_worker/service_worker_fetch_dispatcher.cc
@@ -12,7 +12,9 @@
#include "base/trace_event/trace_event.h"
#include "content/browser/service_worker/embedded_worker_status.h"
#include "content/browser/service_worker/service_worker_version.h"
+#include "content/common/service_worker/fetch_event_dispatcher.mojom.h"
#include "content/common/service_worker/service_worker_messages.h"
+#include "content/common/service_worker/service_worker_status_code.h"
#include "content/common/service_worker/service_worker_utils.h"
#include "net/log/net_log.h"
#include "net/log/net_log_capture_mode.h"
@@ -74,6 +76,14 @@ ServiceWorkerMetrics::EventType FetchTypeToWaitUntilEventType(
return ServiceWorkerMetrics::EventType::FETCH_WAITUNTIL;
}
+void OnFetchEventFinished(ServiceWorkerVersion* version,
+ int event_finish_id,
+ ServiceWorkerStatusCode status,
+ base::Time dispatch_event_time) {
+ version->FinishRequest(event_finish_id, status != SERVICE_WORKER_ERROR_ABORT,
+ dispatch_event_time);
+}
+
} // namespace
// Helper to receive the fetch event response even if
@@ -211,11 +221,16 @@ void ServiceWorkerFetchDispatcher::DispatchFetchEvent() {
response_id,
base::Bind(&ServiceWorkerFetchDispatcher::ResponseCallback::Run,
base::Owned(response_callback)));
- version_->RegisterSimpleRequest<ServiceWorkerHostMsg_FetchEventFinished>(
- event_finish_id);
- version_->DispatchEvent({response_id, event_finish_id},
- ServiceWorkerMsg_FetchEvent(
- response_id, event_finish_id, *request_.get()));
+
+ base::WeakPtr<mojom::FetchEventDispatcher> dispatcher =
+ version_->GetMojoServiceForRequest<mojom::FetchEventDispatcher>(
+ event_finish_id);
+ // |dispatcher| is owned by |version_|. So it is safe to pass the unretained
+ // raw pointer of |version_| to OnFetchEventFinished callback.
+ dispatcher->DispatchFetchEvent(
+ response_id, *request_,
+ base::Bind(&OnFetchEventFinished, base::Unretained(version_.get()),
+ event_finish_id));
}
void ServiceWorkerFetchDispatcher::DidFailToDispatch(

Powered by Google App Engine
This is Rietveld 408576698