Chromium Code Reviews| Index: Source/core/html/canvas/WebGLRenderingContextBase.h |
| diff --git a/Source/core/html/canvas/WebGLRenderingContextBase.h b/Source/core/html/canvas/WebGLRenderingContextBase.h |
| index 5abf8c2a4e19e0bbc65c34a0552391bac4e03aba..c736e4c8ec1966a79ef3916bf83181deb4094230 100644 |
| --- a/Source/core/html/canvas/WebGLRenderingContextBase.h |
| +++ b/Source/core/html/canvas/WebGLRenderingContextBase.h |
| @@ -100,8 +100,6 @@ class WebGLRenderingContextBase: public CanvasRenderingContext, public ActiveDOM |
| public: |
| virtual ~WebGLRenderingContextBase(); |
| - virtual bool is3d() const OVERRIDE { return true; } |
| - virtual bool isAccelerated() const OVERRIDE { return true; } |
| virtual unsigned version() const = 0; |
| virtual String contextName() const = 0; |
| virtual void registerContextExtensions() = 0; |
| @@ -328,13 +326,11 @@ public: |
| blink::WebGraphicsContext3D* webContext() const { return m_drawingBuffer->context(); } |
| WebGLContextGroup* contextGroup() const { return m_contextGroup.get(); } |
| - virtual blink::WebLayer* platformLayer() const OVERRIDE; |
| Extensions3DUtil* extensionsUtil(); |
| void reshape(int width, int height); |
| void markLayerComposited(); |
| - virtual void paintRenderingResultsToCanvas() OVERRIDE; |
| PassRefPtrWillBeRawPtr<ImageData> paintRenderingResultsToImageData(); |
| void removeSharedObject(WebGLSharedObject*); |
| @@ -364,6 +360,13 @@ protected: |
| void initializeNewContext(); |
| void setupFlags(); |
| + // CanvasRenderingContext implementation. |
| + virtual bool is3d() const OVERRIDE { return true; } |
|
Justin Novosad
2014/04/28 15:21:42
These are public in the base class. Making the pro
Ken Russell (switch to Gerrit)
2014/04/28 20:51:45
Actually, it was a common pattern in WebKit, anywa
dshwang
2014/04/29 16:07:04
I wanted to put them in private:, but there is not
|
| + virtual bool isAccelerated() const OVERRIDE { return true; } |
| + virtual void setIsHidden(bool) OVERRIDE; |
| + virtual void paintRenderingResultsToCanvas() OVERRIDE; |
| + virtual blink::WebLayer* platformLayer() const OVERRIDE; |
| + |
| void addSharedObject(WebGLSharedObject*); |
| void addContextObject(WebGLContextObject*); |
| void detachAndRemoveAllObjects(); |