Changeset 75139 in webkit

Timestamp:

Jan 5, 2011 10:11:02 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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

Reviewed by Simon Fraser.

Shadows are not drawn when filling a rect with a gradient fillStyle on Mac and Chromium-Mac
​https://bugs.webkit.org/show_bug.cgi?id=51869

GraphicsContext::fillRect(const FloatRect&) is clipping to the rect.
The shadow is being drawn, but getting clipped to the rect being filled.
The solution is to draw the gradient into a CGLayer (when a shadow is
required), then render the layer to the GraphicsContext.

This patch also fixes:
canvas/philip/tests/2d.shadow.gradient.alpha.html
canvas/philip/tests/2d.shadow.gradient.basic.html
canvas/philip/tests/2d.shadow.gradient.transparent.2.html

New test to ensure that shadows are drawn when fillStyle is a gradient,
possibly with some transparency and blur, and specifically using
fillRect.

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

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

Reviewed by Simon Fraser.

Shadows are not drawn when filling a rect with a gradient fillStyle on Mac and Chromium-Mac
​https://bugs.webkit.org/show_bug.cgi?id=51869

GraphicsContext::fillRect(const FloatRect&) is clipping to the rect.
The shadow is being drawn, but getting clipped to the rect being filled.
The solution is to draw the gradient into a CGLayer (when a shadow is
required), then render the layer to the GraphicsContext.

This patch also fixes:
canvas/philip/tests/2d.shadow.gradient.alpha.html
canvas/philip/tests/2d.shadow.gradient.basic.html
canvas/philip/tests/2d.shadow.gradient.transparent.2.html

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

• platform/graphics/Gradient.h:
• platform/graphics/cg/GradientCG.cpp: (WebCore::Gradient::paint):
• platform/graphics/cg/GraphicsContextCG.cpp: (WebCore::GraphicsContext::fillRect):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-fillRect-gradient-shadow-expected.txt (added)
• LayoutTests/fast/canvas/canvas-fillRect-gradient-shadow.html (added)
• LayoutTests/fast/canvas/script-tests/canvas-fillRect-gradient-shadow.js (added)
• LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.shadow.gradient.alpha-expected.txt (deleted)
• LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.shadow.gradient.basic-expected.txt (deleted)
• LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.shadow.gradient.transparent.2-expected.txt (deleted)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/Gradient.h (modified) (2 diffs)
• WebCore/platform/graphics/GraphicsContext.cpp (modified) (2 diffs)
• WebCore/platform/graphics/GraphicsContext.h (modified) (1 diff)
• WebCore/platform/graphics/cg/GradientCG.cpp (modified) (2 diffs)
• WebCore/platform/graphics/cg/GraphicsContextCG.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-05  Helder Correia  <helder@sencha.com>
+
+        Reviewed by Simon Fraser.
+
+        Shadows are not drawn when filling a rect with a gradient fillStyle on Mac and Chromium-Mac
+        https://bugs.webkit.org/show_bug.cgi?id=51869
+
+        GraphicsContext::fillRect(const FloatRect&) is clipping to the rect.
+        The shadow is being drawn, but getting clipped to the rect being filled.
+        The solution is to draw the gradient into a CGLayer (when a shadow is
+        required), then render the layer to the GraphicsContext.
+
+        This patch also fixes:
+        canvas/philip/tests/2d.shadow.gradient.alpha.html
+        canvas/philip/tests/2d.shadow.gradient.basic.html
+        canvas/philip/tests/2d.shadow.gradient.transparent.2.html
+
+        New test to ensure that shadows are drawn when fillStyle is a gradient,
+        possibly with some transparency and blur, and specifically using
+        fillRect.
+
+        * fast/canvas/canvas-fillRect-gradient-shadow-expected.txt: Added.
+        * fast/canvas/canvas-fillRect-gradient-shadow.html: Added.
+        * fast/canvas/script-tests/canvas-fillRect-gradient-shadow.js: Added.
+
 2011-01-05  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2011-01-05  Helder Correia  <helder@sencha.com>
+
+        Reviewed by Simon Fraser.
+
+        Shadows are not drawn when filling a rect with a gradient fillStyle on Mac and Chromium-Mac
+        https://bugs.webkit.org/show_bug.cgi?id=51869
+
+        GraphicsContext::fillRect(const FloatRect&) is clipping to the rect.
+        The shadow is being drawn, but getting clipped to the rect being filled.
+        The solution is to draw the gradient into a CGLayer (when a shadow is
+        required), then render the layer to the GraphicsContext.
+
+        This patch also fixes:
+        canvas/philip/tests/2d.shadow.gradient.alpha.html
+        canvas/philip/tests/2d.shadow.gradient.basic.html
+        canvas/philip/tests/2d.shadow.gradient.transparent.2.html
+
+        Test: fast/canvas/canvas-fillRect-gradient-shadow.html
+
+        * platform/graphics/Gradient.h:
+        * platform/graphics/cg/GradientCG.cpp:
+        (WebCore::Gradient::paint):
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::GraphicsContext::fillRect):
+
 2011-01-05  Steve Falkenburg  <sfalken@apple.com>
 

trunk/WebCore/platform/graphics/Gradient.h

@@ -35 +35 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/Vector.h>
+
+#if PLATFORM(WIN)
+#include <CoreGraphics/CoreGraphics.h>
+#endif
 
 #if PLATFORM(CG)
@@ -137 +141 @@
 
 #if PLATFORM(CG)
+        void paint(CGContextRef);
         void paint(GraphicsContext*);
 #endif

trunk/WebCore/platform/graphics/GraphicsContext.cpp

@@ -149 +149 @@
 }
 
+bool GraphicsContext::hasShadow() const
+{
+    return m_state.shadowColor.isValid() && m_state.shadowColor.alpha()
+           && (m_state.shadowBlur || m_state.shadowOffset.width() || m_state.shadowOffset.height());
+}
+
 bool GraphicsContext::getShadow(FloatSize& offset, float& blur, Color& color, ColorSpace& colorSpace) const
 {
@@ -156 +162 @@
     colorSpace = m_state.shadowColorSpace;
 
-    return color.isValid() && color.alpha() && (blur || offset.width() || offset.height());
+    return hasShadow();
 }
 

trunk/WebCore/platform/graphics/GraphicsContext.h

@@ -347 +347 @@
         void endTransparencyLayer();
 
+        bool hasShadow() const;
         void setShadow(const FloatSize&, float blur, const Color&, ColorSpace);
         bool getShadow(FloatSize&, float&, Color&, ColorSpace&) const;

trunk/WebCore/platform/graphics/cg/GradientCG.cpp

@@ -113 +113 @@
 {
     CGContextRef ctx = context->platformContext();
+    paint(ctx);
+}
+
+void Gradient::paint(CGContextRef context)
+{
 #if USE_CG_SHADING
-    CGContextDrawShading(ctx, platformGradient());
+    CGContextDrawShading(context, platformGradient());
 #else
     CGGradientDrawingOptions extendOptions = kCGGradientDrawsBeforeStartLocation | kCGGradientDrawsAfterEndLocation;
@@ -120 +125 @@
         bool needScaling = aspectRatio() != 1;
         if (needScaling) {
-            CGContextSaveGState(ctx);
+            CGContextSaveGState(context);
             // Scale from the center of the gradient. We only ever scale non-deprecated gradients,
             // for which m_p0 == m_p1.
             ASSERT(m_p0 == m_p1);
-            CGContextTranslateCTM(ctx, m_p0.x(), m_p0.y());
-            CGContextScaleCTM(ctx, 1, 1 / aspectRatio());
-            CGContextTranslateCTM(ctx, -m_p0.x(), -m_p0.y());
+            CGContextTranslateCTM(context, m_p0.x(), m_p0.y());
+            CGContextScaleCTM(context, 1, 1 / aspectRatio());
+            CGContextTranslateCTM(context, -m_p0.x(), -m_p0.y());
         }
 
-        CGContextDrawRadialGradient(ctx, platformGradient(), m_p0, m_r0, m_p1, m_r1, extendOptions);
-        
+        CGContextDrawRadialGradient(context, platformGradient(), m_p0, m_r0, m_p1, m_r1, extendOptions);
+
         if (needScaling)
-            CGContextRestoreGState(ctx);
+            CGContextRestoreGState(context);
     } else
-        CGContextDrawLinearGradient(ctx, platformGradient(), m_p0, m_p1, extendOptions);
+        CGContextDrawLinearGradient(context, platformGradient(), m_p0, m_p1, extendOptions);
 #endif
 }

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

@@ -602 +602 @@
     if (m_state.fillGradient) {
         CGContextSaveGState(context);
-        CGContextClipToRect(context, rect);
         CGContextConcatCTM(context, m_state.fillGradient->gradientSpaceTransform());
-        m_state.fillGradient->paint(this);
+        if (hasShadow()) {
+            CGLayerRef layer = CGLayerCreateWithContext(context, CGSizeMake(rect.width(), rect.height()), 0);
+            CGContextRef layerContext = CGLayerGetContext(layer);
+            m_state.fillGradient->paint(layerContext);
+            CGContextDrawLayerAtPoint(context, CGPointMake(rect.left(), rect.top()), layer);
+            CGLayerRelease(layer);
+        } else {
+            CGContextClipToRect(context, rect);
+            m_state.fillGradient->paint(this);
+        }
         CGContextRestoreGState(context);
         return;