Changeset 84374 in webkit

Timestamp:

Apr 20, 2011 7:54:25 AM (13 years ago)

Author:

senorblanco@chromium.org

Message:

2011-04-19 Stephen White <​senorblanco@chromium.org>

Reviewed by Kenneth Russell.

Move and rename GLES2Canvas.
​https://bugs.webkit.org/show_bug.cgi?id=58927

Move GLES2Canvas to platform/graphcs/gpu, where all the other
gpu-related files live, and rename it to GraphicsContextGPU to better
reflect its purpose.

Covered by existing tests.

• WebCore.gypi:
• platform/graphics/chromium/GLES2Canvas.cpp:
• platform/graphics/chromium/GLES2Canvas.h:
• platform/graphics/skia/GraphicsContextSkia.cpp: (WebCore::GraphicsContext::fillPath): (WebCore::GraphicsContext::setPlatformShadow):
• platform/graphics/skia/ImageBufferSkia.cpp:
• platform/graphics/skia/ImageSkia.cpp: (WebCore::drawBitmapGLES2):
• platform/graphics/skia/PlatformContextSkia.cpp: (WebCore::PlatformContextSkia::setSharedGraphicsContext3D):
• platform/graphics/skia/PlatformContextSkia.h: (WebCore::PlatformContextSkia::gpuCanvas):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gypi (modified) (2 diffs)
• platform/graphics/gpu/GraphicsContextGPU.cpp (moved) (moved from trunk/Source/WebCore/platform/graphics/chromium/GLES2Canvas.cpp) (30 diffs)
• platform/graphics/gpu/GraphicsContextGPU.h (moved) (moved from trunk/Source/WebCore/platform/graphics/chromium/GLES2Canvas.h) (3 diffs)
• platform/graphics/skia/GraphicsContextSkia.cpp (modified) (3 diffs)
• platform/graphics/skia/ImageBufferSkia.cpp (modified) (1 diff)
• platform/graphics/skia/ImageSkia.cpp (modified) (2 diffs)
• platform/graphics/skia/PlatformContextSkia.cpp (modified) (2 diffs)
• platform/graphics/skia/PlatformContextSkia.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-19  Stephen White  <senorblanco@chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        Move and rename GLES2Canvas.
+        https://bugs.webkit.org/show_bug.cgi?id=58927
+
+        Move GLES2Canvas to platform/graphcs/gpu, where all the other
+        gpu-related files live, and rename it to GraphicsContextGPU to better
+        reflect its purpose.
+
+        Covered by existing tests.
+
+        * WebCore.gypi:
+        * platform/graphics/chromium/GLES2Canvas.cpp:
+        * platform/graphics/chromium/GLES2Canvas.h:
+        * platform/graphics/skia/GraphicsContextSkia.cpp:
+        (WebCore::GraphicsContext::fillPath):
+        (WebCore::GraphicsContext::setPlatformShadow):
+        * platform/graphics/skia/ImageBufferSkia.cpp:
+        * platform/graphics/skia/ImageSkia.cpp:
+        (WebCore::drawBitmapGLES2):
+        * platform/graphics/skia/PlatformContextSkia.cpp:
+        (WebCore::PlatformContextSkia::setSharedGraphicsContext3D):
+        * platform/graphics/skia/PlatformContextSkia.h:
+        (WebCore::PlatformContextSkia::gpuCanvas):
+
 2011-04-20  Benjamin Poulain  <benjamin.poulain@nokia.com>
 

trunk/Source/WebCore/WebCore.gypi

@@ -4012 +4012 @@
             'platform/graphics/chromium/FontUtilsChromiumWin.cpp',
             'platform/graphics/chromium/FontUtilsChromiumWin.h',
-            'platform/graphics/chromium/GLES2Canvas.cpp',
-            'platform/graphics/chromium/GLES2Canvas.h',
             'platform/graphics/chromium/GeometryBinding.cpp',
             'platform/graphics/chromium/GeometryBinding.h',
@@ -4151 +4149 @@
             'platform/graphics/gpu/DrawingBuffer.cpp',
             'platform/graphics/gpu/DrawingBuffer.h',
+            'platform/graphics/gpu/GraphicsContextGPU.cpp',
+            'platform/graphics/gpu/GraphicsContextGPU.h',
             'platform/graphics/gpu/LoopBlinnClassifier.cpp',
             'platform/graphics/gpu/LoopBlinnClassifier.h',

trunk/Source/WebCore/platform/graphics/gpu/GraphicsContextGPU.cpp

@@ -31 +31 @@
 #include "config.h"
 
-#include "GLES2Canvas.h"
+#include "GraphicsContextGPU.h"
 
 #include "DrawingBuffer.h"
@@ -74 +74 @@
 };
 
-struct GLES2Canvas::State {
+struct GraphicsContextGPU::State {
     State()
         : m_fillColor(0, 0, 0, 255)
@@ -195 +195 @@
 };
 
-GLES2Canvas::GLES2Canvas(SharedGraphicsContext3D* context, DrawingBuffer* drawingBuffer, const IntSize& size)
+GraphicsContextGPU::GraphicsContextGPU(SharedGraphicsContext3D* context, DrawingBuffer* drawingBuffer, const IntSize& size)
     : m_size(size)
     , m_context(context)
@@ -210 +210 @@
 }
 
-GLES2Canvas::~GLES2Canvas()
+GraphicsContextGPU::~GraphicsContextGPU()
 {
     if (m_pathIndexBuffer)
@@ -218 +218 @@
 }
 
-void GLES2Canvas::bindFramebuffer()
+void GraphicsContextGPU::bindFramebuffer()
 {
     m_drawingBuffer->bind();
 }
 
-void GLES2Canvas::clearRect(const FloatRect& rect)
+void GraphicsContextGPU::clearRect(const FloatRect& rect)
 {
     bindFramebuffer();
@@ -236 +236 @@
 }
 
-void GLES2Canvas::applyState()
+void GraphicsContextGPU::applyState()
 {
     bindFramebuffer();
@@ -243 +243 @@
 }
 
-void GLES2Canvas::scissorClear(float x, float y, float width, float height)
+void GraphicsContextGPU::scissorClear(float x, float y, float width, float height)
 {
     int intX = static_cast<int>(x + 0.5f);
@@ -256 +256 @@
 }
 
-void GLES2Canvas::fillPath(const Path& path)
+void GraphicsContextGPU::fillPath(const Path& path)
 {
     if (m_state->shadowActive()) {
@@ -268 +268 @@
 }
 
-void GLES2Canvas::fillRect(const FloatRect& rect, const Color& color, ColorSpace colorSpace)
+void GraphicsContextGPU::fillRect(const FloatRect& rect, const Color& color, ColorSpace colorSpace)
 {
     if (m_state->shadowActive()) {
@@ -280 +280 @@
 }
 
-void GLES2Canvas::fillRect(const FloatRect& rect)
+void GraphicsContextGPU::fillRect(const FloatRect& rect)
 {
     fillRect(rect, m_state->applyAlpha(m_state->m_fillColor), ColorSpaceDeviceRGB);
 }
 
-void GLES2Canvas::fillRectInternal(const FloatRect& rect, const Color& color)
+void GraphicsContextGPU::fillRectInternal(const FloatRect& rect, const Color& color)
 {
     AffineTransform matrix(m_flipMatrix);
@@ -297 +297 @@
 }
 
-void GLES2Canvas::setFillColor(const Color& color, ColorSpace colorSpace)
+void GraphicsContextGPU::setFillColor(const Color& color, ColorSpace colorSpace)
 {
     m_state->m_fillColor = color;
 }
 
-void GLES2Canvas::setAlpha(float alpha)
+void GraphicsContextGPU::setAlpha(float alpha)
 {
     m_state->m_alpha = alpha;
 }
 
-void GLES2Canvas::setShadowColor(const Color& color, ColorSpace)
+void GraphicsContextGPU::setShadowColor(const Color& color, ColorSpace)
 {
     m_state->m_shadowColor = color;
 }
 
-void GLES2Canvas::setShadowOffset(const FloatSize& offset)
+void GraphicsContextGPU::setShadowOffset(const FloatSize& offset)
 {
     m_state->m_shadowOffset = offset;
 }
 
-void GLES2Canvas::setShadowBlur(float shadowBlur)
+void GraphicsContextGPU::setShadowBlur(float shadowBlur)
 {
     m_state->m_shadowBlur = shadowBlur;
 }
 
-void GLES2Canvas::setShadowsIgnoreTransforms(bool shadowsIgnoreTransforms)
+void GraphicsContextGPU::setShadowsIgnoreTransforms(bool shadowsIgnoreTransforms)
 {
     m_state->m_shadowsIgnoreTransforms = shadowsIgnoreTransforms;
 }
 
-void GLES2Canvas::translate(float x, float y)
+void GraphicsContextGPU::translate(float x, float y)
 {
     m_state->m_ctm.translate(x, y);
 }
 
-void GLES2Canvas::rotate(float angleInRadians)
+void GraphicsContextGPU::rotate(float angleInRadians)
 {
     m_state->m_ctm.rotate(angleInRadians * (180.0f / M_PI));
 }
 
-void GLES2Canvas::scale(const FloatSize& size)
+void GraphicsContextGPU::scale(const FloatSize& size)
 {
     m_state->m_ctm.scale(size.width(), size.height());
 }
 
-void GLES2Canvas::concatCTM(const AffineTransform& affine)
+void GraphicsContextGPU::concatCTM(const AffineTransform& affine)
 {
     m_state->m_ctm *= affine;
 }
 
-void GLES2Canvas::setCTM(const AffineTransform& affine)
+void GraphicsContextGPU::setCTM(const AffineTransform& affine)
 {
     m_state->m_ctm = affine;
 }
 
-void GLES2Canvas::clipPath(const Path& path)
+void GraphicsContextGPU::clipPath(const Path& path)
 {
     bindFramebuffer();
@@ -364 +364 @@
 }
 
-void GLES2Canvas::clipOut(const Path& path)
-{
-    ASSERT(!"clipOut is unsupported in GLES2Canvas.\n");
-}
-
-void GLES2Canvas::save()
+void GraphicsContextGPU::clipOut(const Path& path)
+{
+    ASSERT(!"clipOut is unsupported in GraphicsContextGPU.\n");
+}
+
+void GraphicsContextGPU::save()
 {
     m_stateStack.append(State(m_stateStack.last()));
@@ -375 +375 @@
 }
 
-void GLES2Canvas::restore()
+void GraphicsContextGPU::restore()
 {
     ASSERT(!m_stateStack.isEmpty());
@@ -393 +393 @@
 }
 
-void GLES2Canvas::drawTexturedRect(unsigned texture, const IntSize& textureSize, const FloatRect& srcRect, const FloatRect& dstRect, ColorSpace colorSpace, CompositeOperator compositeOp)
+void GraphicsContextGPU::drawTexturedRect(unsigned texture, const IntSize& textureSize, const FloatRect& srcRect, const FloatRect& dstRect, ColorSpace colorSpace, CompositeOperator compositeOp)
 {
     bindFramebuffer();
@@ -406 +406 @@
 }
 
-void GLES2Canvas::drawTexturedRect(Texture* texture, const FloatRect& srcRect, const FloatRect& dstRect, ColorSpace colorSpace, CompositeOperator compositeOp)
+void GraphicsContextGPU::drawTexturedRect(Texture* texture, const FloatRect& srcRect, const FloatRect& dstRect, ColorSpace colorSpace, CompositeOperator compositeOp)
 {
     drawTexturedRect(texture, srcRect, dstRect, m_state->m_ctm, m_state->m_alpha, colorSpace, compositeOp, m_state->clippingEnabled());
@@ -412 +412 @@
 
 
-void GLES2Canvas::drawTexturedRect(Texture* texture, const FloatRect& srcRect, const FloatRect& dstRect, const AffineTransform& transform, float alpha, ColorSpace colorSpace, CompositeOperator compositeOp, bool clip)
+void GraphicsContextGPU::drawTexturedRect(Texture* texture, const FloatRect& srcRect, const FloatRect& dstRect, const AffineTransform& transform, float alpha, ColorSpace colorSpace, CompositeOperator compositeOp, bool clip)
 {
     bindFramebuffer();
@@ -428 +428 @@
 }
 
-void GLES2Canvas::drawTexturedRectTile(Texture* texture, int tile, const FloatRect& srcRect, const FloatRect& dstRect, const AffineTransform& transform, float alpha)
+void GraphicsContextGPU::drawTexturedRectTile(Texture* texture, int tile, const FloatRect& srcRect, const FloatRect& dstRect, const AffineTransform& transform, float alpha)
 {
     if (dstRect.isEmpty())
@@ -446 +446 @@
 }
 
-void GLES2Canvas::convolveRect(unsigned texture, const IntSize& textureSize, const FloatRect& srcRect, const FloatRect& dstRect, float imageIncrement[2], const float* kernel, int kernelWidth)
+void GraphicsContextGPU::convolveRect(unsigned texture, const IntSize& textureSize, const FloatRect& srcRect, const FloatRect& dstRect, float imageIncrement[2], const float* kernel, int kernelWidth)
 {
     m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, texture);
@@ -488 +488 @@
 }
 
-void GLES2Canvas::drawTexturedQuad(const IntSize& textureSize, const FloatRect& srcRect, const FloatRect& dstRect, const AffineTransform& transform, float alpha)
+void GraphicsContextGPU::drawTexturedQuad(const IntSize& textureSize, const FloatRect& srcRect, const FloatRect& dstRect, const AffineTransform& transform, float alpha)
 {
     AffineTransform matrix(m_flipMatrix);
@@ -506 +506 @@
 }
 
-void GLES2Canvas::drawTexturedQuadMitchell(const IntSize& textureSize, const FloatRect& srcRect, const FloatRect& dstRect, const AffineTransform& transform, float alpha)
+void GraphicsContextGPU::drawTexturedQuadMitchell(const IntSize& textureSize, const FloatRect& srcRect, const FloatRect& dstRect, const AffineTransform& transform, float alpha)
 {
     static const float mitchellCoefficients[16] = {
@@ -536 +536 @@
 }
 
-void GLES2Canvas::setCompositeOperation(CompositeOperator op)
+void GraphicsContextGPU::setCompositeOperation(CompositeOperator op)
 {
     m_state->m_compositeOp = op;
 }
 
-Texture* GLES2Canvas::createTexture(NativeImagePtr ptr, Texture::Format format, int width, int height)
+Texture* GraphicsContextGPU::createTexture(NativeImagePtr ptr, Texture::Format format, int width, int height)
 {
     return m_context->createTexture(ptr, format, width, height);
 }
 
-Texture* GLES2Canvas::getTexture(NativeImagePtr ptr)
+Texture* GraphicsContextGPU::getTexture(NativeImagePtr ptr)
 {
     return m_context->getTexture(ptr);
@@ -610 +610 @@
 typedef void (*TESSCB)();
 
-void GLES2Canvas::tesselateAndFillPath(const Path& path, const Color& color)
+void GraphicsContextGPU::tesselateAndFillPath(const Path& path, const Color& color)
 {
     if (!m_pathVertexBuffer)
@@ -707 +707 @@
 }
 
-void GLES2Canvas::fillPathInternal(const Path& path, const Color& color)
+void GraphicsContextGPU::fillPathInternal(const Path& path, const Color& color)
 {
     if (SharedGraphicsContext3D::useLoopBlinnForPathRendering()) {
@@ -741 +741 @@
 }
 
-FloatRect GLES2Canvas::flipRect(const FloatRect& rect)
+FloatRect GraphicsContextGPU::flipRect(const FloatRect& rect)
 {
     FloatRect flippedRect(rect);
@@ -749 +749 @@
 }
 
-void GLES2Canvas::clearBorders(const FloatRect& rect, int width)
+void GraphicsContextGPU::clearBorders(const FloatRect& rect, int width)
 {
     scissorClear(rect.x(), rect.y() - width, rect.width() + width, width);
@@ -757 +757 @@
 }
 
-void GLES2Canvas::beginShadowDraw()
+void GraphicsContextGPU::beginShadowDraw()
 {
     float offsetX = m_state->m_shadowOffset.width();
@@ -783 +783 @@
 }
 
-void GLES2Canvas::endShadowDraw(const FloatRect& boundingBox)
+void GraphicsContextGPU::endShadowDraw(const FloatRect& boundingBox)
 {
     if (m_state->m_shadowBlur > 0) {
@@ -868 +868 @@
 }
 
-void GLES2Canvas::beginStencilDraw(unsigned op)
+void GraphicsContextGPU::beginStencilDraw(unsigned op)
 {
     // Turn on stencil test.
@@ -883 +883 @@
 }
 
-void GLES2Canvas::applyClipping(bool enable)
+void GraphicsContextGPU::applyClipping(bool enable)
 {
     m_context->enableStencil(enable);
@@ -898 +898 @@
 }
 
-void GLES2Canvas::checkGLError(const char* header)
+void GraphicsContextGPU::checkGLError(const char* header)
 {
 #ifndef NDEBUG

trunk/Source/WebCore/platform/graphics/gpu/GraphicsContextGPU.h

@@ -29 +29 @@
  */
 
-#ifndef GLES2Canvas_h
-#define GLES2Canvas_h
+#ifndef GraphicsContextGPU_h
+#define GraphicsContextGPU_h
 
 #include "AffineTransform.h"
@@ -53 +53 @@
 class SharedGraphicsContext3D;
 
-class GLES2Canvas {
-    WTF_MAKE_NONCOPYABLE(GLES2Canvas);
+class GraphicsContextGPU {
+    WTF_MAKE_NONCOPYABLE(GraphicsContextGPU);
 public:
-    GLES2Canvas(SharedGraphicsContext3D*, DrawingBuffer*, const IntSize&);
-    ~GLES2Canvas();
+    GraphicsContextGPU(SharedGraphicsContext3D*, DrawingBuffer*, const IntSize&);
+    ~GraphicsContextGPU();
 
     void fillPath(const Path&);
@@ -138 +138 @@
 }
 
-#endif // GLES2Canvas_h
+#endif // GraphicsContextGPU_h

trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp

@@ -35 +35 @@
 #include "Color.h"
 #include "FloatRect.h"
-#include "GLES2Canvas.h"
 #include "Gradient.h"
+#include "GraphicsContextGPU.h"
 #include "GraphicsContextPlatformPrivate.h"
 #include "ImageBuffer.h"
@@ -734 +734 @@
         return;
 
-    // FIXME: add support to GLES2Canvas for more than just solid fills.
+    // FIXME: add support to GraphicsContextGPU for more than just solid fills.
     if (platformContext()->useGPU() && platformContext()->canAccelerate()) {
         platformContext()->prepareForHardwareDraw();
@@ -1030 +1030 @@
 
     if (platformContext()->useGPU()) {
-        GLES2Canvas* canvas = platformContext()->gpuCanvas();
+        GraphicsContextGPU* canvas = platformContext()->gpuCanvas();
         canvas->setShadowOffset(size);
         canvas->setShadowBlur(blurFloat);

trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp

@@ -38 +38 @@
 #include "BitmapImageSingleFrameSkia.h"
 #include "DrawingBuffer.h"
-#include "GLES2Canvas.h"
 #include "GraphicsContext.h"
+#include "GraphicsContextGPU.h"
 #include "ImageData.h"
 #include "JPEGImageEncoder.h"

trunk/Source/WebCore/platform/graphics/skia/ImageSkia.cpp

@@ -36 +36 @@
 #include "FloatConversion.h"
 #include "FloatRect.h"
-#include "GLES2Canvas.h"
 #include "GraphicsContext.h"
+#include "GraphicsContextGPU.h"
 #include "Logging.h"
 #include "NativeImageSkia.h"
@@ -435 +435 @@
 {
     ctxt->platformContext()->prepareForHardwareDraw();
-    GLES2Canvas* gpuCanvas = ctxt->platformContext()->gpuCanvas();
+    GraphicsContextGPU* gpuCanvas = ctxt->platformContext()->gpuCanvas();
     Texture* texture = gpuCanvas->getTexture(bitmap);
     if (!texture) {

trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp

@@ -63 +63 @@
 
 #if ENABLE(ACCELERATED_2D_CANVAS)
-#include "GLES2Canvas.h"
+#include "GraphicsContextGPU.h"
 #include "SharedGraphicsContext3D.h"
 #endif
@@ -730 +730 @@
     if (context && drawingBuffer) {
         m_useGPU = true;
-        m_gpuCanvas = new GLES2Canvas(context, drawingBuffer, size);
+        m_gpuCanvas = new GraphicsContextGPU(context, drawingBuffer, size);
         m_uploadTexture.clear();
         drawingBuffer->setWillPublishCallback(WillPublishCallbackImpl::create(this));

trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.h

@@ -47 +47 @@
 enum CompositeOperator;
 class DrawingBuffer;
-class GLES2Canvas;
 class GraphicsContext3D;
+class GraphicsContextGPU;
 class Texture;
 
@@ -182 +182 @@
     void setSharedGraphicsContext3D(SharedGraphicsContext3D*, DrawingBuffer*, const IntSize&);
 #if ENABLE(ACCELERATED_2D_CANVAS)
-    GLES2Canvas* gpuCanvas() const { return m_gpuCanvas.get(); }
+    GraphicsContextGPU* gpuCanvas() const { return m_gpuCanvas.get(); }
 #else
-    GLES2Canvas* gpuCanvas() const { return 0; }
+    GraphicsContextGPU* gpuCanvas() const { return 0; }
 #endif
     // Call these before making a call that manipulates the underlying
-    // SkCanvas or WebCore::GLES2Canvas
+    // SkCanvas or WebCore::GraphicsContextGPU
     void prepareForSoftwareDraw() const;
     void prepareForHardwareDraw() const;
@@ -224 +224 @@
     bool m_useGPU;
 #if ENABLE(ACCELERATED_2D_CANVAS)
-    OwnPtr<GLES2Canvas> m_gpuCanvas;
+    OwnPtr<GraphicsContextGPU> m_gpuCanvas;
     mutable RefPtr<Texture> m_uploadTexture;
 #endif