Changeset 150370 in webkit

Timestamp:

May 20, 2013 9:39:30 AM (11 years ago)

Author:

Martin Robinson

Message:

[Cairo] Canvas-shadow behavior is not being as expected
​https://bugs.webkit.org/show_bug.cgi?id=108897

Patch by Rashmi Shyamasundar <​rashmi.s2@samsung.com> on 2013-05-18
Reviewed by Martin Robinson.

Source/WebCore:

ShadowBlur::endShadowLayer copies the image from shadowContext to cairoContext.
CairoContext-path should be empty for doing this copy. Otherwise, the
original-image area will also get filled with the shadow.

Test: fast/canvas/canvas-image-shadow.html

• platform/graphics/cairo/GraphicsContextCairo.cpp:

(WebCore::drawPathShadow):

LayoutTests:

Test to verify the shadow of an image drawn on canvas.
This test uses an image whose size is smaller than,
the size of the rectangle which should be filled with the image.

• fast/canvas/canvas-image-shadow-expected.txt: Added.
• fast/canvas/canvas-image-shadow.html: Added.
• fast/canvas/script-tests/canvas-image-shadow.js: Added.

(draw):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-image-shadow-expected.txt (added)
• LayoutTests/fast/canvas/canvas-image-shadow.html (added)
• LayoutTests/fast/canvas/script-tests/canvas-image-shadow.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-05-18  Rashmi Shyamasundar  <rashmi.s2@samsung.com>
+
+        [Cairo] Canvas-shadow behavior is not being as expected
+        https://bugs.webkit.org/show_bug.cgi?id=108897
+
+        Reviewed by Martin Robinson.
+
+        Test to verify the shadow of an image drawn on canvas.
+        This test uses an image whose size is smaller than,
+        the size of the rectangle which should be filled with the image.
+
+        * fast/canvas/canvas-image-shadow-expected.txt: Added.
+        * fast/canvas/canvas-image-shadow.html: Added.
+        * fast/canvas/script-tests/canvas-image-shadow.js: Added.
+        (draw):
+
 2013-05-20  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-18  Rashmi Shyamasundar  <rashmi.s2@samsung.com>
+
+        [Cairo] Canvas-shadow behavior is not being as expected
+        https://bugs.webkit.org/show_bug.cgi?id=108897
+
+        Reviewed by Martin Robinson.
+
+        ShadowBlur::endShadowLayer copies the image from shadowContext to cairoContext.
+        CairoContext-path should be empty for doing this copy. Otherwise, the 
+        original-image area will also get filled with the shadow.
+
+        Test: fast/canvas/canvas-image-shadow.html
+
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::drawPathShadow):
+
 2013-05-20  Lamarque V. Souza  <Lamarque.Souza@basyskom.com>
 

trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp

@@ -142 +142 @@
     }
 
+    // The original path may still be hanging around on the context and endShadowLayer
+    // will take care of properly creating a path to draw the result shadow. We remove the path
+    // temporarily and then restore it.
+    // See: https://bugs.webkit.org/show_bug.cgi?id=108897
+    cairo_new_path(cairoContext);
     shadow.endShadowLayer(context);
-
-    // ShadowBlur::endShadowLayer destroys the current path on the Cairo context. We restore it here.
-    cairo_new_path(cairoContext);
     cairo_append_path(cairoContext, path.get());
 }