Changeset 89913 in webkit

Timestamp:

Jun 28, 2011 2:30:58 AM (13 years ago)

Author:

tkent@chromium.org

Message:

2011-06-28 Kent Tamura <​tkent@chromium.org>

Reviewed by Hajime Morita.

Refactor RenderTextControl::text().
​https://bugs.webkit.org/show_bug.cgi?id=63519

No new tests because this is just a refactoring.

• rendering/RenderTextControl.cpp: (WebCore::RenderTextControl::setInnerTextValue): Resuce the number of text() calls. (WebCore::finishText):
  • Use StringBuilder.
  • Make this a static function. This function doesn't access anything of RenderTextControl.

(WebCore::RenderTextControl::text):

Use emptyString() and StringBuilder.

(WebCore::RenderTextControl::textWithHardLineBreaks): ditto.

• rendering/RenderTextControl.h: Remove finishText().

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderTextControl.cpp (modified) (7 diffs)
• rendering/RenderTextControl.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-28  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Hajime Morita.
+
+        Refactor RenderTextControl::text().
+        https://bugs.webkit.org/show_bug.cgi?id=63519
+
+        No new tests because this is just a refactoring.
+
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::setInnerTextValue):
+         Resuce the number of text() calls.
+        (WebCore::finishText):
+          - Use StringBuilder.
+          - Make this a static function.
+            This function doesn't access anything of RenderTextControl.
+        (WebCore::RenderTextControl::text):
+         Use emptyString() and StringBuilder.
+        (WebCore::RenderTextControl::textWithHardLineBreaks): ditto.
+        * rendering/RenderTextControl.h: Remove finishText().
+
 2011-06-28  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebCore/rendering/RenderTextControl.cpp

@@ -41 +41 @@
 #include "TextControlInnerElements.h"
 #include "TextIterator.h"
+#include <wtf/text/StringBuilder.h>
 #include <wtf/unicode/CharacterNames.h>
 
@@ -144 +145 @@
 }
 
-void RenderTextControl::setInnerTextValue(const String& innerTextValue)
-{
-    String value = innerTextValue;
-    if (value != text() || !innerTextElement()->hasChildNodes()) {
-        if (value != text() && document() && AXObjectCache::accessibilityEnabled())
+void RenderTextControl::setInnerTextValue(const String& value)
+{
+    bool textIsChanged = value != text();
+    if (textIsChanged || !innerTextElement()->hasChildNodes()) {
+        if (textIsChanged && document() && AXObjectCache::accessibilityEnabled())
             document()->axObjectCache()->postNotification(this, AXObjectCache::AXValueChanged, false);
 
@@ -334 +335 @@
 }
 
-String RenderTextControl::finishText(Vector<UChar>& result) const
+static String finishText(StringBuilder& result)
 {
     // Remove one trailing newline; there's always one that's collapsed out by rendering.
-    size_t size = result.size();
+    size_t size = result.length();
     if (size && result[size - 1] == '\n')
-        result.shrink(--size);
-
-    return String::adopt(result);
+        result.resize(--size);
+    return result.toString();
 }
 
@@ -348 +348 @@
     HTMLElement* innerText = innerTextElement();
     if (!innerText)
-        return "";
+        return emptyString();
  
-    Vector<UChar> result;
-
-    for (Node* n = innerText; n; n = n->traverseNextNode(innerText)) {
-        if (n->hasTagName(brTag))
-            result.append(&newlineCharacter, 1);
-        else if (n->isTextNode()) {
-            String data = static_cast<Text*>(n)->data();
-            result.append(data.characters(), data.length());
-        }
-    }
-
+    StringBuilder result;
+    for (Node* node = innerText; node; node = node->traverseNextNode(innerText)) {
+        if (node->hasTagName(brTag))
+            result.append(newlineCharacter);
+        else if (node->isTextNode())
+            result.append(static_cast<Text*>(node)->data());
+    }
     return finishText(result);
 }
@@ -385 +381 @@
     HTMLElement* innerText = innerTextElement();
     if (!innerText)
-        return "";
+        return emptyString();
 
     RenderBlock* renderer = toRenderBlock(innerText->renderer());
     if (!renderer)
-        return "";
+        return emptyString();
 
     Node* breakNode;
@@ -395 +391 @@
     RootInlineBox* line = renderer->firstRootBox();
     if (!line)
-        return "";
+        return emptyString();
 
     getNextSoftBreak(line, breakNode, breakOffset);
 
-    Vector<UChar> result;
-
-    for (Node* n = innerText->firstChild(); n; n = n->traverseNextNode(innerText)) {
-        if (n->hasTagName(brTag))
-            result.append(&newlineCharacter, 1);
-        else if (n->isTextNode()) {
-            Text* text = static_cast<Text*>(n);
-            String data = text->data();
+    StringBuilder result;
+    for (Node* node = innerText->firstChild(); node; node = node->traverseNextNode(innerText)) {
+        if (node->hasTagName(brTag))
+            result.append(newlineCharacter);
+        else if (node->isTextNode()) {
+            String data = static_cast<Text*>(node)->data();
             unsigned length = data.length();
             unsigned position = 0;
-            while (breakNode == n && breakOffset <= length) {
+            while (breakNode == node && breakOffset <= length) {
                 if (breakOffset > position) {
                     result.append(data.characters() + position, breakOffset - position);
                     position = breakOffset;
-                    result.append(&newlineCharacter, 1);
+                    result.append(newlineCharacter);
                 }
                 getNextSoftBreak(line, breakNode, breakOffset);
@@ -419 +413 @@
             result.append(data.characters() + position, length - position);
         }
-        while (breakNode == n)
+        while (breakNode == node)
             getNextSoftBreak(line, breakNode, breakOffset);
     }
-
     return finishText(result);
 }

trunk/Source/WebCore/rendering/RenderTextControl.h

@@ -99 +99 @@
     virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
 
-    String finishText(Vector<UChar>&) const;
-
     bool hasVisibleTextArea() const;
     friend void setSelectionRange(Node*, int start, int end);