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

third_party/WebKit/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 440 matching lines @@
     Text* textNode = toText(m_node);
     LayoutText* layoutObject = textNode->layoutObject();
 
     m_lastTextNode = textNode;
     String str = layoutObject->text();
 
     // handle pre-formatted text
     if (!layoutObject->style()->collapseWhiteSpace()) {
         int runStart = m_offset;
         if (m_lastTextNodeEndedWithCollapsedSpace && hasVisibleTextNode(layoutObject)) {
-            emitCharacter(spaceCharacter, textNode, 0, runStart, runStart);
-            return false;
+            if (m_behavior & TextIteratorEmitExtraSpaceDeprecated) {
+                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));
             if (m_firstLetterText) {
                 String firstLetter = m_firstLetterText->text();
                 emitText(textNode, m_firstLetterText, m_offset, m_offset + firstLetter.length());
                 m_firstLetterText = nullptr;
                 m_textBox = 0;
                 return false;
             }
@@ skipping 191 matching lines @@
 
     LayoutObject* layoutObject = m_node->layoutObject();
     if (layoutObject->style()->visibility() != VISIBLE && !ignoresStyleVisibility())
         return false;
 
     if (emitsObjectReplacementCharacter()) {
         emitCharacter(objectReplacementCharacter, Strategy::parent(*m_node), m_node, 0, 1);
         return true;
     }
 
-    if (m_lastTextNodeEndedWithCollapsedSpace) {
+    if (m_behavior & TextIteratorEmitExtraSpaceDeprecated) {
+        if (m_lastTextNode) {
+            String str = m_lastTextNode->layoutObject()->text();
+            if (m_lastTextNodeEndedWithCollapsedSpace && m_offset > 0 && str[m_offset-1] == ' ') {

[yosin_UTC9, 2016/01/20 01:40:23]

nit: need spaces around '-'

[ramya.v, 2016/01/20 03:42:56]

Done.

+                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;
     }
 
     if (entersTextControls() && layoutObject->isTextControl()) {
         // The shadow tree should be already visited.
         return true;
     }
 
     if (emitsCharactersBetweenAllVisiblePositions()) {
@@ skipping 434 matching lines @@
 
 String plainText(const EphemeralRangeInComposedTree& range, TextIteratorBehaviorFlags behavior)
 {
     return createPlainText<EditingInComposedTreeStrategy>(range, behavior);
 }
 
 template class CORE_TEMPLATE_EXPORT TextIteratorAlgorithm<EditingStrategy>;
 template class CORE_TEMPLATE_EXPORT TextIteratorAlgorithm<EditingInComposedTreeStrategy>;
 
 } // namespace blink