| Index: content/child/service_worker/service_worker_dispatcher.h
|
| diff --git a/content/child/service_worker/service_worker_dispatcher.h b/content/child/service_worker/service_worker_dispatcher.h
|
| index 45d75acbea3924092340f69e6d696081fe4f8d23..ead88e6a7ab42430dc966658a7cfc1d8b67e84fb 100644
|
| --- a/content/child/service_worker/service_worker_dispatcher.h
|
| +++ b/content/child/service_worker/service_worker_dispatcher.h
|
| @@ -118,9 +118,9 @@ class CONTENT_EXPORT ServiceWorkerDispatcher
|
| // WebServiceWorkerImpl, in which case ownership is transferred to
|
| // the caller who must bounce it to a method that will associate it
|
| // with a WebCore::ServiceWorker.
|
| - WebServiceWorkerImpl* GetServiceWorker(
|
| - const ServiceWorkerObjectInfo& info,
|
| - bool adopt_handle);
|
| + WebServiceWorkerImpl* GetServiceWorker(const ServiceWorkerObjectInfo& info,
|
| + int provider_id,
|
| + bool adopt_handle);
|
|
|
| // Creates a WebServiceWorkerRegistrationImpl for the specified registration
|
| // and transfers its ownership to the caller. If |adopt_handle| is true, a
|
| @@ -179,6 +179,7 @@ class CONTENT_EXPORT ServiceWorkerDispatcher
|
| int provider_id);
|
| void OnRegistered(int thread_id,
|
| int request_id,
|
| + int provider_id,
|
| const ServiceWorkerRegistrationObjectInfo& info,
|
| const ServiceWorkerVersionAttributes& attrs);
|
| void OnUnregistered(int thread_id,
|
| @@ -186,16 +187,19 @@ class CONTENT_EXPORT ServiceWorkerDispatcher
|
| bool is_success);
|
| void OnDidGetRegistration(int thread_id,
|
| int request_id,
|
| + int provider_id,
|
| const ServiceWorkerRegistrationObjectInfo& info,
|
| const ServiceWorkerVersionAttributes& attrs);
|
| void OnDidGetRegistrations(
|
| int thread_id,
|
| int request_id,
|
| + int provider_id,
|
| const std::vector<ServiceWorkerRegistrationObjectInfo>& infos,
|
| const std::vector<ServiceWorkerVersionAttributes>& attrs);
|
| void OnDidGetRegistrationForReady(
|
| int thread_id,
|
| int request_id,
|
| + int provider_id,
|
| const ServiceWorkerRegistrationObjectInfo& info,
|
| const ServiceWorkerVersionAttributes& attrs);
|
| void OnRegistrationError(int thread_id,
|
| @@ -249,6 +253,7 @@ class CONTENT_EXPORT ServiceWorkerDispatcher
|
| // TODO(nhiroki): This assumption seems to impair readability. We could
|
| // explictly pass ServiceWorker(Registration)HandleReference instead.
|
| WebServiceWorkerRegistrationImpl* FindOrCreateRegistration(
|
| + int provider_id,
|
| const ServiceWorkerRegistrationObjectInfo& info,
|
| const ServiceWorkerVersionAttributes& attrs);
|
|
|
|
|