Oilpan: dispose ServiceWorker (and registration) objects earlier.

Source/modules/serviceworkers/ServiceWorkerRegistration.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ServiceWorkerRegistration_h
 #define ServiceWorkerRegistration_h
 
 #include "core/dom/ActiveDOMObject.h"
 #include "core/events/EventTarget.h"
 #include "modules/serviceworkers/ServiceWorker.h"
@@ skipping 13 matching lines @@
 class WebServiceWorkerProvider;
 
 class ServiceWorkerRegistration final
     : public RefCountedGarbageCollectedEventTargetWithInlineData<ServiceWorkerRegistration>
     , public ActiveDOMObject
     , public WebServiceWorkerRegistrationProxy
     , public HeapSupplementable<ServiceWorkerRegistration> {
     DEFINE_WRAPPERTYPEINFO();
     DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<ServiceWorkerRegistration>);
     USING_GARBAGE_COLLECTED_MIXIN(ServiceWorkerRegistration);
+    USING_PRE_FINALIZER(ServiceWorkerRegistration, dispose);
 public:
     // EventTarget overrides.
     virtual const AtomicString& interfaceName() const override;
     virtual ExecutionContext* executionContext() const override { return ActiveDOMObject::executionContext(); }
 
     // WebServiceWorkerRegistrationProxy overrides.
     virtual void dispatchUpdateFoundEvent() override;
     virtual void setInstalling(WebServiceWorker*) override;
     virtual void setWaiting(WebServiceWorker*) override;
     virtual void setActive(WebServiceWorker*) override;
 
     // For CallbackPromiseAdapter.
     typedef WebServiceWorkerRegistration WebType;
     static ServiceWorkerRegistration* from(ExecutionContext*, WebType* registration);
     static ServiceWorkerRegistration* take(ScriptPromiseResolver*, WebType* registration);
     static void dispose(WebType* registration);
 
     PassRefPtrWillBeRawPtr<ServiceWorker> installing() { return m_installing.get(); }
     PassRefPtrWillBeRawPtr<ServiceWorker> waiting() { return m_waiting.get(); }
     PassRefPtrWillBeRawPtr<ServiceWorker> active() { return m_active.get(); }
 
     String scope() const;
 
     WebServiceWorkerRegistration* webRegistration() { return m_outerRegistration.get(); }
 
     ScriptPromise unregister(ScriptState*);
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(updatefound);
 
+    virtual ~ServiceWorkerRegistration() override;
     virtual void trace(Visitor*) override;
 
 private:
     static ServiceWorkerRegistration* getOrCreate(ExecutionContext*, WebServiceWorkerRegistration*);
     ServiceWorkerRegistration(ExecutionContext*, PassOwnPtr<WebServiceWorkerRegistration>);
 
     // ActiveDOMObject overrides.
     virtual bool hasPendingActivity() const override;
     virtual void stop() override;
 
+    void dispose();
+
     OwnPtr<WebServiceWorkerRegistration> m_outerRegistration;
     WebServiceWorkerProvider* m_provider;
     RefPtrWillBeMember<ServiceWorker> m_installing;
     RefPtrWillBeMember<ServiceWorker> m_waiting;
     RefPtrWillBeMember<ServiceWorker> m_active;
 
     bool m_stopped;
 };
 
 } // namespace blink
 
 #endif // ServiceWorkerRegistration_h