Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2463)

Unified Diff: Source/modules/serviceworkers/ServiceWorker.h

Issue 874003002: Oilpan: dispose ServiceWorker (and registration) objects earlier. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: tidying Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/modules/serviceworkers/ServiceWorker.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/serviceworkers/ServiceWorker.h
diff --git a/Source/modules/serviceworkers/ServiceWorker.h b/Source/modules/serviceworkers/ServiceWorker.h
index b236482cbafe8beb81e43ad9f11ffe157f3004c1..fb4f9a8e5ef57db15ca49b295ee78529effe758d 100644
--- a/Source/modules/serviceworkers/ServiceWorker.h
+++ b/Source/modules/serviceworkers/ServiceWorker.h
@@ -47,12 +47,15 @@ class ScriptPromiseResolver;
class ServiceWorker final : public AbstractWorker, public WebServiceWorkerProxy {
DEFINE_WRAPPERTYPEINFO();
+ WILL_BE_USING_PRE_FINALIZER(ServiceWorker, dispose);
public:
// For CallbackPromiseAdapter
typedef WebServiceWorker WebType;
static PassRefPtrWillBeRawPtr<ServiceWorker> take(ScriptPromiseResolver*, WebType* worker);
static PassRefPtrWillBeRawPtr<ServiceWorker> from(ExecutionContext*, WebType*);
+
+ ~ServiceWorker() override;
static void dispose(WebType*);
void postMessage(ExecutionContext*, PassRefPtr<SerializedScriptValue> message, const MessagePortArray*, ExceptionState&);
@@ -90,6 +93,8 @@ private:
virtual bool hasPendingActivity() const override;
virtual void stop() override;
+ void dispose();
+
OwnPtr<WebServiceWorker> m_outerWorker;
ProxyState m_proxyState;
};
« no previous file with comments | « no previous file | Source/modules/serviceworkers/ServiceWorker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698