Make CanvasRenderingContext not inherit from ActiveDOMObject

third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h

Index: third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h
diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h
index 12886881a11c99fdd9d3fa925539f4e45979b6ec..92fe4995903d3e7d61ba21d23fc0412cebdb3914 100644
--- a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h
+++ b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h
@@ -27,7 +27,6 @@
 #define CanvasRenderingContext_h
 
 #include "core/CoreExport.h"
-#include "core/dom/ActiveDOMObject.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "platform/heap/Handle.h"
 #include "wtf/HashSet.h"
@@ -44,12 +43,11 @@ class CanvasImageSource;
 class HTMLCanvasElement;
 class ImageData;
 
-class CORE_EXPORT CanvasRenderingContext : public NoBaseWillBeGarbageCollectedFinalized<CanvasRenderingContext>, public ActiveDOMObject, public ScriptWrappable {
+class CORE_EXPORT CanvasRenderingContext : public NoBaseWillBeGarbageCollectedFinalized<CanvasRenderingContext>, public ScriptWrappable {
     WTF_MAKE_NONCOPYABLE(CanvasRenderingContext);
     USING_FAST_MALLOC_WILL_BE_REMOVED(CanvasRenderingContext);
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(CanvasRenderingContext);
 public:
-    ~CanvasRenderingContext() override { }
+    virtual ~CanvasRenderingContext() { }
 
     // A Canvas can either be "2D" or "webgl" but never both. If you request a 2D canvas and the existing
     // context is already 2D, just return that. If the existing context is WebGL, then destroy it
@@ -125,9 +123,7 @@ protected:
     CanvasRenderingContext(HTMLCanvasElement*);
     DECLARE_VIRTUAL_TRACE();
 
-    // ActiveDOMObject notifications
-    bool hasPendingActivity() const final;
-    void stop() override = 0;
+    virtual void stop() = 0;
 
 private:
     RawPtrWillBeMember<HTMLCanvasElement> m_canvas;