Changeset 166836 in webkit

Timestamp:

Apr 5, 2014 12:57:00 PM (10 years ago)

Author:

krit@webkit.org

Message:

Canvas stroke and strokeRect with SourceIn, DestinationIn, SourceOut, DestinationAtop and Copy have errors
​https://bugs.webkit.org/show_bug.cgi?id=66762

Reviewed by Andreas Kling.

Source/WebCore:

For fill operations we create a new ImageBuffer to ensure that the results are composited
correctly according to the Canvas spec. This patch creates a new transparency layer
for stroking on certain compositing operators to archive the same. This makes WebKit's
behavior interoperable with Firefox and IE as well.

Test: fast/fast/canvas/canvas-composite-stroke-alpha.html

• html/canvas/CanvasRenderingContext2D.cpp:

(WebCore::CanvasRenderingContext2D::strokeInternal):
(WebCore::CanvasRenderingContext2D::strokeRect):

LayoutTests:

330 tests based on canvas-composite-alpha to test correct compositing behavior with
strokeRect() and stroke().

• fast/canvas/canvas-composite-stroke-alpha-expected.txt: Added.
• fast/canvas/canvas-composite-stroke-alpha.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-composite-stroke-alpha-expected.txt (added)
• LayoutTests/fast/canvas/canvas-composite-stroke-alpha.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-05  Dirk Schulze  <krit@webkit.org>
+
+        Canvas stroke and strokeRect with SourceIn, DestinationIn, SourceOut, DestinationAtop and Copy have errors
+        https://bugs.webkit.org/show_bug.cgi?id=66762
+
+        Reviewed by Andreas Kling.
+
+        330 tests based on canvas-composite-alpha to test correct compositing behavior with
+        strokeRect() and stroke().
+
+        * fast/canvas/canvas-composite-stroke-alpha-expected.txt: Added.
+        * fast/canvas/canvas-composite-stroke-alpha.html: Added.
+
 2014-04-05  Jeongeun Kim  <je_julie.kim@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-05  Dirk Schulze  <krit@webkit.org>
+
+        Canvas stroke and strokeRect with SourceIn, DestinationIn, SourceOut, DestinationAtop and Copy have errors
+        https://bugs.webkit.org/show_bug.cgi?id=66762
+
+        Reviewed by Andreas Kling.
+
+        For fill operations we create a new ImageBuffer to ensure that the results are composited
+        correctly according to the Canvas spec. This patch creates a new transparency layer
+        for stroking on certain compositing operators to archive the same. This makes WebKit's
+        behavior interoperable with Firefox and IE as well. 
+
+        Test: fast/fast/canvas/canvas-composite-stroke-alpha.html
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::strokeInternal):
+        (WebCore::CanvasRenderingContext2D::strokeRect):
+
 2014-04-05  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -971 +971 @@
 
     if (!path.isEmpty()) {
-        FloatRect dirtyRect = path.fastBoundingRect();
-        inflateStrokeRect(dirtyRect);
-
-        c->strokePath(path);
-        didDraw(dirtyRect);
+        if (isFullCanvasCompositeMode(state().m_globalComposite)) {
+            c->beginTransparencyLayer(1);
+            c->strokePath(path);
+            c->endTransparencyLayer();
+            didDrawEntireCanvas();
+        } else if (state().m_globalComposite == CompositeCopy) {
+            clearCanvas();
+            c->strokePath(path);
+            didDrawEntireCanvas();
+        } else {
+            FloatRect dirtyRect = path.fastBoundingRect();
+            inflateStrokeRect(dirtyRect);
+            c->strokePath(path);
+            didDraw(dirtyRect);
+        }
     }
 }
@@ -1148 +1158 @@
 
     FloatRect rect(x, y, width, height);
-
-    FloatRect boundingRect = rect;
-    boundingRect.inflate(state().m_lineWidth / 2);
-
-    c->strokeRect(rect, state().m_lineWidth);
-    didDraw(boundingRect);
+    if (isFullCanvasCompositeMode(state().m_globalComposite)) {
+        c->beginTransparencyLayer(1);
+        c->strokeRect(rect, state().m_lineWidth);
+        c->endTransparencyLayer();
+        didDrawEntireCanvas();
+    } else if (state().m_globalComposite == CompositeCopy) {
+        clearCanvas();
+        c->strokeRect(rect, state().m_lineWidth);
+        didDrawEntireCanvas();
+    } else {
+        FloatRect boundingRect = rect;
+        boundingRect.inflate(state().m_lineWidth / 2);
+        c->strokeRect(rect, state().m_lineWidth);
+        didDraw(boundingRect);
+    }
 }