Changeset 152337 in webkit

Timestamp:

Jul 2, 2013 10:07:45 PM (11 years ago)

Author:

rniwa@webkit.org

Message:

Modernize QualifiedName by wrapping gNameCache in a function and using more early exits
​https://bugs.webkit.org/show_bug.cgi?id=118299

Reviewed by Andreas Kling.

Did cleanups.

• dom/QualifiedName.cpp:

(WebCore::qualifiedNameCache): Added to wrap gNameCache.
(WebCore::QualifiedName::QualifiedName):
(WebCore::QualifiedName::QualifiedNameImpl::~QualifiedNameImpl):
(WebCore::QualifiedName::toString): Use early exit and StringBuilder.
(WebCore::QualifiedName::init): Use early exit.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/QualifiedName.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-02  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Modernize QualifiedName by wrapping gNameCache in a function and using more early exits
+        https://bugs.webkit.org/show_bug.cgi?id=118299
+
+        Reviewed by Andreas Kling.
+
+        Did cleanups.
+
+        * dom/QualifiedName.cpp:
+        (WebCore::qualifiedNameCache): Added to wrap gNameCache.
+        (WebCore::QualifiedName::QualifiedName):
+        (WebCore::QualifiedName::QualifiedNameImpl::~QualifiedNameImpl):
+        (WebCore::QualifiedName::toString): Use early exit and StringBuilder.
+        (WebCore::QualifiedName::init): Use early exit.
+
 2013-07-02  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/dom/QualifiedName.cpp

@@ -34 +34 @@
 #include <wtf/HashSet.h>
 #include <wtf/StaticConstructors.h>
+#include <wtf/text/StringBuilder.h>
 
 #if ENABLE(MATHML)
@@ -77 +78 @@
 };
 
-static QNameSet* gNameCache;
+static inline QNameSet& qualifiedNameCache()
+{
+    DEFINE_STATIC_LOCAL(QNameSet, nameCache, ());
+    return nameCache;
+}
 
 QualifiedName::QualifiedName(const AtomicString& p, const AtomicString& l, const AtomicString& n)
 {
-    if (!gNameCache)
-        gNameCache = new QNameSet;
     QualifiedNameComponents components = { p.impl(), l.impl(), n.isEmpty() ? nullAtom.impl() : n.impl() };
-    QNameSet::AddResult addResult = gNameCache->add<QNameComponentsTranslator>(components);
+    QNameSet::AddResult addResult = qualifiedNameCache().add<QNameComponentsTranslator>(components);
     m_impl = *addResult.iterator;
     if (!addResult.isNewEntry)
@@ -107 +110 @@
 QualifiedName::QualifiedNameImpl::~QualifiedNameImpl()
 {
-    gNameCache->remove(this);
+    qualifiedNameCache().remove(this);
 }
 
 String QualifiedName::toString() const
 {
-    String local = localName();
-    if (hasPrefix()) {
-        String result = prefix().string();
-        result.append(":");
-        result.append(local);
-        return result;
-    }
-    return local;
+    if (!hasPrefix())
+        return localName();
+
+    StringBuilder result;
+    result.append(prefix());
+    result.append(':');
+    result.append(localName());
+    return result.toString();
 }
 
@@ -127 +130 @@
 void QualifiedName::init()
 {
-    static bool initialized;
-    if (!initialized) {
-        // Use placement new to initialize the globals.
-        
-        AtomicString::init();
-        new (NotNull, (void*)&anyName) QualifiedName(nullAtom, starAtom, starAtom);
-        initialized = true;
-    }
+    static bool initialized = false;
+    if (initialized)
+        return;
+
+    // Use placement new to initialize the globals.
+    AtomicString::init();
+    new (NotNull, (void*)&anyName) QualifiedName(nullAtom, starAtom, starAtom);
+    initialized = true;
 }