Changeset 86553 in webkit

Timestamp:

May 16, 2011 3:20:34 AM (13 years ago)

Author:

Nikolas Zimmermann

Message:

2011-05-16 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by Darin Adler.

Switch from Vector<UChar> to StringBuilder in dom/
​https://bugs.webkit.org/show_bug.cgi?id=57843

• dom/DatasetDOMStringMap.cpp: (WebCore::convertAttributeNameToPropertyName): (WebCore::convertPropertyNameToAttributeName):
• dom/Range.cpp: (WebCore::Range::toString):
• dom/ScriptElement.cpp: (WebCore::ScriptElement::scriptContent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/DatasetDOMStringMap.cpp (modified) (4 diffs)
• dom/Range.cpp (modified) (3 diffs)
• dom/ScriptElement.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-16  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Reviewed by Darin Adler.
+
+        Switch from Vector<UChar> to StringBuilder in dom/
+        https://bugs.webkit.org/show_bug.cgi?id=57843
+
+        * dom/DatasetDOMStringMap.cpp:
+        (WebCore::convertAttributeNameToPropertyName):
+        (WebCore::convertPropertyNameToAttributeName):
+        * dom/Range.cpp:
+        (WebCore::Range::toString):
+        * dom/ScriptElement.cpp:
+        (WebCore::ScriptElement::scriptContent):
+
 2011-05-05  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/Source/WebCore/dom/DatasetDOMStringMap.cpp

@@ -32 +32 @@
 #include "NamedNodeMap.h"
 #include <wtf/ASCIICType.h>
+#include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
@@ -52 +53 @@
 static String convertAttributeNameToPropertyName(const String& name)
 {
-    Vector<UChar> newStringBuffer;
+    StringBuilder stringBuilder;
 
     const UChar* characters = name.characters();
@@ -58 +59 @@
     for (unsigned i = 5; i < length; ++i) {
         if (characters[i] != '-')
-            newStringBuffer.append(characters[i]);
+            stringBuilder.append(characters[i]);
         else {
             if ((i + 1 < length) && isASCIILower(characters[i + 1])) {
-                newStringBuffer.append(toASCIIUpper(characters[i + 1]));
+                stringBuilder.append(toASCIIUpper(characters[i + 1]));
                 ++i;
             } else
-                newStringBuffer.append(characters[i]);
-        }
-    }
-
-    return String::adopt(newStringBuffer);
+                stringBuilder.append(characters[i]);
+        }
+    }
+
+    return stringBuilder.toString();
 }
 
@@ -112 +113 @@
 static String convertPropertyNameToAttributeName(const String& name)
 {
-    Vector<UChar> newStringBuffer;
-
-    newStringBuffer.append('d');
-    newStringBuffer.append('a');
-    newStringBuffer.append('t');
-    newStringBuffer.append('a');
-    newStringBuffer.append('-');
+    StringBuilder builder;
+    builder.append("data-");
 
     const UChar* characters = name.characters();
     unsigned length = name.length();
     for (unsigned i = 0; i < length; ++i) {
-        if (isASCIIUpper(characters[i])) {
-            newStringBuffer.append('-');
-            newStringBuffer.append(toASCIILower(characters[i]));
+        UChar character = characters[i];
+        if (isASCIIUpper(character)) {
+            builder.append('-');
+            builder.append(toASCIILower(characters[i]));
         } else
-            newStringBuffer.append(characters[i]);
-    }
-
-    return String::adopt(newStringBuffer);
-}
-
+            builder.append(character);
+    }
+
+    return builder.toString();
+}
 
 void DatasetDOMStringMap::ref()

trunk/Source/WebCore/dom/Range.cpp

@@ -49 +49 @@
 #include <wtf/Vector.h>
 #include <wtf/text/CString.h>
+#include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
@@ -1046 +1047 @@
     }
 
-    Vector<UChar> result;
+    StringBuilder builder;
 
     Node* pastLast = pastLastNode();
@@ -1055 +1056 @@
             int start = (n == m_start.container()) ? min(max(0, m_start.offset()), length) : 0;
             int end = (n == m_end.container()) ? min(max(start, m_end.offset()), length) : length;
-            result.append(data.characters() + start, end - start);
-        }
-    }
-
-    return String::adopt(result);
+            builder.append(data.characters() + start, end - start);
+        }
+    }
+
+    return builder.toString();
 }
 

trunk/Source/WebCore/dom/ScriptElement.cpp

@@ -43 +43 @@
 #include "Text.h"
 #include <wtf/StdLibExtras.h>
+#include <wtf/text/StringBuilder.h>
 #include <wtf/text/StringHash.h>
 
@@ -336 +337 @@
 String ScriptElement::scriptContent() const
 {
-    Vector<UChar> val;
+    StringBuilder content;
     Text* firstTextNode = 0;
     bool foundMultipleTextNodes = false;
@@ -346 +347 @@
         Text* t = static_cast<Text*>(n);
         if (foundMultipleTextNodes)
-            append(val, t->data());
+            content.append(t->data());
         else if (firstTextNode) {
-            append(val, firstTextNode->data());
-            append(val, t->data());
+            content.append(firstTextNode->data());
+            content.append(t->data());
             foundMultipleTextNodes = true;
         } else
@@ -358 +359 @@
         return firstTextNode->data();
 
-    return String::adopt(val);
+    return content.toString();
 }