Changeset 37605 in webkit

Timestamp:

Oct 15, 2008 10:02:02 AM (16 years ago)

Author:

Darin Adler

Message:

2008-10-15 Dirk Schulze <​vbs85@gmx.de>

Reviewed by Eric Seidel.

• part of ​https://bugs.webkit.org/show_bug.cgi?id=20543 Moved gradient spread method out of SVG into the GraphicsContext.

• platform/graphics/GraphicsContext.cpp: (WebCore::GraphicsContext::spreadMethod): (WebCore::GraphicsContext::setSpreadMethod):
• platform/graphics/GraphicsContext.h: (WebCore::):
• platform/graphics/GraphicsContextPrivate.h:
• platform/graphics/cairo/GraphicsContextCairo.cpp: (WebCore::applySpreadMethod): (WebCore::GraphicsContext::fillPath): (WebCore::GraphicsContext::strokePath):
• platform/graphics/qt/GraphicsContextQt.cpp: (WebCore::applySpreadMethod): (WebCore::GraphicsContext::fillPath): (WebCore::GraphicsContext::strokePath):
• svg/GradientAttributes.h: (WebCore::GradientAttributes::GradientAttributes): (WebCore::GradientAttributes::spreadMethod): (WebCore::GradientAttributes::setSpreadMethod):
• svg/SVGGradientElement.cpp: (WebCore::SVGGradientElement::parseMappedAttribute):
• svg/SVGGradientElement.h:
• svg/SVGLinearGradientElement.cpp: (WebCore::SVGLinearGradientElement::collectGradientProperties):
• svg/SVGRadialGradientElement.cpp: (WebCore::SVGRadialGradientElement::collectGradientProperties):
• svg/graphics/SVGPaintServerGradient.cpp: (WebCore::operator<<): (WebCore::SVGPaintServerGradient::SVGPaintServerGradient): (WebCore::SVGPaintServerGradient::spreadMethod): (WebCore::SVGPaintServerGradient::setGradientSpreadMethod): (WebCore::SVGPaintServerGradient::externalRepresentation):
• svg/graphics/SVGPaintServerGradient.h:
• svg/graphics/cairo/SVGPaintServerGradientCairo.cpp: (WebCore::SVGPaintServerGradient::setup):
• svg/graphics/qt/SVGPaintServerGradientQt.cpp: (WebCore::SVGPaintServerGradient::setup):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext.cpp (modified) (1 diff)
• platform/graphics/GraphicsContext.h (modified) (2 diffs)
• platform/graphics/GraphicsContextPrivate.h (modified) (1 diff)
• platform/graphics/cairo/GraphicsContextCairo.cpp (modified) (3 diffs)
• platform/graphics/qt/GraphicsContextQt.cpp (modified) (5 diffs)
• svg/GradientAttributes.h (modified) (3 diffs)
• svg/SVGGradientElement.cpp (modified) (1 diff)
• svg/SVGGradientElement.h (modified) (1 diff)
• svg/SVGLinearGradientElement.cpp (modified) (1 diff)
• svg/SVGRadialGradientElement.cpp (modified) (1 diff)
• svg/graphics/SVGPaintServerGradient.cpp (modified) (4 diffs)
• svg/graphics/SVGPaintServerGradient.h (modified) (5 diffs)
• svg/graphics/cairo/SVGPaintServerGradientCairo.cpp (modified) (1 diff)
• svg/graphics/qt/SVGPaintServerGradientQt.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-10-15  Dirk Schulze  <vbs85@gmx.de>
+
+        Reviewed by Eric Seidel.
+
+        - part of https://bugs.webkit.org/show_bug.cgi?id=20543
+          Moved gradient spread method out of SVG into the GraphicsContext.
+
+        * platform/graphics/GraphicsContext.cpp:
+        (WebCore::GraphicsContext::spreadMethod):
+        (WebCore::GraphicsContext::setSpreadMethod):
+        * platform/graphics/GraphicsContext.h:
+        (WebCore::):
+        * platform/graphics/GraphicsContextPrivate.h:
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::applySpreadMethod):
+        (WebCore::GraphicsContext::fillPath):
+        (WebCore::GraphicsContext::strokePath):
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::applySpreadMethod):
+        (WebCore::GraphicsContext::fillPath):
+        (WebCore::GraphicsContext::strokePath):
+        * svg/GradientAttributes.h:
+        (WebCore::GradientAttributes::GradientAttributes):
+        (WebCore::GradientAttributes::spreadMethod):
+        (WebCore::GradientAttributes::setSpreadMethod):
+        * svg/SVGGradientElement.cpp:
+        (WebCore::SVGGradientElement::parseMappedAttribute):
+        * svg/SVGGradientElement.h:
+        * svg/SVGLinearGradientElement.cpp:
+        (WebCore::SVGLinearGradientElement::collectGradientProperties):
+        * svg/SVGRadialGradientElement.cpp:
+        (WebCore::SVGRadialGradientElement::collectGradientProperties):
+        * svg/graphics/SVGPaintServerGradient.cpp:
+        (WebCore::operator<<):
+        (WebCore::SVGPaintServerGradient::SVGPaintServerGradient):
+        (WebCore::SVGPaintServerGradient::spreadMethod):
+        (WebCore::SVGPaintServerGradient::setGradientSpreadMethod):
+        (WebCore::SVGPaintServerGradient::externalRepresentation):
+        * svg/graphics/SVGPaintServerGradient.h:
+        * svg/graphics/cairo/SVGPaintServerGradientCairo.cpp:
+        (WebCore::SVGPaintServerGradient::setup):
+        * svg/graphics/qt/SVGPaintServerGradientQt.cpp:
+        (WebCore::SVGPaintServerGradient::setup):
+
 2008-10-09  Darin Fisher  <darin@chromium.org>
 

trunk/WebCore/platform/graphics/GraphicsContext.cpp

@@ -190 +190 @@
 }
 
+GradientSpreadMethod GraphicsContext::spreadMethod() const
+{
+    return m_common->state.spreadMethod;
+}
+
+void GraphicsContext::setSpreadMethod(GradientSpreadMethod spreadMethod)
+{
+    m_common->state.spreadMethod = spreadMethod;
+}
+
 void GraphicsContext::setFillColor(const Color& color)
 {

trunk/WebCore/platform/graphics/GraphicsContext.h

@@ -126 +126 @@
     };
 
+    // FIXME: Currently these constants have to match the values used in the SVG
+    // DOM API. That's a mistake. We need to make cut that dependency.
+    enum GradientSpreadMethod {
+        SpreadMethodPad = 1,
+        SpreadMethodReflect = 2,
+        SpreadMethodRepeat = 3
+    };
+
     class GraphicsContext : Noncopyable {
     public:
@@ -147 +155 @@
         WindRule fillRule() const;
         void setFillRule(WindRule);
+        GradientSpreadMethod spreadMethod() const;
+        void setSpreadMethod(GradientSpreadMethod);
         Color fillColor() const;
         void setFillColor(const Color&);

trunk/WebCore/platform/graphics/GraphicsContextPrivate.h

@@ -72 +72 @@
         
         WindRule fillRule;
+        GradientSpreadMethod spreadMethod;
         ColorSpace fillColorSpace;
         Color fillColor;

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

@@ -79 +79 @@
 }
 
+static inline cairo_pattern_t* applySpreadMethod(cairo_pattern_t* pattern, GradientSpreadMethod spreadMethod)
+{
+    switch (spreadMethod) {
+        case SpreadMethodPad:
+           cairo_pattern_set_extend(pattern, CAIRO_EXTEND_PAD);
+           break;
+        case SpreadMethodReflect:
+            cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REFLECT);
+            break;
+        case SpreadMethodRepeat:
+            cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
+            break;
+        default:
+            cairo_pattern_set_extend(pattern, CAIRO_EXTEND_NONE);
+            break;
+    }
+    return pattern;
+}
+
 GraphicsContext::GraphicsContext(PlatformGraphicsContext* cr)
     : m_common(createGraphicsContextPrivate())
@@ -438 +457 @@
         break;
     case GradientColorSpace:
-        cairo_set_source(cr, m_common->state.fillGradient.get()->platformGradient());
+        cairo_pattern_t* pattern = m_common->state.fillGradient.get()->platformGradient();
+        pattern = applySpreadMethod(pattern, spreadMethod());
+        cairo_set_source(cr, pattern);
         cairo_clip(cr);
         cairo_paint_with_alpha(cr, m_data->globalAlpha);
@@ -475 +496 @@
         break;
     case GradientColorSpace:
-        cairo_set_source(cr, m_common->state.strokeGradient.get()->platformGradient());
+        cairo_pattern_t* pattern = m_common->state.strokeGradient.get()->platformGradient();
+        pattern = applySpreadMethod(pattern, spreadMethod());
+        cairo_set_source(cr, pattern);
         if (m_data->globalAlpha < 1.0f) {
             cairo_push_group(cr);

trunk/WebCore/platform/graphics/qt/GraphicsContextQt.cpp

@@ -8 +8 @@
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (C) 2008 Dirk Schulze <vbs85@gmx.de>
  *
  * All rights reserved.
@@ -52 +53 @@
 
 #include <QDebug>
+#include <QGradient>
 #include <QPainter>
 #include <QPaintDevice>
@@ -151 +153 @@
 }
 
+static inline QGradient applySpreadMethod(QGradient gradient, GradientSpreadMethod spreadMethod)
+{
+    switch (spreadMethod) {
+        case SpreadMethodPad:
+            gradient.setSpread(QGradient::PadSpread);
+           break;
+        case SpreadMethodReflect:
+            gradient.setSpread(QGradient::ReflectSpread);
+            break;
+        case SpreadMethodRepeat:
+            gradient.setSpread(QGradient::RepeatSpread);
+            break;
+    }
+    return gradient;
+}
+
 struct TransparencyLayer
 {
@@ -520 +538 @@
         break;
     case GradientColorSpace:
-        p->fillPath(path, QBrush(*(m_common->state.fillGradient.get()->platformGradient())));
+        QGradient* gradient = m_common->state.fillGradient.get()->platformGradient();
+        *gradient = applySpreadMethod(*gradient, spreadMethod());  
+        p->fillPath(path, QBrush(*gradient));
         break;
     }
@@ -546 +566 @@
     }
     case GradientColorSpace: {
-        pen.setBrush(QBrush(*(m_common->state.strokeGradient.get()->platformGradient())));
+        QGradient* gradient = m_common->state.strokeGradient.get()->platformGradient();
+        *gradient = applySpreadMethod(*gradient, spreadMethod()); 
+        pen.setBrush(QBrush(*gradient));
         p->setPen(pen);
         p->strokePath(path, pen);

trunk/WebCore/svg/GradientAttributes.h

@@ -29 +29 @@
     struct GradientAttributes {
         GradientAttributes()
-            : m_spreadMethod(SPREADMETHOD_PAD)
+            : m_spreadMethod(SpreadMethodPad)
             , m_boundingBoxMode(true)
             , m_spreadMethodSet(false)
@@ -38 +38 @@
         }
 
-        SVGGradientSpreadMethod spreadMethod() const { return m_spreadMethod; }
+        GradientSpreadMethod spreadMethod() const { return m_spreadMethod; }
         bool boundingBoxMode() const { return m_boundingBoxMode; }
         AffineTransform gradientTransform() const { return m_gradientTransform; }
         const Vector<SVGGradientStop>& stops() const { return m_stops; }
 
-        void setSpreadMethod(SVGGradientSpreadMethod value) { m_spreadMethod = value; m_spreadMethodSet = true; }
+        void setSpreadMethod(GradientSpreadMethod value) { m_spreadMethod = value; m_spreadMethodSet = true; }
         void setBoundingBoxMode(bool value) { m_boundingBoxMode = value; m_boundingBoxModeSet = true; }
         void setGradientTransform(const AffineTransform& value) { m_gradientTransform = value; m_gradientTransformSet = true; }
@@ -55 +55 @@
     private:
         // Properties
-        SVGGradientSpreadMethod m_spreadMethod;
+        GradientSpreadMethod m_spreadMethod;
         bool m_boundingBoxMode;
         AffineTransform m_gradientTransform;

trunk/WebCore/svg/SVGGradientElement.cpp

@@ -70 +70 @@
     } else if (attr->name() == SVGNames::spreadMethodAttr) {
         if (attr->value() == "reflect")
-            setSpreadMethodBaseValue(SVG_SPREADMETHOD_REFLECT);
+            setSpreadMethodBaseValue(SpreadMethodReflect);
         else if (attr->value() == "repeat")
-            setSpreadMethodBaseValue(SVG_SPREADMETHOD_REPEAT);
+            setSpreadMethodBaseValue(SpreadMethodRepeat);
         else if (attr->value() == "pad")
-            setSpreadMethodBaseValue(SVG_SPREADMETHOD_PAD);
+            setSpreadMethodBaseValue(SpreadMethodPad);
     } else {
         if (SVGURIReference::parseMappedAttribute(attr))

trunk/WebCore/svg/SVGGradientElement.h

@@ -39 +39 @@
                                public SVGExternalResourcesRequired {
     public:
-        enum SVGGradientType {
-            SVG_SPREADMETHOD_UNKNOWN = 0,
-            SVG_SPREADMETHOD_PAD     = 1,
-            SVG_SPREADMETHOD_REFLECT = 2,
-            SVG_SPREADMETHOD_REPEAT  = 3
-        };
-
         SVGGradientElement(const QualifiedName&, Document*);
         virtual ~SVGGradientElement();

trunk/WebCore/svg/SVGLinearGradientElement.cpp

@@ -106 +106 @@
     while (current) {
         if (!attributes.hasSpreadMethod() && current->hasAttribute(SVGNames::spreadMethodAttr))
-            attributes.setSpreadMethod((SVGGradientSpreadMethod) current->spreadMethod());
+            attributes.setSpreadMethod((GradientSpreadMethod) current->spreadMethod());
 
         if (!attributes.hasBoundingBoxMode() && current->hasAttribute(SVGNames::gradientUnitsAttr))

trunk/WebCore/svg/SVGRadialGradientElement.cpp

@@ -115 +115 @@
     while (current) {
         if (!attributes.hasSpreadMethod() && current->hasAttribute(SVGNames::spreadMethodAttr))
-            attributes.setSpreadMethod((SVGGradientSpreadMethod) current->spreadMethod());
+            attributes.setSpreadMethod((GradientSpreadMethod) current->spreadMethod());
 
         if (!attributes.hasBoundingBoxMode() && current->hasAttribute(SVGNames::gradientUnitsAttr))

trunk/WebCore/svg/graphics/SVGPaintServerGradient.cpp

@@ -34 +34 @@
 namespace WebCore {
 
-TextStream& operator<<(TextStream& ts, SVGGradientSpreadMethod m)
+TextStream& operator<<(TextStream& ts, GradientSpreadMethod m)
 {
     switch (m) {
-        case SPREADMETHOD_PAD:
+        case SpreadMethodPad:
             ts << "PAD"; break;
-        case SPREADMETHOD_REPEAT:
+        case SpreadMethodRepeat:
             ts << "REPEAT"; break;
-        case SPREADMETHOD_REFLECT:
+        case SpreadMethodReflect:
             ts << "REFLECT"; break;
     }
@@ -61 +61 @@
 
 SVGPaintServerGradient::SVGPaintServerGradient(const SVGGradientElement* owner)
-    : m_spreadMethod(SPREADMETHOD_PAD)
+    : m_spreadMethod(SpreadMethodPad)
     , m_boundingBoxMode(true)
     , m_ownerElement(owner)
@@ -92 +92 @@
 }
 
-SVGGradientSpreadMethod SVGPaintServerGradient::spreadMethod() const
+GradientSpreadMethod SVGPaintServerGradient::spreadMethod() const
 {
     return m_spreadMethod;
 }
 
-void SVGPaintServerGradient::setGradientSpreadMethod(const SVGGradientSpreadMethod& method)
+void SVGPaintServerGradient::setGradientSpreadMethod(const GradientSpreadMethod& method)
 {
     m_spreadMethod = method;
@@ -129 +129 @@
     // abstract, don't stream type
     ts  << "[stops=" << gradientStops() << "]";
-    if (spreadMethod() != SPREADMETHOD_PAD)
+    if (spreadMethod() != SpreadMethodPad)
         ts << "[method=" << spreadMethod() << "]";
     if (!boundingBoxMode())

trunk/WebCore/svg/graphics/SVGPaintServerGradient.h

@@ -31 +31 @@
 #include "AffineTransform.h"
 #include "Color.h"
+#include "GraphicsContext.h"
 #include "SVGPaintServer.h"
 
@@ -48 +49 @@
     class SVGGradientElement;
 
-    // FIXME: Remove the spread method enum in SVGGradientElement
-    enum SVGGradientSpreadMethod {
-        SPREADMETHOD_PAD = 1,
-        SPREADMETHOD_REFLECT = 2,
-        SPREADMETHOD_REPEAT = 3
-    };
-
 #if PLATFORM(CG)
     typedef std::pair<CGFloat, Color> SVGGradientStop;
@@ -60 +54 @@
     typedef std::pair<float, Color> SVGGradientStop;
 #endif
-
 
     class SVGPaintServerGradient : public SVGPaintServer {
@@ -69 +62 @@
         void setGradientStops(const Vector<SVGGradientStop>&);
 
-        SVGGradientSpreadMethod spreadMethod() const;
-        void setGradientSpreadMethod(const SVGGradientSpreadMethod&);
+        GradientSpreadMethod spreadMethod() const;
+        void setGradientSpreadMethod(const GradientSpreadMethod&);
 
         // Gradient start and end points are percentages when used in boundingBox mode.
@@ -107 +100 @@
     private:
         Vector<SVGGradientStop> m_stops;
-        SVGGradientSpreadMethod m_spreadMethod;
+        GradientSpreadMethod m_spreadMethod;
         bool m_boundingBoxMode;
         AffineTransform m_gradientTransform;

trunk/WebCore/svg/graphics/cairo/SVGPaintServerGradientCairo.cpp

@@ -115 +115 @@
 
     switch (spreadMethod()) {
-        case SPREADMETHOD_PAD:
+        case SpreadMethodPad:
             cairo_pattern_set_extend(pattern, CAIRO_EXTEND_PAD);
             break;
-        case SPREADMETHOD_REFLECT:
+        case SpreadMethodReflect:
             cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REFLECT);
             break;
-        case SPREADMETHOD_REPEAT:
+        case SpreadMethodRepeat:
             cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
             break;

trunk/WebCore/svg/graphics/qt/SVGPaintServerGradientQt.cpp

@@ -71 +71 @@
     painter->setBrush(Qt::NoBrush);
 
-    if (spreadMethod() == SPREADMETHOD_REPEAT)
+    if (spreadMethod() == SpreadMethodRepeat)
         gradient.setSpread(QGradient::RepeatSpread);
-    else if (spreadMethod() == SPREADMETHOD_REFLECT)
+    else if (spreadMethod() == SpreadMethodReflect)
         gradient.setSpread(QGradient::ReflectSpread);
     else