Changeset 39080 in webkit

Timestamp:

Dec 7, 2008 1:23:17 AM (15 years ago)

Author:

krit@webkit.org

Message:

2008-12-07 Dirk Schulze <​krit@webkit.org>

Reviewed by Oliver Hunt.

WebCore:

Add gradient and pattern support for strokeRect on canvas/Cg.

Canvas strokeRect() doesn't support gradients
​https://bugs.webkit.org/show_bug.cgi?id=19790

Test: fast/canvas/canvas-strokeRect.html

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

LayoutTests:

Tests strokeRect with patterns and gradients.

• fast/canvas/canvas-strokeRect-expected.txt: Added.
• fast/canvas/canvas-strokeRect.html: Added.
• fast/canvas/resources/canvas-strokeRect.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-strokeRect-expected.txt (added)
• LayoutTests/fast/canvas/canvas-strokeRect.html (added)
• LayoutTests/fast/canvas/resources/canvas-strokeRect.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/cg/GraphicsContextCG.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-12-07  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Oliver Hunt.
+
+        Tests strokeRect with patterns and gradients.
+
+        * fast/canvas/canvas-strokeRect-expected.txt: Added.
+        * fast/canvas/canvas-strokeRect.html: Added.
+        * fast/canvas/resources/canvas-strokeRect.js: Added.
+
 2008-12-06  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-12-07  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Oliver Hunt.
+
+        Add gradient and pattern support for strokeRect on canvas/Cg.
+
+        Canvas strokeRect() doesn't support gradients
+        https://bugs.webkit.org/show_bug.cgi?id=19790
+
+        Test: fast/canvas/canvas-strokeRect.html
+
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::GraphicsContext::strokeRect):
+
 2008-12-06  Dirk Schulze  <krit@webkit.org>
 

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

@@ -763 +763 @@
     if (paintingDisabled())
         return;
-    CGContextStrokeRectWithWidth(platformContext(), r, lineWidth);
+
+    CGContextRef context = platformContext();
+    switch (m_common->state.strokeColorSpace) {
+    case SolidColorSpace:
+        if (strokeColor().alpha())
+            CGContextStrokeRectWithWidth(context, r, lineWidth);
+        break;
+    case PatternColorSpace:
+        applyStrokePattern(this, m_common->state.strokePattern.get());
+        CGContextStrokeRectWithWidth(context, r, lineWidth);
+        break;
+    case GradientColorSpace:
+        CGContextSaveGState(context);
+        setStrokeThickness(lineWidth);
+        CGContextAddRect(context, r);
+        CGContextReplacePathWithStrokedPath(context);
+        CGContextClip(context);
+        CGContextDrawShading(context, m_common->state.strokeGradient->platformGradient());
+        CGContextRestoreGState(context);
+        break;
+    }
 }