| 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 a57cb5c85597ba572076bb5fa05f021c7ba1fbb9..8a84d698f98a1dad56a536bb36f381c1f69fb5f9 100644
|
| --- a/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.h
|
| +++ b/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.h
|
| @@ -61,13 +61,12 @@ class WebServiceWorkerRequest;
|
| // workerThreadTerminated() is called by its corresponding
|
| // WorkerGlobalScope.
|
| class ServiceWorkerGlobalScopeProxy final
|
| - : public NoBaseWillBeGarbageCollectedFinalized<ServiceWorkerGlobalScopeProxy>
|
| + : public GarbageCollectedFinalized<ServiceWorkerGlobalScopeProxy>
|
| , public WebServiceWorkerContextProxy
|
| , public WorkerReportingProxy {
|
| WTF_MAKE_NONCOPYABLE(ServiceWorkerGlobalScopeProxy);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(ServiceWorkerGlobalScopeProxy);
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<ServiceWorkerGlobalScopeProxy> create(WebEmbeddedWorkerImpl&, Document&, WebServiceWorkerContextClient&);
|
| + static RawPtr<ServiceWorkerGlobalScopeProxy> create(WebEmbeddedWorkerImpl&, Document&, WebServiceWorkerContextClient&);
|
| ~ServiceWorkerGlobalScopeProxy() override;
|
|
|
| // WebServiceWorkerContextProxy overrides:
|
| @@ -89,7 +88,7 @@ public:
|
|
|
| // WorkerReportingProxy overrides:
|
| void reportException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, int exceptionId) override;
|
| - void reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) override;
|
| + void reportConsoleMessage(RawPtr<ConsoleMessage>) override;
|
| void postMessageToPageInspector(const String&) override;
|
| void postWorkerConsoleAgentEnabled() override { }
|
| void didEvaluateWorkerScript(bool success) override;
|
| @@ -120,11 +119,11 @@ private:
|
| // Non-null until the WebEmbeddedWorkerImpl explicitly detach()es
|
| // as part of its finalization.
|
| WebEmbeddedWorkerImpl* m_embeddedWorker;
|
| - RawPtrWillBeMember<Document> m_document;
|
| + Member<Document> m_document;
|
|
|
| WebServiceWorkerContextClient* m_client;
|
|
|
| - RawPtrWillBeMember<ServiceWorkerGlobalScope> m_workerGlobalScope;
|
| + Member<ServiceWorkerGlobalScope> m_workerGlobalScope;
|
| };
|
|
|
| } // namespace blink
|
|
|