Find In Page doesn't work properly when " " is searched

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 1b85ca7430b2a0acc1bfa826867616810b7f1812..36f4570020c172686f3e865121eb2ec97f64e46f 100644
--- a/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp
+++ b/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp
@@ -458,8 +458,15 @@ bool TextIteratorAlgorithm<Strategy>::handleTextNode()
     if (!layoutObject->style()->collapseWhiteSpace()) {
         int runStart = m_offset;
         if (m_lastTextNodeEndedWithCollapsedSpace && hasVisibleTextNode(layoutObject)) {
-            emitCharacter(spaceCharacter, textNode, 0, runStart, runStart);
-            return false;
+            if (m_behavior & TextIteratorCollapseTrailingSpace) {
+                if (runStart > 0 && str[runStart - 1] == ' ') {
+                    emitCharacter(spaceCharacter, textNode, 0, runStart, runStart);
+                    return false;
+                }
+            } else {
+                emitCharacter(spaceCharacter, textNode, 0, runStart, runStart);
+                return false;
+            }
         }
         if (!m_handledFirstLetter && layoutObject->isTextFragment() && !m_offset) {
             handleTextNodeFirstLetter(toLayoutTextFragment(layoutObject));
@@ -671,7 +678,15 @@ bool TextIteratorAlgorithm<Strategy>::handleReplacedElement()
         return true;
     }
 
-    if (m_lastTextNodeEndedWithCollapsedSpace) {
+    if (m_behavior & TextIteratorCollapseTrailingSpace) {
+        if (m_lastTextNode) {
+            String str = m_lastTextNode->layoutObject()->text();
+            if (m_lastTextNodeEndedWithCollapsedSpace && m_offset > 0 && str[m_offset - 1] == ' ') {
+                emitCharacter(spaceCharacter, Strategy::parent(*m_lastTextNode), m_lastTextNode, 1, 1);
+                return false;
+            }
+        }
+    } else if (m_lastTextNodeEndedWithCollapsedSpace) {
         emitCharacter(spaceCharacter, Strategy::parent(*m_lastTextNode), m_lastTextNode, 1, 1);
         return false;
     }