Chromium Code Reviews| Index: Source/modules/serviceworkers/ServiceWorkerRegistration.h |
| diff --git a/Source/modules/serviceworkers/ServiceWorkerRegistration.h b/Source/modules/serviceworkers/ServiceWorkerRegistration.h |
| index 3d9e98612df9b2dd50492bb1faccb6cd1e30682f..19ed60745f06b45d5f06f0880d93b94db3c07f42 100644 |
| --- a/Source/modules/serviceworkers/ServiceWorkerRegistration.h |
| +++ b/Source/modules/serviceworkers/ServiceWorkerRegistration.h |
| @@ -43,8 +43,8 @@ public: |
| void setWaiting(WebServiceWorker*) override; |
| void setActive(WebServiceWorker*) override; |
| - static ServiceWorkerRegistration* from(ExecutionContext*, WebServiceWorkerRegistration*); |
| - static ServiceWorkerRegistration* take(ScriptPromiseResolver*, WebServiceWorkerRegistration*); |
| + static ServiceWorkerRegistration* create(ExecutionContext*, PassOwnPtr<WebServiceWorkerRegistration>); |
| + static ServiceWorkerRegistration* take(ScriptPromiseResolver*, PassOwnPtr<WebServiceWorkerRegistration>); |
|
falken
2015/08/26 07:47:57
Can you document these functions? I don't intuitiv
nhiroki
2015/08/26 08:16:01
Removed take(). take() was used for CallbackPromis
|
| static void dispose(WebServiceWorkerRegistration*); |
| ServiceWorker* installing() { return m_installing; } |
| @@ -67,7 +67,6 @@ public: |
| DECLARE_VIRTUAL_TRACE(); |
| private: |
| - static ServiceWorkerRegistration* getOrCreate(ExecutionContext*, WebServiceWorkerRegistration*); |
| ServiceWorkerRegistration(ExecutionContext*, PassOwnPtr<WebServiceWorkerRegistration>); |
| // ActiveDOMObject overrides. |
| @@ -90,15 +89,9 @@ public: |
| { |
| HeapVector<Member<ServiceWorkerRegistration>> registrations; |
| for (WebServiceWorkerRegistration* registration : *webServiceWorkerRegistrations) |
| - registrations.append(ServiceWorkerRegistration::take(resolver, registration)); |
| + registrations.append(ServiceWorkerRegistration::take(resolver, adoptPtr(registration))); |
| return registrations; |
| } |
| - |
| - static void dispose(PassOwnPtr<WebVector<WebServiceWorkerRegistration*>> webServiceWorkerRegistrations) |
| - { |
| - for (WebServiceWorkerRegistration* registration : *webServiceWorkerRegistrations) |
| - ServiceWorkerRegistration::dispose(registration); |
| - } |
| }; |
| } // namespace blink |