1 files changed, 5 insertions, 16 deletions
diff --git a/Source/WebCore/svg/SVGLangSpace.cpp b/Source/WebCore/svg/SVGLangSpace.cpp
index abd15c663..b6518044e 100644
--- a/Source/WebCore/svg/SVGLangSpace.cpp
+++ b/Source/WebCore/svg/SVGLangSpace.cpp
@@ -19,11 +19,8 @@
  */
 
 #include "config.h"
-
-#if ENABLE(SVG)
 #include "SVGLangSpace.h"
 
-#include "Attribute.h"
 #include "SVGElement.h"
 #include "XMLNames.h"
 #include <wtf/StdLibExtras.h>
@@ -38,7 +35,7 @@ void SVGLangSpace::setXmllang(const AtomicString& xmlLang)
 const AtomicString& SVGLangSpace::xmlspace() const
 {
     if (!m_space) {
-        DEFINE_STATIC_LOCAL(const AtomicString, defaultString, ("default", AtomicString::ConstructFromLiteral));
+        static NeverDestroyed<const AtomicString> defaultString("default", AtomicString::ConstructFromLiteral);
         return defaultString;
     }
 
@@ -50,18 +47,12 @@ void SVGLangSpace::setXmlspace(const AtomicString& xmlSpace)
     m_space = xmlSpace;
 }
 
-bool SVGLangSpace::parseAttribute(const QualifiedName& name, const AtomicString& value)
+void SVGLangSpace::parseAttribute(const QualifiedName& name, const AtomicString& value)
 {
-    if (name.matches(XMLNames::langAttr)) {
+    if (name.matches(XMLNames::langAttr))
         setXmllang(value);
-        return true;
-    }
-    if (name.matches(XMLNames::spaceAttr)) {
+    if (name.matches(XMLNames::spaceAttr))
         setXmlspace(value);
-        return true;
-    }
-
-    return false;
 }
 
 bool SVGLangSpace::isKnownAttribute(const QualifiedName& attrName)
@@ -71,7 +62,7 @@ bool SVGLangSpace::isKnownAttribute(const QualifiedName& attrName)
     
 void SVGLangSpace::addSupportedAttributes(HashSet<QualifiedName>& supportedAttributes)
 {
-    DEFINE_STATIC_LOCAL(AtomicString, xmlPrefix, ("xml", AtomicString::ConstructFromLiteral));
+    static NeverDestroyed<AtomicString> xmlPrefix("xml", AtomicString::ConstructFromLiteral);
 
     QualifiedName langWithPrefix = XMLNames::langAttr;
     langWithPrefix.setPrefix(xmlPrefix);
@@ -85,5 +76,3 @@ void SVGLangSpace::addSupportedAttributes(HashSet<QualifiedName>& supportedAttri
 }
 
 }
-
-#endif // ENABLE(SVG)