Changeset 223457 in webkit

Timestamp:

Oct 16, 2017 10:12:52 PM (7 years ago)

Author:

Chris Dumez

Message:

ServiceWorkerRegistration should subclass RefCounted<>
​https://bugs.webkit.org/show_bug.cgi?id=178374

Reviewed by Ryosuke Niwa.

ServiceWorkerRegistration should subclass RefCounted<> or we end up with an infinite recursion
when constructing such object. This is because ServiceWorkerRegistration subclasses
EventTargetWithInlineData which implements ref() / deref() by calling refEventTarget() /
derefEventTarget(). refEventTarget() / derefEventTarget() are implemented in
ServiceWorkerRegistration so that they call ref() / deref() (which ends up being EventTarget's
methods).

• workers/service/ServiceWorkerRegistration.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• workers/service/ServiceWorkerRegistration.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-16  Chris Dumez  <cdumez@apple.com>
+
+        ServiceWorkerRegistration should subclass RefCounted<>
+        https://bugs.webkit.org/show_bug.cgi?id=178374
+
+        Reviewed by Ryosuke Niwa.
+
+        ServiceWorkerRegistration should subclass RefCounted<> or we end up with an infinite recursion
+        when constructing such object. This is because ServiceWorkerRegistration subclasses
+        EventTargetWithInlineData which implements ref() / deref() by calling refEventTarget() /
+        derefEventTarget(). refEventTarget() / derefEventTarget() are implemented in
+        ServiceWorkerRegistration so that they call ref() / deref() (which ends up being EventTarget's
+        methods).
+
+        * workers/service/ServiceWorkerRegistration.h:
+
 2017-10-16  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/workers/service/ServiceWorkerRegistration.h

@@ -38 +38 @@
 class ServiceWorker;
 
-class ServiceWorkerRegistration final : public EventTargetWithInlineData, public ActiveDOMObject {
+class ServiceWorkerRegistration final : public RefCounted<ServiceWorkerRegistration>, public EventTargetWithInlineData, public ActiveDOMObject {
 public:
     enum class UpdateViaCache {
@@ -63 +63 @@
     void unregister(Ref<DeferredPromise>&&);
 
+    using RefCounted::ref;
+    using RefCounted::deref;
+
 private:
     ServiceWorkerRegistration(ScriptExecutionContext&, const ServiceWorkerRegistrationData&);