Remove methods of TextIterator that take Range objects

Source/core/editing/iterators/TextIterator.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 59 matching lines @@
     }
     for (Node* node = rangeEndContainer; node; node = node->parentOrShadowHostNode()) {
         if (Node* next = node->nextSibling())
             return next;
     }
     return 0;
 }
 
 // --------
 
-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)
     , 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 (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);
 }
 
 void TextIterator::initialize(const Position& start, const Position& end)
 {
     ASSERT(comparePositions(start, end) <= 0);
 
     // Get and validate |start| and |end|.
     Node* startContainer = start.containerNode();
     if (!startContainer)
@@ skipping 953 matching lines @@
 Position TextIterator::startPosition() const
 {
     return createLegacyEditingPosition(startContainer(), startOffset());
 }
 
 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;
     TextIteratorBehaviorFlags behaviorFlags = TextIteratorEmitsObjectReplacementCharacter;
     if (forSelectionPreservation)
         behaviorFlags |= TextIteratorEmitsCharactersBetweenAllVisiblePositions;
     for (TextIterator it(start, end, behaviorFlags); !it.atEnd(); it.advance())
         length += it.length();
 
     return length;
@@ skipping 31 matching lines @@
     }
 
     if (!bufferLength)
         return emptyString();
 
     return builder.toString();
 }
 
 String plainText(const Range* r, TextIteratorBehaviorFlags behavior)
 {
-    TextIterator it(r, behavior);
+    TextIterator it(r->startPosition(), r->endPosition(), behavior);
     return createPlainText(it);
 }
 
 String plainText(const Position& start, const Position& end, TextIteratorBehaviorFlags behavior)
 {
     TextIterator it(start, end, behavior);
     return createPlainText(it);
 }
 
 }