| Index: third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp
|
| index 517c7fbf0c8ab8f54121e1d06239e9c3d9bfe74d..214e2d25363f92b0efe82842f800dbe4df4f6f60 100644
|
| --- a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp
|
| +++ b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp
|
| @@ -31,10 +31,8 @@
|
| namespace blink {
|
|
|
| CanvasRenderingContext::CanvasRenderingContext(HTMLCanvasElement* canvas)
|
| - : ActiveDOMObject(&canvas->document())
|
| - , m_canvas(canvas)
|
| + : m_canvas(canvas)
|
| {
|
| - suspendIfNeeded();
|
| }
|
|
|
| CanvasRenderingContext::ContextType CanvasRenderingContext::contextTypeFromId(const String& id)
|
| @@ -84,17 +82,6 @@ bool CanvasRenderingContext::wouldTaintOrigin(CanvasImageSource* imageSource)
|
| DEFINE_TRACE(CanvasRenderingContext)
|
| {
|
| visitor->trace(m_canvas);
|
| - ActiveDOMObject::trace(visitor);
|
| -}
|
| -
|
| -bool CanvasRenderingContext::hasPendingActivity() const
|
| -{
|
| - return false;
|
| -}
|
| -
|
| -void CanvasRenderingContext::didMoveToNewDocument(Document* document)
|
| -{
|
| - ActiveDOMObject::didMoveToNewExecutionContext(document);
|
| }
|
|
|
| } // namespace blink
|
|
|