Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / svg / SVGUseElement.cpp

diff --git a/src/third_party/WebKit/Source/core/svg/SVGUseElement.cpp b/src/third_party/WebKit/Source/core/svg/SVGUseElement.cpp
index f8d5294..21dcce6 100644 (file)
--- a/src/third_party/WebKit/Source/core/svg/SVGUseElement.cpp
+++ b/src/third_party/WebKit/Source/core/svg/SVGUseElement.cpp
@@ -56,7 +56,6 @@ inline SVGUseElement::SVGUseElement(Document& document)
     , m_svgLoadEventTimer(this, &SVGElement::svgLoadEventTimerFired)
 {
     ASSERT(hasCustomStyleCallbacks());
-    ScriptWrappable::init(this);
 
     addToPropertyMap(m_x);
     addToPropertyMap(m_y);
@@ -149,14 +148,15 @@ Document* SVGUseElement::externalDocument() const
 
 void transferUseWidthAndHeightIfNeeded(const SVGUseElement& use, SVGElement* shadowElement, const SVGElement& originalElement)
 {
+    DEFINE_STATIC_LOCAL(const AtomicString, hundredPercentString, ("100%", AtomicString::ConstructFromLiteral));
     ASSERT(shadowElement);
     if (isSVGSymbolElement(*shadowElement)) {
         // Spec (<use> on <symbol>): This generated 'svg' will always have explicit values for attributes width and height.
         // If attributes width and/or height are provided on the 'use' element, then these attributes
         // will be transferred to the generated 'svg'. If attributes width and/or height are not specified,
         // the generated 'svg' element will use values of 100% for these attributes.
-        shadowElement->setAttribute(SVGNames::widthAttr, use.width()->isSpecified() ? AtomicString(use.width()->currentValue()->valueAsString()) : "100%");
-        shadowElement->setAttribute(SVGNames::heightAttr, use.height()->isSpecified() ? AtomicString(use.height()->currentValue()->valueAsString()) : "100%");
+        shadowElement->setAttribute(SVGNames::widthAttr, use.width()->isSpecified() ? AtomicString(use.width()->currentValue()->valueAsString()) : hundredPercentString);
+        shadowElement->setAttribute(SVGNames::heightAttr, use.height()->isSpecified() ? AtomicString(use.height()->currentValue()->valueAsString()) : hundredPercentString);
     } else if (isSVGSVGElement(*shadowElement)) {
         // Spec (<use> on <svg>): If attributes width and/or height are provided on the 'use' element, then these
         // values will override the corresponding attributes on the 'svg' in the generated tree.
@@ -200,7 +200,7 @@ void SVGUseElement::svgAttributeChanged(const QualifiedName& attrName)
         if (isExternalReference) {
             KURL url = document().completeURL(hrefString());
             if (url.hasFragmentIdentifier()) {
-                FetchRequest request(ResourceRequest(url.string()), localName());
+                FetchRequest request(ResourceRequest(url), localName());
                 setDocumentResource(document().fetcher()->fetchSVGDocument(request));
             }
         } else {