Changeset 84277 in webkit

Timestamp:

Apr 19, 2011 12:03:34 PM (13 years ago)

Author:

senorblanco@chromium.org

Message:

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

Reviewed by Kenneth Russell.

Refactor GLES2Canvas state application out into its own function.
​https://bugs.webkit.org/show_bug.cgi?id=58906

Covered by existing tests in fast/canvas and canvas/philip.

• platform/graphics/chromium/GLES2Canvas.cpp: (WebCore::GLES2Canvas::applyState): New function to apply compositing and clipping state. (WebCore::GLES2Canvas::fillPath): (WebCore::GLES2Canvas::fillRect): (WebCore::GLES2Canvas::beginShadowDraw): (WebCore::GLES2Canvas::endShadowDraw): Refactor calls to applyState().
• platform/graphics/chromium/GLES2Canvas.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/GLES2Canvas.cpp (modified) (6 diffs)
• platform/graphics/chromium/GLES2Canvas.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-19  Stephen White  <senorblanco@chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        Refactor GLES2Canvas state application out into its own function.
+        https://bugs.webkit.org/show_bug.cgi?id=58906
+
+        Covered by existing tests in fast/canvas and canvas/philip.
+
+        * platform/graphics/chromium/GLES2Canvas.cpp:
+        (WebCore::GLES2Canvas::applyState):
+        New function to apply compositing and clipping state.
+        (WebCore::GLES2Canvas::fillPath):
+        (WebCore::GLES2Canvas::fillRect):
+        (WebCore::GLES2Canvas::beginShadowDraw):
+        (WebCore::GLES2Canvas::endShadowDraw):
+        Refactor calls to applyState().
+        * platform/graphics/chromium/GLES2Canvas.h:
+
 2011-04-19  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/graphics/chromium/GLES2Canvas.cpp

@@ -236 +236 @@
 }
 
+void GLES2Canvas::applyState()
+{
+    bindFramebuffer();
+    m_context->applyCompositeOperator(m_state->m_compositeOp);
+    applyClipping(m_state->clippingEnabled());
+}
+
 void GLES2Canvas::scissorClear(float x, float y, float width, float height)
 {
@@ -257 +264 @@
     }
 
-    bindFramebuffer();
-    m_context->applyCompositeOperator(m_state->m_compositeOp);
-    applyClipping(m_state->clippingEnabled());
-
+    applyState();
     fillPathInternal(path, m_state->applyAlpha(m_state->m_fillColor));
 }
@@ -272 +276 @@
     }
 
-    bindFramebuffer();
-    m_context->applyCompositeOperator(m_state->m_compositeOp);
-    applyClipping(m_state->clippingEnabled());
-
+    applyState();
     fillRectInternal(rect, color);
 }
@@ -778 +779 @@
         m_context->clear(GraphicsContext3D::COLOR_BUFFER_BIT);
     } else {
-        bindFramebuffer();
-        m_context->applyCompositeOperator(m_state->m_compositeOp);
-        applyClipping(m_state->clippingEnabled());
+        applyState();
     }
 }
@@ -855 +854 @@
 
             // Upsample srcBuffer -> main framebuffer using bicubic filtering.
-            bindFramebuffer();
-            m_context->applyCompositeOperator(m_state->m_compositeOp);
-            applyClipping(m_state->clippingEnabled());
+            applyState();
             m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, srcBuffer->colorBuffer());
             FloatRect dstRect = srcRect;
@@ -864 +861 @@
         } else {
             // Blur in Y directly to framebuffer.
-            bindFramebuffer();
-            m_context->applyCompositeOperator(m_state->m_compositeOp);
-            applyClipping(m_state->clippingEnabled());
-
+            applyState();
             convolveRect(srcBuffer->colorBuffer(), srcBuffer->size(), flipRect(srcRect), srcRect, imageIncrementY, kernel.get(), kernelWidth);
         }

trunk/Source/WebCore/platform/graphics/chromium/GLES2Canvas.h

@@ -101 +101 @@
 
 private:
+    void applyState();
     void scissorClear(float x, float y, float width, float height);
     void drawTexturedRectTile(Texture* texture, int tile, const FloatRect& srcRect, const FloatRect& dstRect, const AffineTransform&, float alpha);
@@ -107 +108 @@
     void convolveRect(unsigned texture, const IntSize& textureSize, const FloatRect& srcRect, const FloatRect& dstRect, float imageIncrement[2], const float* kernel, int kernelWidth);
 
-    void applyCompositeOperator(CompositeOperator);
     void tesselateAndFillPath(const Path&, const Color&);
     void fillPathInternal(const Path&, const Color&);