| Index: third_party/WebKit/Source/core/editing/Editor.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/Editor.cpp b/third_party/WebKit/Source/core/editing/Editor.cpp
|
| index 00872ebb182cd69c8edf492172eab29a6c900d40..3a8bd64fc5896b74a802919430ae05d41a067923 100644
|
| --- a/third_party/WebKit/Source/core/editing/Editor.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/Editor.cpp
|
| @@ -1209,8 +1209,8 @@ static PassRefPtrWillBeRawPtr<Range> findStringAndScrollToVisibleAlgorithm(Edito
|
|
|
| PassRefPtrWillBeRawPtr<Range> Editor::findStringAndScrollToVisible(const String& target, Range* range, FindOptions options)
|
| {
|
| - if (RuntimeEnabledFeatures::selectionForComposedTreeEnabled())
|
| - return findStringAndScrollToVisibleAlgorithm<EditingInComposedTreeStrategy>(*this, target, EphemeralRangeInComposedTree(range), options);
|
| + if (RuntimeEnabledFeatures::selectionForFlatTreeEnabled())
|
| + return findStringAndScrollToVisibleAlgorithm<EditingInFlatTreeStrategy>(*this, target, EphemeralRangeInFlatTree(range), options);
|
| return findStringAndScrollToVisibleAlgorithm<EditingStrategy>(*this, target, EphemeralRange(range), options);
|
| }
|
|
|
| @@ -1303,9 +1303,9 @@ PassRefPtrWillBeRawPtr<Range> Editor::findRangeOfString(const String& target, co
|
| return findRangeOfStringAlgorithm<EditingStrategy>(*frame().document(), target, reference, options);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<Range> Editor::findRangeOfString(const String& target, const EphemeralRangeInComposedTree& reference, FindOptions options)
|
| +PassRefPtrWillBeRawPtr<Range> Editor::findRangeOfString(const String& target, const EphemeralRangeInFlatTree& reference, FindOptions options)
|
| {
|
| - return findRangeOfStringAlgorithm<EditingInComposedTreeStrategy>(*frame().document(), target, reference, options);
|
| + return findRangeOfStringAlgorithm<EditingInFlatTreeStrategy>(*frame().document(), target, reference, options);
|
| }
|
|
|
| void Editor::setMarkedTextMatchesAreHighlighted(bool flag)
|
|
|