Changeset 157338 in webkit

Timestamp:

Oct 12, 2013 7:51:01 AM (11 years ago)

Author:

Antti Koivisto

Message:

Replace RenderText::renderedTextLength with hasRenderedText
​https://bugs.webkit.org/show_bug.cgi?id=122693

Reviewed by Andreas Kling.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/ReplaceSelectionCommand.cpp (modified) (1 diff)
• editing/VisibleUnits.cpp (modified) (2 diffs)
• rendering/RenderText.cpp (modified) (1 diff)
• rendering/RenderText.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-12  Antti Koivisto  <antti@apple.com>
+
+        Replace RenderText::renderedTextLength with hasRenderedText
+        https://bugs.webkit.org/show_bug.cgi?id=122693
+
+        Reviewed by Andreas Kling.
+
 2013-10-12  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -667 +667 @@
 static inline bool nodeHasVisibleRenderText(Text* text)
 {
-    return text->renderer() && toRenderText(text->renderer())->renderedTextLength() > 0;
+    return text->renderer() && toRenderText(text->renderer())->hasRenderedText();
 }
 

trunk/Source/WebCore/editing/VisibleUnits.cpp

@@ -1130 +1130 @@
             break;
 
-        if (r->isText() && toRenderText(r)->renderedTextLength()) {
+        if (r->isText() && toRenderText(r)->hasRenderedText()) {
             ASSERT_WITH_SECURITY_IMPLICATION(n->isTextNode());
             type = Position::PositionIsOffsetInAnchor;
@@ -1212 +1212 @@
 
         // FIXME: We avoid returning a position where the renderer can't accept the caret.
-        if (r->isText() && toRenderText(r)->renderedTextLength()) {
+        if (r->isText() && toRenderText(r)->hasRenderedText()) {
             ASSERT_WITH_SECURITY_IMPLICATION(n->isTextNode());
             int length = toRenderText(r)->textLength();

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -1660 +1660 @@
 }
 
-unsigned RenderText::renderedTextLength() const
-{
-    int l = 0;
-    for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox())
-        l += box->len();
-    return l;
+bool RenderText::hasRenderedText() const
+{
+    for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
+        if (box->len())
+            return true;
+    }
+    return false;
 }
 

trunk/Source/WebCore/rendering/RenderText.h

@@ -122 +122 @@
     virtual int caretMinOffset() const OVERRIDE;
     virtual int caretMaxOffset() const OVERRIDE;
-    unsigned renderedTextLength() const;
+    bool hasRenderedText() const;
 
     virtual int previousOffset(int current) const OVERRIDE FINAL;