Index: content/browser/service_worker/service_worker_provider_host.cc |
diff --git a/content/browser/service_worker/service_worker_provider_host.cc b/content/browser/service_worker/service_worker_provider_host.cc |
index e16454558e0ec9cc46862b3110a811dcf3bfca6f..8e84c9d1176ff2f92286a1a1bbb49e2b482a22e8 100644 |
--- a/content/browser/service_worker/service_worker_provider_host.cc |
+++ b/content/browser/service_worker/service_worker_provider_host.cc |
@@ -55,6 +55,14 @@ void ServiceWorkerProviderHost::OnRegistrationFailed( |
DisassociateRegistration(); |
} |
+void ServiceWorkerProviderHost::OnSkippedWaiting( |
+ ServiceWorkerRegistration* registration) { |
+ DCHECK_EQ(associated_registration_.get(), registration); |
+ ServiceWorkerVersion* active_version = registration->active_version(); |
+ DCHECK_EQ(active_version->status(), ServiceWorkerVersion::ACTIVATING); |
+ SetControllerVersionAttribute(active_version); |
+} |
+ |
void ServiceWorkerProviderHost::SetDocumentUrl(const GURL& url) { |
DCHECK(!url.has_ref()); |
document_url_ = url; |
@@ -79,8 +87,12 @@ void ServiceWorkerProviderHost::SetControllerVersionAttribute( |
if (!dispatcher_host_) |
return; // Could be NULL in some tests. |
+ bool should_notify_controllerchange = |
+ previous_version.get() && version && version->skip_waiting(); |
dcheng
2014/12/04 00:17:09
previous_version && ...
xiang
2014/12/04 07:51:37
Done.
|
+ |
dispatcher_host_->Send(new ServiceWorkerMsg_SetControllerServiceWorker( |
- kDocumentMainThreadId, provider_id(), CreateHandleAndPass(version))); |
+ kDocumentMainThreadId, provider_id(), CreateHandleAndPass(version), |
+ should_notify_controllerchange)); |
} |
bool ServiceWorkerProviderHost::SetHostedVersionId(int64 version_id) { |