Resolution for issue Fill or stroke attributes on a use element

svgnative/src/SVGDocumentImpl.cpp

@@ -321,7 +321,6 @@ void SVGDocumentImpl::ParseChild(XMLNode* child)
         auto hrefAttr = child->GetAttribute(kHrefAttr, kXlinkNS);
         if (!hrefAttr.found || !hrefAttr.value || hrefAttr.value[0] != '#')
             return;
-
         const float x = ParseLengthFromAttr(child, kXAttr, LengthType::kHorizontal);
         const float y = ParseLengthFromAttr(child, kYAttr, LengthType::kVertical);
         if (!isCloseToZero(x) || !isCloseToZero(y))
@@ -330,7 +329,6 @@ void SVGDocumentImpl::ParseChild(XMLNode* child)
                 graphicStyle.transform = mRenderer->CreateTransform();
             graphicStyle.transform->Concat(1, 0, 0, 1, x, y);
         }
-
         std::string href{(hrefAttr.value + 1)};
         AddChildToCurrentGroup(std::make_shared<Reference>(graphicStyle, classNames, fillStyle, strokeStyle, std::move(href)), std::move(idString));
     }
@@ -606,7 +604,6 @@ void SVGDocumentImpl::ParseFillProperties(FillStyleImpl& fillStyle, const Proper
         else if (result == SVGDocumentImpl::Result::kSuccess)
             fillStyle.hasFill = true;
     }
-
     prop = propertySet.find(kFillOpacityProp);
     if (prop != iterEnd)
     {
@@ -820,7 +817,6 @@ float SVGDocumentImpl::ParseColorStop(const XMLNode* node, std::vector<ColorStop
         // Value is "currentColor". Simply set value to CSS color property.
         paint = fillStyle.color;
     }
-
     graphicStyle.stopOpacity = std::max<float>(0.0, std::min<float>(1.0, graphicStyle.stopOpacity));
 
     colorStops.push_back(std::make_tuple(offset, paint, graphicStyle.stopOpacity));
@@ -1063,13 +1059,18 @@ void SVGDocumentImpl::TraverseTree(const ColorMap& colorMap, const Element& elem
         if (it != mVisitedElements.end())
             break; // We found a cycle. Do not continue rendering.
         auto insertResult = mVisitedElements.insert(&reference);
-
         // Render referenced content.
         auto refIt = mIdToElementMap.find(reference.href);
         if (refIt != mIdToElementMap.end())
         {
             ApplyCSSStyle(reference.classNames, graphicStyle, fillStyle, strokeStyle);
             auto saveRestore = SaveRestoreHelper{mRenderer, reference.graphicStyle};
+            if ((*(refIt->second)).Type() == ElementType::kGraphic)
+            {
+                Graphic& graphic = static_cast<Graphic&>(*(refIt->second));
+                // it will call assignment operator and pass fillStyle from reference to graphic
+                graphic = reference;
+            }
             TraverseTree(colorMap, *(refIt->second));
         }
 
@@ -1115,7 +1116,7 @@ void SVGDocumentImpl::TraverseTree(const ColorMap& colorMap, const Element& elem
     }
 }
 
-#ifndef STYLE_SUPPORT
+#ifndef STYLE_SUPPORTn
 // Deprecated style support
 void SVGDocumentImpl::ApplyCSSStyle(
     const std::set<std::string>&, GraphicStyleImpl&, FillStyleImpl&, StrokeStyleImpl&) {}

svgnative/src/SVGDocumentImpl.h

@@ -133,40 +133,46 @@ class SVGDocumentImpl
         ElementType Type() const override { return ElementType::kGroup; }
     };
 
-    struct Graphic : public Element
+    struct Reference : public Element
     {
-        Graphic(GraphicStyleImpl& aGraphicStyle, std::set<std::string>& aClasses, FillStyleImpl& aFillStyle, StrokeStyleImpl& aStrokeStyle,
-            std::shared_ptr<Path> aPath)
+        Reference(GraphicStyleImpl& aGraphicStyle, std::set<std::string>& aClasses, FillStyleImpl& aFillStyle, StrokeStyleImpl& aStrokeStyle,
+            std::string aHref)
             : Element(aGraphicStyle, aClasses)
             , fillStyle{aFillStyle}
             , strokeStyle{aStrokeStyle}
-            , path{std::move(aPath)}
+            , href{std::move(aHref)}
         {
         }
 
         FillStyleImpl fillStyle;
         StrokeStyleImpl strokeStyle;
-        std::shared_ptr<Path> path;
+        std::string href;
 
-        ElementType Type() const override { return ElementType::kGraphic; }
+        ElementType Type() const override { return ElementType::kReference; }
     };
-
-    struct Reference : public Element
+    
+    struct Graphic : public Element
     {
-        Reference(GraphicStyleImpl& aGraphicStyle, std::set<std::string>& aClasses, FillStyleImpl& aFillStyle, StrokeStyleImpl& aStrokeStyle,
-            std::string aHref)
+        Graphic(GraphicStyleImpl& aGraphicStyle, std::set<std::string>& aClasses, FillStyleImpl& aFillStyle, StrokeStyleImpl& aStrokeStyle,
+            std::shared_ptr<Path> aPath)
             : Element(aGraphicStyle, aClasses)
             , fillStyle{aFillStyle}
             , strokeStyle{aStrokeStyle}
-            , href{std::move(aHref)}
+            , path{std::move(aPath)}
         {
         }
 
         FillStyleImpl fillStyle;
         StrokeStyleImpl strokeStyle;
-        std::string href;
+        std::shared_ptr<Path> path;
 
-        ElementType Type() const override { return ElementType::kReference; }
+        ElementType Type() const override { return ElementType::kGraphic; }
+        Graphic& operator= (const Reference& refObj)
+        {
+            this->fillStyle = refObj.fillStyle; //internal Paint is transferred
+            this->strokeStyle = refObj.strokeStyle;
+            return *this;
+        }
     };
 
     SVGDocumentImpl(std::shared_ptr<SVGRenderer> renderer);

svgnative/src/SVGStringParser.cpp

@@ -1132,6 +1132,7 @@ SVGDocumentImpl::Result ParsePaint(const std::string& colorString, const std::ma
     {
         if (urlResult == SVGDocumentImpl::Result::kInvalid && result != SVGDocumentImpl::Result::kInvalid)
             paint = altPaint;
+
         return result;
     }