Chromium Code Reviews| Index: third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvasRenderingContext.h |
| diff --git a/third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvasRenderingContext.h b/third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvasRenderingContext.h |
| index 0eff273a286fd41e1b9b9b15bdd4d448882b8215..93c728b5e122b00700e517a9f30068a71c4f48a5 100644 |
| --- a/third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvasRenderingContext.h |
| +++ b/third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvasRenderingContext.h |
| @@ -12,7 +12,7 @@ namespace blink { |
| class ImageBitmap; |
| -class MODULES_EXPORT OffscreenCanvasRenderingContext : public GarbageCollectedFinalized<OffscreenCanvasRenderingContext>, public ScriptWrappable { |
| +class MODULES_EXPORT OffscreenCanvasRenderingContext : public GarbageCollectedMixin { |
|
Justin Novosad
2016/04/20 20:07:27
Thanks for figuring this out.
|
| WTF_MAKE_NONCOPYABLE(OffscreenCanvasRenderingContext); |
| public: |
| virtual ~OffscreenCanvasRenderingContext() { } |
| @@ -25,8 +25,9 @@ public: |
| static ContextType contextTypeFromId(const String& id); |
| OffscreenCanvas* getOffscreenCanvas() const { return m_offscreenCanvas; } |
| - virtual ContextType getContextType() const = 0; |
| + virtual ContextType getOffscreenCanvasRenderingContextType() const = 0; |
|
Justin Novosad
2016/04/20 20:07:27
Why the name change?
xidachen
2016/04/20 20:52:09
CanvasRenderingContext also has a method getContex
|
| virtual ImageBitmap* transferToImageBitmap(ExceptionState&) = 0; |
| + virtual void setOffscreenCanvasGetContextResult(OffscreenRenderingContext&) = 0; |
| virtual bool is2d() const { return false; } |