Index: third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.h |
diff --git a/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.h b/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.h |
index 7c90213ceeff3dff31c8b6f34ce009e17f9af8f0..d6581478d064b2a3baa831b6166031fa26b12509 100644 |
--- a/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.h |
+++ b/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.h |
@@ -62,12 +62,13 @@ struct WebSyncRegistration; |
// workerThreadTerminated() is called by its corresponding |
// WorkerGlobalScope. |
class ServiceWorkerGlobalScopeProxy final |
- : public WebServiceWorkerContextProxy |
+ : public NoBaseWillBeGarbageCollectedFinalized<ServiceWorkerGlobalScopeProxy> |
+ , public WebServiceWorkerContextProxy |
, public WorkerReportingProxy { |
WTF_MAKE_NONCOPYABLE(ServiceWorkerGlobalScopeProxy); |
- USING_FAST_MALLOC(ServiceWorkerGlobalScopeProxy); |
+ USING_FAST_MALLOC_WILL_BE_REMOVED(ServiceWorkerGlobalScopeProxy); |
public: |
- static PassOwnPtr<ServiceWorkerGlobalScopeProxy> create(WebEmbeddedWorkerImpl&, Document&, WebServiceWorkerContextClient&); |
+ static PassOwnPtrWillBeRawPtr<ServiceWorkerGlobalScopeProxy> create(WebEmbeddedWorkerImpl&, Document&, WebServiceWorkerContextClient&); |
~ServiceWorkerGlobalScopeProxy() override; |
// WebServiceWorkerContextProxy overrides: |
@@ -95,16 +96,18 @@ public: |
void willDestroyWorkerGlobalScope() override; |
void workerThreadTerminated() override; |
+ DECLARE_TRACE(); |
+ |
private: |
ServiceWorkerGlobalScopeProxy(WebEmbeddedWorkerImpl&, Document&, WebServiceWorkerContextClient&); |
WebEmbeddedWorkerImpl& m_embeddedWorker; |
haraken
2015/11/17 13:04:36
WebEmbeddedWorkerImpl is still off the heap. Doesn
sof
2015/11/17 13:43:04
This object would have to be used by a worker thre
|
- Document& m_document; |
+ RawPtrWillBeMember<Document> m_document; |
KURL m_documentURL; |
WebServiceWorkerContextClient& m_client; |
haraken
2015/11/17 13:04:36
Similarly, is this raw pointer safe?
|
- ServiceWorkerGlobalScope* m_workerGlobalScope; |
+ RawPtrWillBeMember<ServiceWorkerGlobalScope> m_workerGlobalScope; |
}; |
} // namespace blink |