Manage DOM and string offsets separately in TextIteratorTextState

third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp

Index: third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp
diff --git a/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp b/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp
index 2a1c2e8aa25bfdcac1d63d6704796f6c9f5720c5..67842006bac0b2a4f0a536e179cf3989e65e4c31 100644
--- a/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp
+++ b/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp
@@ -875,7 +875,7 @@ template <typename Strategy>
 int TextIteratorAlgorithm<Strategy>::StartOffsetInCurrentContainer() const {
   if (text_state_->PositionNode()) {
     text_state_->FlushPositionOffsets();
-    return text_state_->PositionStartOffset() + text_state_->TextStartOffset();
+    return text_state_->PositionStartOffset();
   }
   DCHECK(end_container_);
   return end_offset_;
@@ -885,7 +885,7 @@ template <typename Strategy>
 int TextIteratorAlgorithm<Strategy>::EndOffsetInCurrentContainer() const {
   if (text_state_->PositionNode()) {
     text_state_->FlushPositionOffsets();
-    return text_state_->PositionEndOffset() + text_state_->TextStartOffset();
+    return text_state_->PositionEndOffset();
   }
   DCHECK(end_container_);
   return end_offset_;