[v8 gc] Introduce a base class for all objects that can have pending activity

third_party/WebKit/Source/modules/websockets/DOMWebSocket.h

Index: third_party/WebKit/Source/modules/websockets/DOMWebSocket.h
diff --git a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.h b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.h
index 6a27148541cdf77feef7ced9355122935b3da9e7..4ae0affcb89fd60317ad5f8b3ed835e44f83b72d 100644
--- a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.h
+++ b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.h
@@ -31,6 +31,7 @@
 #ifndef DOMWebSocket_h
 #define DOMWebSocket_h
 
+#include "bindings/core/v8/ActiveScriptWrappable.h"
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/dom/ActiveDOMObject.h"
 #include "core/events/EventListener.h"
@@ -58,7 +59,7 @@ class ExceptionState;
 class ExecutionContext;
 class StringOrStringSequence;
 
-class MODULES_EXPORT DOMWebSocket : public RefCountedGarbageCollectedEventTargetWithInlineData<DOMWebSocket>, public ActiveDOMObject, public WebSocketChannelClient {
+class MODULES_EXPORT DOMWebSocket : public RefCountedGarbageCollectedEventTargetWithInlineData<DOMWebSocket>, public ActiveScriptWrappable, public ActiveDOMObject, public WebSocketChannelClient {
     REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(DOMWebSocket);
     DEFINE_WRAPPERTYPEINFO();
     USING_GARBAGE_COLLECTED_MIXIN(DOMWebSocket);
@@ -115,13 +116,15 @@ public:
 
     // ActiveDOMObject functions.
     void contextDestroyed() override;
-    // Prevent this instance from being collected while it's not in CLOSED
-    // state.
-    bool hasPendingActivity() const override;
     void suspend() override;
     void resume() override;
     void stop() override;
 
+    // ActiveScriptWrappable
+    // Prevent this instance from being collected while it's not in CLOSED
+    // state.
+    bool hasPendingActivity() const final;
+
     // WebSocketChannelClient functions.
     void didConnect(const String& subprotocol, const String& extensions) override;
     void didReceiveTextMessage(const String& message) override;