| Index: Source/modules/serviceworkers/ServiceWorkerContainer.h
|
| diff --git a/Source/modules/serviceworkers/ServiceWorkerContainer.h b/Source/modules/serviceworkers/ServiceWorkerContainer.h
|
| index 119586d8078d7b98d6ad3f355c03c7cf0efac990..a42b5f1f208ecd06fd51f2418d8df3eb34863ab4 100644
|
| --- a/Source/modules/serviceworkers/ServiceWorkerContainer.h
|
| +++ b/Source/modules/serviceworkers/ServiceWorkerContainer.h
|
| @@ -40,7 +40,6 @@
|
| #include "public/platform/WebServiceWorkerProviderClient.h"
|
| #include "wtf/Forward.h"
|
| #include "wtf/PassRefPtr.h"
|
| -#include "wtf/RefCounted.h"
|
| #include "wtf/RefPtr.h"
|
|
|
| namespace blink {
|
| @@ -52,12 +51,12 @@ class WebServiceWorker;
|
| class WebServiceWorkerProvider;
|
|
|
| class ServiceWorkerContainer FINAL
|
| - : public RefCountedWillBeGarbageCollectedFinalized<ServiceWorkerContainer>
|
| + : public GarbageCollectedFinalized<ServiceWorkerContainer>
|
| , public ScriptWrappable
|
| , public ContextLifecycleObserver
|
| , public WebServiceWorkerProviderClient {
|
| public:
|
| - static PassRefPtrWillBeRawPtr<ServiceWorkerContainer> create(ExecutionContext*);
|
| + static ServiceWorkerContainer* create(ExecutionContext*);
|
| ~ServiceWorkerContainer();
|
|
|
| void willBeDetachedFromFrame();
|
| @@ -84,7 +83,7 @@ public:
|
| private:
|
| explicit ServiceWorkerContainer(ExecutionContext*);
|
|
|
| - typedef ScriptPromiseProperty<RawPtrWillBeMember<ServiceWorkerContainer>, RefPtrWillBeMember<ServiceWorker>, RefPtrWillBeMember<ServiceWorker> > ReadyProperty;
|
| + typedef ScriptPromiseProperty<Member<ServiceWorkerContainer>, RefPtrWillBeMember<ServiceWorker>, RefPtrWillBeMember<ServiceWorker> > ReadyProperty;
|
| ReadyProperty* createReadyProperty();
|
| void checkReadyChanged(PassRefPtrWillBeRawPtr<ServiceWorker> previousReadyWorker);
|
|
|
| @@ -93,7 +92,7 @@ private:
|
| RefPtrWillBeMember<ServiceWorker> m_controller;
|
| RefPtrWillBeMember<ServiceWorker> m_installing;
|
| RefPtrWillBeMember<ServiceWorker> m_waiting;
|
| - PersistentWillBeMember<ReadyProperty> m_ready;
|
| + Member<ReadyProperty> m_ready;
|
| };
|
|
|
| } // namespace blink
|
|
|