Return EphemeralRange from Editor::findRangeOfString.

third_party/WebKit/Source/web/TextFinder.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 95 matching lines @@
     }
 
     Timer<DeferredScopeStringMatches> m_timer;
     RawPtrWillBeMember<TextFinder> m_textFinder;
     const int m_identifier;
     const WebString m_searchText;
     const WebFindOptions m_options;
     const bool m_reset;
 };
 
+template <typename Strategy>
+static PassRefPtrWillBeRawPtr<Range> findStringAndScrollToVisibleAlgorithm(
+    Editor& editor,
+    const String& searchText,
+    EphemeralRangeTemplate<Strategy> searchRange,
+    FindOptions findOptions)
+{
+    do {
+        EphemeralRangeTemplate<Strategy> result = editor.findStringAndScrollToVisible(searchText, searchRange, findOptions);
+        if (result.isCollapsed()) {
+            // Not found.
+            return nullptr;
+        }
+
+        RefPtrWillBeRawPtr<Range> resultRange = Range::create(result.document(), toPositionInDOMTree(result.startPosition()), toPositionInDOMTree(result.endPosition()));
+        if (!resultRange->collapsed()) {

[yosin_UTC9, 2015/11/02 03:44:17]

nit: Please get rid of redundant curly braces.

[Andrey Kraynov, 2015/11/02 14:06:57]

Done.

+            return resultRange;
+        }
+
+        // resultRange will be collapsed if the matched text spans over multiple TreeScopes.
+        // FIXME: Show such matches to users.

[yosin_UTC9, 2015/11/02 03:44:17]

nit: Please use "TODO(iceman):" instead of "FIXME:"

[Andrey Kraynov, 2015/11/02 14:06:57]

Done.

+        searchRange = EphemeralRangeTemplate<Strategy>(result.endPosition(), searchRange.endPosition());
+    } while (!searchRange.isCollapsed());
+
+    return nullptr;
+}
+
+PassRefPtrWillBeRawPtr<Range> TextFinder::findStringAndScrollToVisible(const String& searchText, FindOptions findOptions)
+{
+    if (RuntimeEnabledFeatures::selectionForComposedTreeEnabled())
+        return findStringAndScrollToVisibleAlgorithm(ownerFrame().frame()->editor(), searchText, EphemeralRangeInComposedTree(m_activeMatch.get()), findOptions);
+
+    return findStringAndScrollToVisibleAlgorithm(ownerFrame().frame()->editor(), searchText, EphemeralRange(m_activeMatch.get()), findOptions);
+}
+
 bool TextFinder::find(int identifier, const WebString& searchText, const WebFindOptions& options, bool wrapWithinFrame, WebRect* selectionRect)
 {
     if (!ownerFrame().frame() || !ownerFrame().frame()->page())
         return false;
 
     WebLocalFrameImpl* mainFrameImpl = ownerFrame().viewImpl()->mainFrameImpl();
 
     if (!options.findNext)
         unmarkAllTextMatches();
     else
@@ skipping 12 matching lines @@
         ownerFrame().frame()->selection().clear();
     }
 
     ASSERT(ownerFrame().frame() && ownerFrame().frame()->view());
     const FindOptions findOptions = (options.forward ? 0 : Backwards)
         | (options.matchCase ? 0 : CaseInsensitive)
         | (wrapWithinFrame ? WrapAround : 0)
         | (options.wordStart ? AtWordStarts : 0)
         | (options.medialCapitalAsWordStart ? TreatMedialCapitalAsWordStart : 0)
         | (options.findNext ? 0 : StartInSelection);
-    m_activeMatch = ownerFrame().frame()->editor().findStringAndScrollToVisible(searchText, m_activeMatch.get(), findOptions);
+    m_activeMatch = findStringAndScrollToVisible(searchText, findOptions);
 
     if (!m_activeMatch) {
         // If we're finding next the next active match might not be in the current frame.
         // In this case we don't want to clear the matches cache.
         if (!options.findNext)
             clearFindMatchesCache();
 
         ownerFrame().frameView()->invalidatePaintForTickmarks();
         return false;
     }
@@ skipping 657 matching lines @@
     visitor->trace(m_ownerFrame);
     visitor->trace(m_currentActiveMatchFrame);
     visitor->trace(m_activeMatch);
     visitor->trace(m_resumeScopingFromRange);
     visitor->trace(m_deferredScopingWork);
     visitor->trace(m_findMatchesCache);
 #endif
 }
 
 } // namespace blink