Changeset 75833 in webkit

Timestamp:

Jan 14, 2011 3:46:58 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-01-14 Helder Correia <​helder@sencha.com>

Reviewed by Simon Fraser.

Shadow is not drawn when filling a path with a gradient
​https://bugs.webkit.org/show_bug.cgi?id=51982

This happens in CG and is related to bug 51869, this time to be fixed
in GraphicsContext::fillPath(const Path& path). We need to draw the
gradient clipped to the path on a CGLayer first, and then draw the
layer on the GraphicsContext.

• fast/canvas/canvas-fillPath-gradient-shadow-expected.txt: Added.
• fast/canvas/canvas-fillPath-gradient-shadow.html: Added.
• fast/canvas/script-tests/canvas-fillPath-gradient-shadow.js: Added.
• platform/chromium/test_expectations.txt: Skipping new test since it fails.
• platform/qt/Skipped: Ditto.

2011-01-14 Helder Correia <​helder@sencha.com>

Reviewed by Simon Fraser.

Shadow is not drawn when filling a path with a gradient
​https://bugs.webkit.org/show_bug.cgi?id=51982

This happens in CG and is related to bug 51869, this time to be fixed
in GraphicsContext::fillPath(const Path& path). We need to draw the
gradient clipped to the path on a CGLayer first, and then draw the
layer on the GraphicsContext.

Test: fast/canvas/canvas-fillPath-gradient-shadow.html

• platform/graphics/cg/GraphicsContextCG.cpp: (WebCore::GraphicsContext::fillPath):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-fillPath-gradient-shadow-expected.txt (added)
• LayoutTests/fast/canvas/canvas-fillPath-gradient-shadow.html (added)
• LayoutTests/fast/canvas/script-tests/canvas-fillPath-gradient-shadow.js (added)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-14  Helder Correia  <helder@sencha.com>
+
+        Reviewed by Simon Fraser.
+
+        Shadow is not drawn when filling a path with a gradient
+        https://bugs.webkit.org/show_bug.cgi?id=51982
+
+        This happens in CG and is related to bug 51869, this time to be fixed
+        in GraphicsContext::fillPath(const Path& path). We need to draw the
+        gradient clipped to the path on a CGLayer first, and then draw the
+        layer on the GraphicsContext.
+
+        * fast/canvas/canvas-fillPath-gradient-shadow-expected.txt: Added.
+        * fast/canvas/canvas-fillPath-gradient-shadow.html: Added.
+        * fast/canvas/script-tests/canvas-fillPath-gradient-shadow.js: Added.
+        * platform/chromium/test_expectations.txt: Skipping new test since it fails.
+        * platform/qt/Skipped: Ditto.
+
 2011-01-14  Mihai Parparita  <mihaip@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -1298 +1298 @@
 BUGCR23477 MAC : fast/canvas/fill-stroke-clip-reset-path.html = IMAGE
 BUGCR23477 MAC : fast/dynamic/containing-block-change.html = IMAGE
+BUGWK51982 LINUX WIN : fast/canvas/canvas-fillPath-gradient-shadow.html = FAIL
 
 // Unexpected gray

trunk/LayoutTests/platform/qt/Skipped

@@ -2368 +2368 @@
 fast/block/positioning/absolute-in-inline-rtl-4.html
 fast/canvas/canvas-gradient-addStop-error.html
+fast/canvas/canvas-fillPath-gradient-shadow.html
 fast/css/zoom-body-scroll.html
 fast/dom/Element/getBoundingClientRect.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-14  Helder Correia  <helder@sencha.com>
+
+        Reviewed by Simon Fraser.
+
+        Shadow is not drawn when filling a path with a gradient
+        https://bugs.webkit.org/show_bug.cgi?id=51982
+
+        This happens in CG and is related to bug 51869, this time to be fixed
+        in GraphicsContext::fillPath(const Path& path). We need to draw the
+        gradient clipped to the path on a CGLayer first, and then draw the
+        layer on the GraphicsContext.
+
+        Test: fast/canvas/canvas-fillPath-gradient-shadow.html
+
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::GraphicsContext::fillPath):
+
 2011-01-14  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

@@ -547 +547 @@
     CGContextRef context = platformContext();
 
+    if (m_state.fillGradient) {
+        if (hasShadow()) {
+            FloatRect rect = path.boundingRect();
+            CGLayerRef layer = CGLayerCreateWithContext(context, CGSizeMake(rect.width(), rect.height()), 0);
+            CGContextRef layerContext = CGLayerGetContext(layer);
+
+            CGContextTranslateCTM(layerContext, -rect.x(), -rect.y());
+            CGContextBeginPath(layerContext);
+            CGContextAddPath(layerContext, path.platformPath());
+            CGContextConcatCTM(layerContext, m_state.fillGradient->gradientSpaceTransform());
+
+            if (fillRule() == RULE_EVENODD)
+                CGContextEOClip(layerContext);
+            else
+                CGContextClip(layerContext);
+
+            m_state.fillGradient->paint(layerContext);
+            CGContextDrawLayerAtPoint(context, CGPointMake(rect.left(), rect.top()), layer);
+            CGLayerRelease(layer);
+        } else {
+            CGContextBeginPath(context);
+            CGContextAddPath(context, path.platformPath());
+            CGContextSaveGState(context);
+            CGContextConcatCTM(context, m_state.fillGradient->gradientSpaceTransform());
+
+            if (fillRule() == RULE_EVENODD)
+                CGContextEOClip(context);
+            else
+                CGContextClip(context);
+
+            m_state.fillGradient->paint(this);
+            CGContextRestoreGState(context);
+        }
+
+        return;
+    }
+
     CGContextBeginPath(context);
     CGContextAddPath(context, path.platformPath());
-
-    if (m_state.fillGradient) {
-        CGContextSaveGState(context);
-        if (fillRule() == RULE_EVENODD)
-            CGContextEOClip(context);
-        else
-            CGContextClip(context);
-        CGContextConcatCTM(context, m_state.fillGradient->gradientSpaceTransform());
-        m_state.fillGradient->paint(this);
-        CGContextRestoreGState(context);
-        return;
-    }
 
     if (m_state.fillPattern)