Changeset 144544 in webkit

Timestamp:

Mar 2, 2013 1:06:57 PM (11 years ago)

Author:

eric@webkit.org

Message:

Remove two unnecessary mallocs from the main-thread-parser code path
​https://bugs.webkit.org/show_bug.cgi?id=111249

Reviewed by Adam Barth.

I noticed these while fixing up our Vector -> String conversions
but never went back to fix the FIXME.

AtomicString(Vector<UChar, capacity>) is smart enough to avoid mallocing
if the represented string is already in the AtomicString table. It
also handles 8bit vs. 16bit and empty() just like nameString() does.

I also removed a 3rd caller to nameString() in the XSSAuditor which
was causing an unnecessary malloc in both the main and background
thread parser paths.

• html/parser/AtomicHTMLToken.h:

(WebCore::AtomicHTMLToken::AtomicHTMLToken):

• html/parser/HTMLToken.h:
• html/parser/XSSAuditor.cpp:

(WebCore):
(WebCore::threadSafeMatch):
(WebCore::hasName):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/parser/AtomicHTMLToken.h (modified) (2 diffs)
• html/parser/HTMLToken.h (modified) (1 diff)
• html/parser/XSSAuditor.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-02  Eric Seidel  <eric@webkit.org>
+
+        Remove two unnecessary mallocs from the main-thread-parser code path
+        https://bugs.webkit.org/show_bug.cgi?id=111249
+
+        Reviewed by Adam Barth.
+
+        I noticed these while fixing up our Vector -> String conversions
+        but never went back to fix the FIXME.
+
+        AtomicString(Vector<UChar, capacity>) is smart enough to avoid mallocing
+        if the represented string is already in the AtomicString table.  It
+        also handles 8bit vs. 16bit and empty() just like nameString() does.
+
+        I also removed a 3rd caller to nameString() in the XSSAuditor which
+        was causing an unnecessary malloc in both the main and background
+        thread parser paths.
+
+        * html/parser/AtomicHTMLToken.h:
+        (WebCore::AtomicHTMLToken::AtomicHTMLToken):
+        * html/parser/HTMLToken.h:
+        * html/parser/XSSAuditor.cpp:
+        (WebCore):
+        (WebCore::threadSafeMatch):
+        (WebCore::hasName):
+
 2013-03-02  Eric Seidel  <eric@webkit.org>
 

trunk/Source/WebCore/html/parser/AtomicHTMLToken.h

@@ -154 +154 @@
             break;
         case HTMLToken::DOCTYPE:
-            m_name = AtomicString(token.nameString()); // FIXME: Should be AtomicString(token.name()) to avoid mallocing every time.
+            m_name = AtomicString(token.name());
             m_doctypeData = token.releaseDoctypeData();
             break;
@@ -162 +162 @@
         case HTMLToken::EndTag: {
             m_selfClosing = token.selfClosing();
-            m_name = AtomicString(token.nameString()); // FIXME: Should be AtomicString(token.name()) to avoid mallocing every time.
+            m_name = AtomicString(token.name());
             initializeAttributes(token.attributes());
             break;

trunk/Source/WebCore/html/parser/HTMLToken.h

@@ -152 +152 @@
     }
 
-    // FIXME: Rename this to copyNameAsString().
-    String nameString() const
-    {
-        if (!m_data.size())
-            return emptyString();
-        if (isAll8BitData())
-            return String::make8BitFrom16BitSource(m_data.data(), m_data.size());
-        return String(m_data);
-    }
-
     /* DOCTYPE Tokens */
 

trunk/Source/WebCore/html/parser/XSSAuditor.cpp

@@ -114 +114 @@
 }
 
+// If other files need this, we should move this to HTMLParserIdioms.h
+template<size_t inlineCapacity>
+bool threadSafeMatch(const Vector<UChar, inlineCapacity>& vector, const QualifiedName& qname)
+{
+    return equalIgnoringNullity(vector, qname.localName().impl());
+}
+
 static bool hasName(const HTMLToken& token, const QualifiedName& name)
 {
-    return threadSafeMatch(token.nameString(), name);
+    return threadSafeMatch(token.name(), name);
 }