| Index: trunk/Source/core/html/canvas/WebGLRenderingContextBase.h
|
| ===================================================================
|
| --- trunk/Source/core/html/canvas/WebGLRenderingContextBase.h (revision 177853)
|
| +++ trunk/Source/core/html/canvas/WebGLRenderingContextBase.h (working copy)
|
| @@ -102,6 +102,8 @@
|
| 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,11 +330,13 @@
|
|
|
| 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,13 +368,6 @@
|
| void initializeNewContext();
|
| void setupFlags();
|
|
|
| - // CanvasRenderingContext implementation.
|
| - virtual bool is3d() const OVERRIDE { return true; }
|
| - 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();
|
|
|