Changeset 128363 in webkit

Timestamp:

Sep 12, 2012 2:40:26 PM (12 years ago)

Author:

msaboff@apple.com

Message:

Element::classAttributeChanged should use characters8/16 to find first non-whitespace
​https://bugs.webkit.org/show_bug.cgi?id=96446

Reviewed by Benjamin Poulain.

Source/WebCore:

Made two new static templated methods to handle 8 or 16 bit class names.

No functional change, so no new tests.

• dom/Element.cpp:

(WebCore::classStringHasClassName):
(WebCore::Element::classAttributeChanged):

Source/WTF:

Added bit size related string accessors to AtomicString to support change.

• wtf/text/AtomicString.h:

(AtomicString):
(WTF::AtomicString::is8Bit):
(WTF::AtomicString::characters8):
(WTF::AtomicString::characters16):

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/text/AtomicString.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Element.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2012-09-11  Michael Saboff  <msaboff@apple.com>
+
+        Element::classAttributeChanged should use characters8/16 to find first non-whitespace
+        https://bugs.webkit.org/show_bug.cgi?id=96446
+
+        Reviewed by Benjamin Poulain.
+
+        Added bit size related string accessors to AtomicString to support change.
+
+        * wtf/text/AtomicString.h:
+        (AtomicString):
+        (WTF::AtomicString::is8Bit):
+        (WTF::AtomicString::characters8):
+        (WTF::AtomicString::characters16):
+
 2012-09-12  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/WTF/wtf/text/AtomicString.h

@@ -87 +87 @@
 
     AtomicStringImpl* impl() const { return static_cast<AtomicStringImpl *>(m_string.impl()); }
-    
+
+    bool is8Bit() const { return m_string.is8Bit(); }
     const UChar* characters() const { return m_string.characters(); }
+    const LChar* characters8() const { return m_string.characters8(); }
+    const UChar* characters16() const { return m_string.characters16(); }
     unsigned length() const { return m_string.length(); }
     

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-12  Michael Saboff  <msaboff@apple.com>
+
+        Element::classAttributeChanged should use characters8/16 to find first non-whitespace
+        https://bugs.webkit.org/show_bug.cgi?id=96446
+
+        Reviewed by Benjamin Poulain.
+
+        Made two new static templated methods to handle 8 or 16 bit class names.
+
+        No functional change, so no new tests.
+
+        * dom/Element.cpp:
+        (WebCore::classStringHasClassName):
+        (WebCore::Element::classAttributeChanged):
+
 2012-09-12  Adam Barth  <abarth@chromium.org>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -756 +756 @@
 }
 
-void Element::classAttributeChanged(const AtomicString& newClassString)
-{
-    const UChar* characters = newClassString.characters();
-    unsigned length = newClassString.length();
-    unsigned i;
-    for (i = 0; i < length; ++i) {
+template <typename CharacterType>
+static inline bool classStringHasClassName(const CharacterType* characters, unsigned length)
+{
+    ASSERT(length > 0);
+
+    unsigned i = 0;
+    do {
         if (isNotHTMLSpace(characters[i]))
             break;
-    }
-    bool hasClass = i < length;
-    if (hasClass) {
+        ++i;
+    } while (i < length);
+
+    return i < length;
+}
+
+static inline bool classStringHasClassName(const AtomicString& newClassString)
+{
+    unsigned length = newClassString.length();
+
+    if (!length)
+        return false;
+
+    if (newClassString.is8Bit())
+        return classStringHasClassName(newClassString.characters8(), length);
+    return classStringHasClassName(newClassString.characters16(), length);
+}
+
+void Element::classAttributeChanged(const AtomicString& newClassString)
+{
+    if (classStringHasClassName(newClassString)) {
         const bool shouldFoldCase = document()->inQuirksMode();
         ensureAttributeData()->setClass(newClassString, shouldFoldCase);