Changeset 65921 in webkit

Timestamp:

Aug 24, 2010 12:17:19 PM (14 years ago)

Author:

senorblanco@chromium.org

Message:

2010-08-24 Stephen White <​senorblanco@chromium.org>

Reviewed by Kenneth Russell.

Fix accelerated 2d canvas with accelerated compositing off.
​https://bugs.webkit.org/show_bug.cgi?id=44525

Tested by running with --enable-accelerated-2d-canvas with
--enable-accelerated-compositing off.
ImageBuffer::copyImage changes covered by
LayoutTests/fast/canvas/canvas-pattern-*.html.

• html/HTMLCanvasElement.cpp: (WebCore::HTMLCanvasElement::paint): Extend the accelerated compositing check and the readback for non-accelerated compositing to accelerated 2D canvas also.
• html/canvas/CanvasRenderingContext.cpp:
• html/canvas/CanvasRenderingContext.h: (WebCore::CanvasRenderingContext::paintsIntoCanvasBuffer): Move this logic from WebGL to common canvas context code.
• html/canvas/WebGLRenderingContext.h: Remove implementation of paintsIntoCanvasBuffer.
• platform/graphics/skia/ImageBufferSkia.cpp: (WebCore::ImageBuffer::copyImage): When copying the image for patterns, sync the software canvas.
• platform/graphics/skia/PlatformContextSkia.cpp: (WebCore::PlatformContextSkia::prepareForSoftwareDraw): Use SkDevice::eraseColor() to clear the canvas for mixed mode rendering.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLCanvasElement.cpp (modified) (1 diff)
• html/canvas/CanvasRenderingContext.cpp (modified) (2 diffs)
• html/canvas/CanvasRenderingContext.h (modified) (1 diff)
• html/canvas/WebGLRenderingContext.h (modified) (1 diff)
• platform/graphics/skia/ImageBufferSkia.cpp (modified) (1 diff)
• platform/graphics/skia/PlatformContextSkia.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-24  Stephen White  <senorblanco@chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        Fix accelerated 2d canvas with accelerated compositing off.
+        https://bugs.webkit.org/show_bug.cgi?id=44525
+
+        Tested by running with --enable-accelerated-2d-canvas with
+        --enable-accelerated-compositing off.
+        ImageBuffer::copyImage changes covered by
+        LayoutTests/fast/canvas/canvas-pattern-*.html.
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::paint):
+        Extend the accelerated compositing check and the readback for
+        non-accelerated compositing to accelerated 2D canvas also.
+        * html/canvas/CanvasRenderingContext.cpp:
+        * html/canvas/CanvasRenderingContext.h:
+        (WebCore::CanvasRenderingContext::paintsIntoCanvasBuffer):
+        Move this logic from WebGL to common canvas context code.
+        * html/canvas/WebGLRenderingContext.h:
+        Remove implementation of paintsIntoCanvasBuffer.
+        * platform/graphics/skia/ImageBufferSkia.cpp:
+        (WebCore::ImageBuffer::copyImage):
+        When copying the image for patterns, sync the software canvas.
+        * platform/graphics/skia/PlatformContextSkia.cpp:
+        (WebCore::PlatformContextSkia::prepareForSoftwareDraw):
+        Use SkDevice::eraseColor() to clear the canvas for mixed mode rendering.
+
 2010-08-24  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTMLCanvasElement.cpp

@@ -273 +273 @@
         return;
     
-#if ENABLE(3D_CANVAS)
-    WebGLRenderingContext* context3D = 0;
-    if (m_context && m_context->is3d()) {
-        context3D = static_cast<WebGLRenderingContext*>(m_context.get());
-        if (!context3D->paintsIntoCanvasBuffer())
+    if (m_context) {
+        if (!m_context->paintsIntoCanvasBuffer())
             return;
-        context3D->paintRenderingResultsToCanvas();
-    }
-#endif
+        m_context->paintRenderingResultsToCanvas();
+    }
 
     if (hasCreatedImageBuffer()) {

trunk/WebCore/html/canvas/CanvasRenderingContext.cpp

@@ -26 +26 @@
 #include "config.h"
 #include "CanvasRenderingContext.h"
-
+#if ENABLE(ACCELERATED_2D_CANVAS) || ENABLE(3D_CANVAS)
+#include "GraphicsContext3D.h"
+#endif
 #include "HTMLCanvasElement.h"
 
@@ -46 +48 @@
 }
 
+bool CanvasRenderingContext::paintsIntoCanvasBuffer() const
+{
+#if ENABLE(ACCELERATED_2D_CANVAS) || ENABLE(3D_CANVAS)
+    if (GraphicsContext3D* context3D = graphicsContext3D())
+        return context3D->paintsIntoCanvasBuffer();
+#endif
+    return true;
+}
+
 } // namespace WebCore

trunk/WebCore/html/canvas/CanvasRenderingContext.h

@@ -55 +55 @@
 
         virtual void paintRenderingResultsToCanvas() {}
+        bool paintsIntoCanvasBuffer() const;
 
     private:

trunk/WebCore/html/canvas/WebGLRenderingContext.h

@@ -286 +286 @@
     void removeObject(WebGLObject*);
 
-    bool paintsIntoCanvasBuffer() const { return m_context->paintsIntoCanvasBuffer(); }
-
   private:
     friend class WebGLObject;

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

@@ -95 +95 @@
 PassRefPtr<Image> ImageBuffer::copyImage() const
 {
+    m_context->platformContext()->syncSoftwareCanvas();
     return BitmapImageSingleFrameSkia::create(*m_data.m_platformContext.bitmap(), true);
 }

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

@@ -734 +734 @@
         if (m_state->m_xferMode == SkXfermode::kSrcOver_Mode) {
             // Last drawn on hardware; clear out the canvas.
-            m_canvas->save();
-            SkRect bounds = {0, 0, m_canvas->getDevice()->width(), m_canvas->getDevice()->height()};
-            m_canvas->clipRect(bounds, SkRegion::kReplace_Op);
-            m_canvas->drawARGB(0, 0, 0, 0, SkXfermode::kClear_Mode);
-            m_canvas->restore();
+            m_canvas->getDevice()->eraseColor(0);
             // Start compositing into the empty canvas.
             m_backingStoreState = Mixed;