Remove methods of TextIterator that take Range objects

Source/core/editing/iterators/TextIterator.cpp

Index: Source/core/editing/iterators/TextIterator.cpp
diff --git a/Source/core/editing/iterators/TextIterator.cpp b/Source/core/editing/iterators/TextIterator.cpp
index c52c9bf67b205d2d4ce9e7d28b329920e89397f9..98b805a0edf9cdabca6d04cc7095e4e3428ba884 100644
--- a/Source/core/editing/iterators/TextIterator.cpp
+++ b/Source/core/editing/iterators/TextIterator.cpp
@@ -77,38 +77,6 @@ static Node* nextInPreOrderCrossingShadowBoundaries(Node* rangeEndContainer, int
 
 // --------
 
-TextIterator::TextIterator(const Range* range, TextIteratorBehaviorFlags behavior)
-    : m_startContainer(nullptr)
-    , m_startOffset(0)
-    , m_endContainer(nullptr)
-    , m_endOffset(0)
-    , m_positionNode(nullptr)
-    , m_textLength(0)
-    , m_needsAnotherNewline(false)
-    , m_textBox(0)
-    , m_remainingTextBox(0)
-    , m_firstLetterText(nullptr)
-    , m_lastTextNode(nullptr)
-    , m_lastTextNodeEndedWithCollapsedSpace(false)
-    , m_lastCharacter(0)
-    , m_sortedTextBoxesPosition(0)
-    , m_hasEmitted(false)
-    , m_emitsCharactersBetweenAllVisiblePositions(behavior & TextIteratorEmitsCharactersBetweenAllVisiblePositions)
-    , m_entersTextControls(behavior & TextIteratorEntersTextControls)
-    , m_emitsOriginalText(behavior & TextIteratorEmitsOriginalText)
-    , m_handledFirstLetter(false)
-    , m_ignoresStyleVisibility(behavior & TextIteratorIgnoresStyleVisibility)
-    , m_stopsOnFormControls(behavior & TextIteratorStopsOnFormControls)
-    , m_shouldStop(false)
-    , m_emitsImageAltText(behavior & TextIteratorEmitsImageAltText)
-    , m_entersOpenShadowRoots(behavior & TextIteratorEntersOpenShadowRoots)
-    , m_emitsObjectReplacementCharacter(behavior & TextIteratorEmitsObjectReplacementCharacter)
-    , m_breaksAtReplacedElement(!(behavior & TextIteratorDoesNotBreakAtReplacedElement))
-{
-    if (range)
-        initialize(range->startPosition(), range->endPosition());
-}
-
 TextIterator::TextIterator(const Position& start, const Position& end, TextIteratorBehaviorFlags behavior)
     : m_startContainer(nullptr)
     , m_startOffset(0)
@@ -137,6 +105,9 @@ TextIterator::TextIterator(const Position& start, const Position& end, TextItera
     , m_emitsObjectReplacementCharacter(behavior & TextIteratorEmitsObjectReplacementCharacter)
     , m_breaksAtReplacedElement(!(behavior & TextIteratorDoesNotBreakAtReplacedElement))
 {
+    if (start.isNull() || end.isNull())

[haraken, 2015/03/30 07:34:28]

Why do we need this check?

It seems the old code was calling initialize without having the check.

[hajimehoshi, 2015/03/30 07:40:56]

It is because there are some cases in which |range| is null and actually some
tests fail without this check (see line 108 of the original file). I this this
doesn't change the behavior and is needed for backward compatibility.

[hajimehoshi, 2015/03/30 07:51:15]

That was my misunderstanding: All editing tests passed without this check. :-(
Removed

+        return;
+
     initialize(start, end);
 }
 
@@ -1110,18 +1081,6 @@ Position TextIterator::endPosition() const
     return createLegacyEditingPosition(endContainer(), endOffset());
 }
 
-int TextIterator::rangeLength(const Range* r, bool forSelectionPreservation)
-{
-    int length = 0;
-    TextIteratorBehaviorFlags behaviorFlags = TextIteratorEmitsObjectReplacementCharacter;
-    if (forSelectionPreservation)
-        behaviorFlags |= TextIteratorEmitsCharactersBetweenAllVisiblePositions;
-    for (TextIterator it(r, behaviorFlags); !it.atEnd(); it.advance())
-        length += it.length();
-
-    return length;
-}
-
 int TextIterator::rangeLength(const Position& start, const Position& end, bool forSelectionPreservation)
 {
     int length = 0;
@@ -1173,7 +1132,7 @@ static String createPlainText(TextIterator& it)
 
 String plainText(const Range* r, TextIteratorBehaviorFlags behavior)
 {
-    TextIterator it(r, behavior);
+    TextIterator it(r->startPosition(), r->endPosition(), behavior);
     return createPlainText(it);
 }