Removal of more temporary Range objects.

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 1831 matching lines @@
             m_offset += runLength;
         }
     }
 
     m_atBreak = true;
     m_runOffset = 0;
 }
 
 // --------
 
-WordAwareIterator::WordAwareIterator(const Range* range)
+WordAwareIterator::WordAwareIterator(const Position& start, const Position& end)
     : m_didLookAhead(true) // So we consider the first chunk from the text iterator.
-    , m_textIterator(range)
+    , m_textIterator(start, end)
 {
     advance(); // Get in position over the first chunk of text.
 }
 
 WordAwareIterator::~WordAwareIterator()
 {
 }
 
 // FIXME: Performance could be bad for huge spans next to each other that don't fall on word boundaries.
 
@@ skipping 370 matching lines @@
     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;
+}
+
 PassRefPtrWillBeRawPtr<Range> TextIterator::subrange(Range* entireRange, int characterOffset, int characterCount)
 {
     CharacterIterator entireRangeIterator(entireRange);
     Position start;
     Position end;
     calculateCharacterSubrange(entireRangeIterator, characterOffset, characterCount, start, end);
     return Range::create(entireRange->ownerDocument(), start, end);
 }
 
+void TextIterator::subrange(Position& start, Position& end, int characterOffset, int characterCount)
+{
+    CharacterIterator entireRangeIterator(start, end);
+    calculateCharacterSubrange(entireRangeIterator, characterOffset, characterCount, start, end);
+}
+
 // --------
 
-String plainText(const Range* r, TextIteratorBehaviorFlags behavior)
+static String createPlainText(TextIterator& it)
 {
     // The initial buffer size can be critical for performance: https://bugs.webkit.org/show_bug.cgi?id=81192
     static const unsigned initialCapacity = 1 << 15;
 
     unsigned bufferLength = 0;
     StringBuilder builder;
     builder.reserveCapacity(initialCapacity);
 
-    for (TextIterator it(r, behavior); !it.atEnd(); it.advance()) {
+    for (; !it.atEnd(); it.advance()) {
         it.appendTextToStringBuilder(builder);
         bufferLength += it.length();
     }
 
     if (!bufferLength)
         return emptyString();
 
     return builder.toString();
 }
 
+String plainText(const Range* r, TextIteratorBehaviorFlags behavior)
+{
+    TextIterator it(r, behavior);
+    return createPlainText(it);
+}
+
+String plainText(const Position& start, const Position& end, TextIteratorBehaviorFlags behavior)
+{
+    TextIterator it(start, end, behavior);
+    return createPlainText(it);
+}
+
 static PassRefPtrWillBeRawPtr<Range> collapsedToBoundary(const Range* range, bool forward)
 {
     RefPtrWillBeRawPtr<Range> result = range->cloneRange();
     result->collapse(!forward);
     return result.release();
 }
 
 // Check if there's any unpaird surrogate code point.
 // Non-character code points are not checked.
 static bool isValidUTF16(const String& s)
@@ skipping 103 matching lines @@
             resultEnd = collapseTo;
             return;
         }
     }
 
     CharacterIterator computeRangeIterator(inputStart, inputEnd, iteratorFlagsForFindPlainText);
     calculateCharacterSubrange(computeRangeIterator, matchStart, matchLength, resultStart, resultEnd);
 }
 
 }