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 130d87c4e15f8b1fab07bfbf864dd5c48b7a64df..9cd1831b77515b1e5351e924e340ace68b1dadc6 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_event_type.h" |
@@ -71,6 +73,16 @@ ServiceWorkerMetrics::EventType FetchTypeToWaitUntilEventType( |
return ServiceWorkerMetrics::EventType::FETCH_WAITUNTIL; |
} |
+void OnFetchEventFinished(base::WeakPtr<ServiceWorkerVersion> active_version, |
+ int event_finish_id, |
+ ServiceWorkerStatusCode status, |
+ base::Time dispatch_event_time) { |
+ DCHECK(active_version); |
dcheng
2016/09/30 08:54:43
Why bind WeakPtr if we just assert that's it's alw
horo
2016/10/03 02:30:57
Done.
Passing the unretained raw pointer seems bet
|
+ active_version->FinishRequest(event_finish_id, |
+ status != SERVICE_WORKER_ERROR_ABORT, |
+ dispatch_event_time); |
+} |
+ |
} // namespace |
// Helper to receive the fetch event response even if |
@@ -208,11 +220,14 @@ 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->DispatchFetchEvent( |
+ response_id, *request_.get(), |
+ base::Bind(&OnFetchEventFinished, version_->GetWeakPtr(), |
+ event_finish_id)); |
} |
void ServiceWorkerFetchDispatcher::DidFailToDispatch( |