Fixed inheritence of SVG fill attributes.

Fixed inheritence of fill-opacity, fill-rule and fill. Autotest
included.

Reviewed-by: Kim

3 files changed, 64 insertions, 35 deletions

diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 5950fac2b5..f64fb3e89d 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -631,15 +631,32 @@ static void parseBrush(QSvgNode *node,
     QString opacity = attributes.value(QLatin1String("fill-opacity")).toString();
     QString myId = someId(attributes);
 
-    value = value.trimmed();
-    fillRule = fillRule.trimmed();
-    if (!value.isEmpty() || !fillRule.isEmpty()) {
-        Qt::FillRule f = Qt::WindingFill;
+    QSvgFillStyle *inherited =
+                static_cast<QSvgFillStyle*>(node->parent()->styleProperty(
+                                                QSvgStyleProperty::FILL));
+    QSvgFillStyle *prop = new QSvgFillStyle(QColor(Qt::black));
+
+    //fill-rule attribute handling
+    Qt::FillRule f = Qt::WindingFill;
+    if (!fillRule.isEmpty() && fillRule != QLatin1String("inherit")) {
         if (fillRule == QLatin1String("evenodd"))
             f = Qt::OddEvenFill;
+    } else if (inherited) {
+        f = inherited->fillRule();
+    }
+
+    //fill-opacity atttribute handling
+    qreal fillOpacity = 1.0;
+    if (!opacity.isEmpty() && opacity != QLatin1String("inherit")) {
+        fillOpacity = qMin(qreal(1.0), qMax(qreal(0.0), toDouble(opacity)));
+    } else if (inherited) {
+        fillOpacity = inherited->fillOpacity();
+    }
+
+    //fill attribute handling
+    if ((!value.isEmpty()) && (value != QLatin1String("inherit")) ) {
         if (value.startsWith(QLatin1String("url"))) {
             value = value.remove(0, 3);
-            QSvgFillStyle *prop = new QSvgFillStyle(0);
             QSvgStyleProperty *style = styleFromUrl(node, value);
             if (style) {
                 prop->setFillStyle(style);
@@ -648,30 +665,26 @@ static void parseBrush(QSvgNode *node,
                 prop->setGradientId(id);
                 prop->setGradientResolved(false);
             }
-            if (!opacity.isEmpty()) {
-                qreal clampedOpacity = qMin(qreal(1.0), qMax(qreal(0.0), toDouble(opacity)));
-                prop->setFillOpacity(clampedOpacity);
-            }
-            if (!fillRule.isEmpty())
-                prop->setFillRule(f);
-            node->appendStyleProperty(prop,myId);
         } else if (value != QLatin1String("none")) {
             QColor color;
-            if (constructColor(value, opacity, color, handler)) {
-                QSvgFillStyle *prop = new QSvgFillStyle(QBrush(color));
-                if (!fillRule.isEmpty())
-                    prop->setFillRule(f);
-                node->appendStyleProperty(prop, myId);
-            }
+            if (resolveColor(value, color, handler))
+                prop->setBrush(QBrush(color));
         } else {
-            QSvgFillStyle *prop = new QSvgFillStyle(QBrush(Qt::NoBrush));
-            if (!fillRule.isEmpty())
-                prop->setFillRule(f);
-            node->appendStyleProperty(prop, myId);
+            prop->setBrush(QBrush(Qt::NoBrush));
+        }
+    } else if (inherited) {
+        if (inherited->style()) {
+            prop->setFillStyle(inherited->style());
+        } else {
+            prop->setBrush(inherited->qbrush());
         }
     }
+    prop->setFillOpacity(fillOpacity);
+    prop->setFillRule(f);
+    node->appendStyleProperty(prop,myId);
 }
 
+
 static void parseQPen(QPen &pen, QSvgNode *node,
                       const QSvgAttributes &attributes,
                       QSvgHandler *handler)
diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp
index 556201b789..4c8247b5d5 100644
--- a/src/svg/qsvgstyle.cpp
+++ b/src/svg/qsvgstyle.cpp
@@ -81,12 +81,12 @@ void QSvgQualityStyle::revert(QPainter *, QSvgExtraStates &)
 }
 
 QSvgFillStyle::QSvgFillStyle(const QBrush &brush)
-    : m_fill(brush), m_style(0), m_fillRuleSet(false), m_fillOpacitySet(false), m_gradientResolved (true)
+    : m_fill(brush), m_style(0), m_fillRuleSet(false), m_fillOpacitySet(false), m_fillRule(Qt::WindingFill), m_fillOpacity(1.0), m_gradientResolved (true)
 {
 }
 
 QSvgFillStyle::QSvgFillStyle(QSvgStyleProperty *style)
-    : m_style(style), m_fillRuleSet(false), m_fillOpacitySet(false), m_gradientResolved (true)
+    : m_style(style), m_fillRuleSet(false), m_fillOpacitySet(false), m_fillRule(Qt::WindingFill), m_fillOpacity(1.0), m_gradientResolved (true)
 {
 }
 
@@ -102,6 +102,16 @@ void QSvgFillStyle::setFillOpacity(qreal opacity)
     m_fillOpacity = opacity;
 }
 
+void QSvgFillStyle::setFillStyle(QSvgStyleProperty* style)
+{
+    m_style = style;
+}
+
+void QSvgFillStyle::setBrush(QBrush brush)
+{
+    m_fill = brush;
+}
+
 static void recursivelySetFill(QSvgNode *node, Qt::FillRule f)
 {
     if (node->type() == QSvgNode::PATH) {
diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h
index f1d0811e10..ac5e109159 100644
--- a/src/svg/qsvgstyle_p.h
+++ b/src/svg/qsvgstyle_p.h
@@ -224,12 +224,29 @@ public:
 
     void setFillRule(Qt::FillRule f);
     void setFillOpacity(qreal opacity);
+    void setFillStyle(QSvgStyleProperty* style);
+    void setBrush(QBrush brush);
 
     const QBrush & qbrush() const
     {
         return m_fill;
     }
 
+    qreal fillOpacity() const
+    {
+        return m_fillOpacity;
+    }
+
+    Qt::FillRule fillRule() const
+    {
+        return m_fillRule;
+    }
+
+    QSvgStyleProperty* style() const
+    {
+        return m_style;
+    }
+	
     void setGradientId(const QString &Id)
     {
         m_gradientId = Id;
@@ -240,7 +257,6 @@ public:
         return m_gradientId;
     }
 
-
     void setGradientResolved(bool resolved)
     {
         m_gradientResolved = resolved;
@@ -251,16 +267,6 @@ public:
         return m_gradientResolved;
     }
 
-    void setFillStyle(QSvgStyleProperty* style)
-    {
-        m_style = style;
-    }
-
-    void setBrush(QBrush brush)
-    {
-        m_fill = brush;
-    }
-
 private:
     // fill            v 	v 	'inherit' | <Paint.datatype>
     // fill-opacity    v 	v 	'inherit' | <OpacityValue.datatype>