| Index: Source/modules/serviceworkers/ServiceWorkerRegistration.h
|
| diff --git a/Source/modules/serviceworkers/ServiceWorkerRegistration.h b/Source/modules/serviceworkers/ServiceWorkerRegistration.h
|
| index 5d15289f999a257dc4138cc462abac5f43e216e7..00a24013fa0a7902fbfed85e34933ae5a9d2fac5 100644
|
| --- a/Source/modules/serviceworkers/ServiceWorkerRegistration.h
|
| +++ b/Source/modules/serviceworkers/ServiceWorkerRegistration.h
|
| @@ -23,11 +23,11 @@ class ScriptState;
|
| class WebServiceWorkerProvider;
|
|
|
| class ServiceWorkerRegistration FINAL
|
| - : public RefCountedWillBeRefCountedGarbageCollected<ServiceWorkerRegistration>
|
| + : public RefCountedGarbageCollected<ServiceWorkerRegistration>
|
| , public ActiveDOMObject
|
| , public EventTargetWithInlineData
|
| , public WebServiceWorkerRegistrationProxy {
|
| - REFCOUNTED_EVENT_TARGET(ServiceWorkerRegistration);
|
| + DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<ServiceWorkerRegistration>);
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ServiceWorkerRegistration);
|
| public:
|
| virtual ~ServiceWorkerRegistration() { }
|
| @@ -44,7 +44,7 @@ public:
|
|
|
| // For CallbackPromiseAdapter.
|
| typedef WebServiceWorkerRegistration WebType;
|
| - static PassRefPtrWillBeRawPtr<ServiceWorkerRegistration> take(ScriptPromiseResolver*, WebType* registration);
|
| + static ServiceWorkerRegistration* take(ScriptPromiseResolver*, WebType* registration);
|
| static void dispose(WebType* registration);
|
|
|
| PassRefPtrWillBeRawPtr<ServiceWorker> installing() { return m_installing.get(); }
|
| @@ -60,7 +60,7 @@ public:
|
| virtual void trace(Visitor*) OVERRIDE;
|
|
|
| private:
|
| - static PassRefPtrWillBeRawPtr<ServiceWorkerRegistration> getOrCreate(ExecutionContext*, WebServiceWorkerRegistration*);
|
| + static ServiceWorkerRegistration* getOrCreate(ExecutionContext*, WebServiceWorkerRegistration*);
|
| ServiceWorkerRegistration(ExecutionContext*, PassOwnPtr<WebServiceWorkerRegistration>);
|
|
|
| // ActiveDOMObject overrides.
|
|
|