| Index: content/browser/service_worker/service_worker_dispatcher_host.h
|
| diff --git a/content/browser/service_worker/service_worker_dispatcher_host.h b/content/browser/service_worker/service_worker_dispatcher_host.h
|
| index 64001e09b9e4109615621a63412d8225b33e79d1..1b555e2a0e114bee7bbae1097d25ef5ce6250f3e 100644
|
| --- a/content/browser/service_worker/service_worker_dispatcher_host.h
|
| +++ b/content/browser/service_worker/service_worker_dispatcher_host.h
|
| @@ -54,19 +54,16 @@ class CONTENT_EXPORT ServiceWorkerDispatcherHost : public BrowserMessageFilter {
|
| // be destroyed.
|
| bool Send(IPC::Message* message) override;
|
|
|
| + void RegisterServiceWorkerHandle(scoped_ptr<ServiceWorkerHandle> handle);
|
| + void RegisterServiceWorkerRegistrationHandle(
|
| + scoped_ptr<ServiceWorkerRegistrationHandle> handle);
|
| +
|
| // Returns the existing registration handle whose reference count is
|
| // incremented or newly created one if it doesn't exist.
|
| ServiceWorkerRegistrationHandle* GetOrCreateRegistrationHandle(
|
| - int provider_id,
|
| + base::WeakPtr<ServiceWorkerProviderHost> provider_host,
|
| ServiceWorkerRegistration* registration);
|
|
|
| - // Creates a ServiceWorkerHandle to retain |version| and returns a
|
| - // ServiceWorkerInfo with a newly created handle ID. The handle is held in
|
| - // the dispatcher host until its ref-count becomes zero via
|
| - // OnDecrementServiceWorkerRefCount.
|
| - ServiceWorkerObjectInfo CreateAndRegisterServiceWorkerHandle(
|
| - ServiceWorkerVersion* version);
|
| -
|
| MessagePortMessageFilter* message_port_message_filter() {
|
| return message_port_message_filter_;
|
| }
|
| @@ -124,16 +121,12 @@ class CONTENT_EXPORT ServiceWorkerDispatcherHost : public BrowserMessageFilter {
|
| void OnServiceWorkerObjectDestroyed(int handle_id);
|
| void OnTerminateWorker(int handle_id);
|
|
|
| - void RegisterServiceWorkerHandle(scoped_ptr<ServiceWorkerHandle> handle);
|
| - void RegisterServiceWorkerRegistrationHandle(
|
| - scoped_ptr<ServiceWorkerRegistrationHandle> handle);
|
| -
|
| ServiceWorkerRegistrationHandle* FindRegistrationHandle(
|
| int provider_id,
|
| int64 registration_id);
|
|
|
| void GetRegistrationObjectInfoAndVersionAttributes(
|
| - int provider_id,
|
| + base::WeakPtr<ServiceWorkerProviderHost> provider_host,
|
| ServiceWorkerRegistration* registration,
|
| ServiceWorkerRegistrationObjectInfo* info,
|
| ServiceWorkerVersionAttributes* attrs);
|
|
|