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

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

Issue 894973003: ServiceWorker: Make "ready" fetches registration from browser process(2/3). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: #13 Created 5 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_dispatcher_host.cc
diff --git a/content/browser/service_worker/service_worker_dispatcher_host.cc b/content/browser/service_worker/service_worker_dispatcher_host.cc
index 6ffbfc5c9a869b086f2777336467e1a83e62b6ae..815165e09bbbc1d88c41e22e8453ae0bafad5147 100644
--- a/content/browser/service_worker/service_worker_dispatcher_host.cc
+++ b/content/browser/service_worker/service_worker_dispatcher_host.cc
@@ -163,6 +163,8 @@ bool ServiceWorkerDispatcherHost::OnMessageReceived(
OnUnregisterServiceWorker)
IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_GetRegistration,
OnGetRegistration)
+ IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_GetRegistrationForReady,
+ OnGetRegistrationForReady)
IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_ProviderCreated,
OnProviderCreated)
IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_ProviderDestroyed,
@@ -492,6 +494,33 @@ void ServiceWorkerDispatcherHost::OnGetRegistration(
request_id));
}
+void ServiceWorkerDispatcherHost::OnGetRegistrationForReady(
+ int thread_id,
+ int request_id,
+ int provider_id) {
+ TRACE_EVENT0("ServiceWorker",
+ "ServiceWorkerDispatcherHost::OnGetRegistrationForReady");
+ if (!GetContext())
+ return;
+ ServiceWorkerProviderHost* provider_host =
+ GetContext()->GetProviderHost(render_process_id_, provider_id);
+ if (!provider_host || !provider_host->IsContextAlive()) {
+ BadMessageReceived();
falken 2015/03/02 02:09:40 It seems possible for IsContextAlive to be false h
xiang 2015/03/03 08:56:03 Done.
+ return;
+ }
+
+ TRACE_EVENT_ASYNC_BEGIN0(
+ "ServiceWorker",
+ "ServiceWorkerDispatcherHost::GetRegistrationForReady",
+ request_id);
+
+ if (!provider_host->GetRegistrationForReady(base::Bind(
+ &ServiceWorkerDispatcherHost::GetRegistrationForReadyComplete,
+ this, thread_id, request_id, provider_host->AsWeakPtr()))) {
+ BadMessageReceived();
+ }
+}
+
void ServiceWorkerDispatcherHost::OnPostMessageToWorker(
int handle_id,
const base::string16& message,
@@ -905,6 +934,30 @@ void ServiceWorkerDispatcherHost::GetRegistrationComplete(
thread_id, request_id, info, attrs));
}
+void ServiceWorkerDispatcherHost::GetRegistrationForReadyComplete(
+ int thread_id,
+ int request_id,
+ base::WeakPtr<ServiceWorkerProviderHost> provider_host,
+ ServiceWorkerRegistration* registration) {
+ DCHECK(registration);
+ TRACE_EVENT_ASYNC_END1("ServiceWorker",
+ "ServiceWorkerDispatcherHost::GetRegistrationForReady",
+ request_id,
+ "Registration ID",
+ registration ? registration->id()
+ : kInvalidServiceWorkerRegistrationId);
+
+ if (!GetContext())
+ return;
+
+ ServiceWorkerRegistrationObjectInfo info;
+ ServiceWorkerVersionAttributes attrs;
+ GetRegistrationObjectInfoAndVersionAttributes(
+ provider_host, registration, &info, &attrs);
+ Send(new ServiceWorkerMsg_DidGetRegistrationForReady(
+ thread_id, request_id, info, attrs));
+}
+
void ServiceWorkerDispatcherHost::SendRegistrationError(
int thread_id,
int request_id,

Powered by Google App Engine
This is Rietveld 408576698