Oilpan: Replace EAGERLY_FINALIZE in EventTarget's hierarchy with pre-finalizers

third_party/WebKit/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 "bindings/core/v8/ActiveScriptWrappable.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/ActiveDOMObject.h"
@@ skipping 19 matching lines @@
 // via WebServiceWorkerRegistration::Handle object.
 class ServiceWorkerRegistration final
     : public RefCountedGarbageCollectedEventTargetWithInlineData<ServiceWorkerRegistration>
     , public ActiveScriptWrappable
     , public ActiveDOMObject
     , public WebServiceWorkerRegistrationProxy
     , public Supplementable<ServiceWorkerRegistration> {
     DEFINE_WRAPPERTYPEINFO();
     REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(ServiceWorkerRegistration);
     USING_GARBAGE_COLLECTED_MIXIN(ServiceWorkerRegistration);
+    USING_PRE_FINALIZER(ServiceWorkerRegistration, dispose);
 public:
     // EventTarget overrides.
     const AtomicString& interfaceName() const override;
     ExecutionContext* getExecutionContext() const override { return ActiveDOMObject::getExecutionContext(); }
 
     // WebServiceWorkerRegistrationProxy overrides.
     void dispatchUpdateFoundEvent() override;
     void setInstalling(std::unique_ptr<WebServiceWorker::Handle>) override;
     void setWaiting(std::unique_ptr<WebServiceWorker::Handle>) override;
     void setActive(std::unique_ptr<WebServiceWorker::Handle>) override;
@@ skipping 10 matching lines @@
 
     WebServiceWorkerRegistration* webRegistration() { return m_handle->registration(); }
 
     ScriptPromise update(ScriptState*);
     ScriptPromise unregister(ScriptState*);
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(updatefound);
 
     ~ServiceWorkerRegistration() override;
 
-    // Eager finalization needed to promptly release owned WebServiceWorkerRegistration.
-    EAGERLY_FINALIZE();
     DECLARE_VIRTUAL_TRACE();
 
 private:
     ServiceWorkerRegistration(ExecutionContext*, PassOwnPtr<WebServiceWorkerRegistration::Handle>);
+    void dispose();
 
     // ActiveScriptWrappable overrides.
     bool hasPendingActivity() const final;
 
     // ActiveDOMObject overrides.
     void stop() override;
 
     // A handle to the registration representation in the embedder.
     OwnPtr<WebServiceWorkerRegistration::Handle> m_handle;
 
@@ skipping 13 matching lines @@
         HeapVector<Member<ServiceWorkerRegistration>> registrations;
         for (auto& registration : *webServiceWorkerRegistrations)
             registrations.append(ServiceWorkerRegistration::getOrCreate(resolver->getExecutionContext(), registration.release()));
         return registrations;
     }
 };
 
 } // namespace blink
 
 #endif // ServiceWorkerRegistration_h