Add a constructor to TextIterator taking two Positions as iteration range.

Source/core/editing/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 229 matching lines @@
 // --------
 
 TextIterator::TextIterator(const Range* range, TextIteratorBehaviorFlags behavior)
     : m_shadowDepth(0)
     , m_startContainer(0)
     , m_startOffset(0)
     , m_endContainer(0)
     , m_endOffset(0)
     , m_positionNode(0)
     , m_textLength(0)
+    , m_needsAnotherNewline(false)
+    , m_textBox(0)
     , m_remainingTextBox(0)
     , m_firstLetterText(0)
+    , m_lastTextNode(0)
+    , 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_entersAuthorShadowRoots(behavior & TextIteratorEntersAuthorShadowRoots)
 {
-    if (!range)
-        return;
+    if (range)
+        initialize(range->startPosition(), range->endPosition());
+}
 
-    // get and validate the range endpoints
-    Node* startContainer = range->startContainer();
+TextIterator::TextIterator(const Position& start, const Position& end, TextIteratorBehaviorFlags behavior)
+    : m_shadowDepth(0)
+    , m_startContainer(0)
+    , m_startOffset(0)
+    , m_endContainer(0)
+    , m_endOffset(0)
+    , m_positionNode(0)
+    , m_textLength(0)
+    , m_needsAnotherNewline(false)
+    , m_textBox(0)
+    , m_remainingTextBox(0)
+    , m_firstLetterText(0)
+    , m_lastTextNode(0)
+    , 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_entersAuthorShadowRoots(behavior & TextIteratorEntersAuthorShadowRoots)

[yosin_UTC9, 2014/03/26 01:08:02]

Once Blink incorporate C++11 delegating constructors, we would like to use it
here. ;-)

[Yuta Kitamura, 2014/03/26 01:58:58]

Yup; actually this long initializer list is kind of silly.

+{
+    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)
         return;
-    int startOffset = range->startOffset();
-    Node* endContainer = range->endContainer();
-    int endOffset = range->endOffset();
+    int startOffset = start.computeOffsetInContainerNode();
+    Node* endContainer = end.containerNode();
+    if (!endContainer)
+        return;
+    int endOffset = end.computeOffsetInContainerNode();
 
-    // Callers should be handing us well-formed ranges. If we discover that this isn't
-    // the case, we could consider changing this assertion to an early return.
-    ASSERT(range->boundaryPointsValid());
-
-    // remember range - this does not change
+    // Remember the range - this does not change.
     m_startContainer = startContainer;
     m_startOffset = startOffset;
     m_endContainer = endContainer;
     m_endOffset = endOffset;
 
-    // set up the current node for processing
-    m_node = range->firstNode();
+    // Set up the current node for processing.
+    if (startContainer->offsetInCharacters())
+        m_node = startContainer;
+    else if (Node* child = startContainer->traverseToChildAt(startOffset))
+        m_node = child;
+    else if (!startOffset)
+        m_node = startContainer;
+    else
+        m_node = NodeTraversal::nextSkippingChildren(*startContainer);
+
     if (!m_node)
         return;
+
     setUpFullyClippedStack(m_fullyClippedStack, m_node);
     m_offset = m_node == m_startContainer ? m_startOffset : 0;
     m_iterationProgress = HandledNone;
 
-    // calculate first out of bounds node
+    // Calculate first out of bounds node.
     m_pastEndNode = nextInPreOrderCrossingShadowBoundaries(endContainer, endOffset);
 
-    // initialize node processing state
-    m_needsAnotherNewline = false;
-    m_textBox = 0;
-
-    // initialize record of previous node processing
-    m_hasEmitted = false;
-    m_lastTextNode = 0;
-    m_lastTextNodeEndedWithCollapsedSpace = false;
-    m_lastCharacter = 0;
-
-    // identify the first run
+    // Identify the first run.
     advance();
 }
 
 TextIterator::~TextIterator()
 {
 }
 
 void TextIterator::advance()
 {
     if (m_shouldStop)
@@ skipping 1765 matching lines @@
         if (!matchLength)
             return collapsedToBoundary(range, !(options & Backwards));
     }
 
     // Then, find the document position of the start and the end of the text.
     CharacterIterator computeRangeIterator(range, TextIteratorEntersTextControls | TextIteratorEntersAuthorShadowRoots);
     return characterSubrange(computeRangeIterator, matchStart, matchLength);
 }
 
 }