diff options
6 files changed, 4 insertions, 9 deletions
diff --git a/content/browser/service_worker/service_worker_provider_host.cc b/content/browser/service_worker/service_worker_provider_host.cc index 50d4f4e..a27a2c1 100644 --- a/content/browser/service_worker/service_worker_provider_host.cc +++ b/content/browser/service_worker/service_worker_provider_host.cc @@ -587,8 +587,8 @@ void ServiceWorkerProviderHost::SendSetVersionAttributesMessage( attrs.active = GetOrCreateServiceWorkerHandle(active_version); Send(new ServiceWorkerMsg_SetVersionAttributes( - render_thread_id_, provider_id_, registration_handle_id, - changed_mask.changed(), attrs)); + render_thread_id_, registration_handle_id, changed_mask.changed(), + attrs)); } void ServiceWorkerProviderHost::SendServiceWorkerStateChangedMessage( diff --git a/content/child/service_worker/service_worker_dispatcher.cc b/content/child/service_worker/service_worker_dispatcher.cc index 489506d..7419a2b 100644 --- a/content/child/service_worker/service_worker_dispatcher.cc +++ b/content/child/service_worker/service_worker_dispatcher.cc @@ -664,7 +664,6 @@ void ServiceWorkerDispatcher::OnServiceWorkerStateChanged( void ServiceWorkerDispatcher::OnSetVersionAttributes( int thread_id, - int provider_id, int registration_handle_id, int changed_mask, const ServiceWorkerVersionAttributes& attrs) { diff --git a/content/child/service_worker/service_worker_dispatcher.h b/content/child/service_worker/service_worker_dispatcher.h index 32fc133..cbc43bf 100644 --- a/content/child/service_worker/service_worker_dispatcher.h +++ b/content/child/service_worker/service_worker_dispatcher.h @@ -247,7 +247,6 @@ class CONTENT_EXPORT ServiceWorkerDispatcher : public WorkerThread::Observer { int handle_id, blink::WebServiceWorkerState state); void OnSetVersionAttributes(int thread_id, - int provider_id, int registration_handle_id, int changed_mask, const ServiceWorkerVersionAttributes& attributes); diff --git a/content/child/service_worker/service_worker_message_filter.cc b/content/child/service_worker/service_worker_message_filter.cc index 6429621..7aa24d9 100644 --- a/content/child/service_worker/service_worker_message_filter.cc +++ b/content/child/service_worker/service_worker_message_filter.cc @@ -90,7 +90,6 @@ void ServiceWorkerMessageFilter::OnStaleRegistered( void ServiceWorkerMessageFilter::OnStaleSetVersionAttributes( int thread_id, - int provider_id, int registration_handle_id, int changed_mask, const ServiceWorkerVersionAttributes& attrs) { diff --git a/content/child/service_worker/service_worker_message_filter.h b/content/child/service_worker/service_worker_message_filter.h index d6fdeb9..6199592 100644 --- a/content/child/service_worker/service_worker_message_filter.h +++ b/content/child/service_worker/service_worker_message_filter.h @@ -40,7 +40,6 @@ class CONTENT_EXPORT ServiceWorkerMessageFilter const ServiceWorkerVersionAttributes& attrs); void OnStaleSetVersionAttributes( int thread_id, - int provider_id, int registration_handle_id, int changed_mask, const ServiceWorkerVersionAttributes& attrs); diff --git a/content/common/service_worker/service_worker_messages.h b/content/common/service_worker/service_worker_messages.h index a9e2821..8164130 100644 --- a/content/common/service_worker/service_worker_messages.h +++ b/content/common/service_worker/service_worker_messages.h @@ -402,10 +402,9 @@ IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_ServiceWorkerStateChanged, int /* handle_id */, blink::WebServiceWorkerState) -// Tells the child process to set service workers for the given provider. -IPC_MESSAGE_CONTROL5(ServiceWorkerMsg_SetVersionAttributes, +// Tells the child process to set service workers for the given registration. +IPC_MESSAGE_CONTROL4(ServiceWorkerMsg_SetVersionAttributes, int /* thread_id */, - int /* provider_id */, int /* registration_handle_id */, int /* changed_mask */, content::ServiceWorkerVersionAttributes) |