Reland 'Use FrameSelection::selectedText where possible.'

third_party/WebKit/Source/core/editing/FrameSelection.h

Index: third_party/WebKit/Source/core/editing/FrameSelection.h
diff --git a/third_party/WebKit/Source/core/editing/FrameSelection.h b/third_party/WebKit/Source/core/editing/FrameSelection.h
index d554d986156a63fde6aa89f82f714e8cf3397ac9..7afd2af525809064d45e2e40cae44d871ae045d7 100644
--- a/third_party/WebKit/Source/core/editing/FrameSelection.h
+++ b/third_party/WebKit/Source/core/editing/FrameSelection.h
@@ -33,6 +33,7 @@
 #include "core/editing/EphemeralRange.h"
 #include "core/editing/VisiblePosition.h"
 #include "core/editing/VisibleSelection.h"
+#include "core/editing/iterators/TextIteratorFlags.h"
 #include "core/layout/ScrollAlignment.h"
 #include "platform/Timer.h"
 #include "platform/geometry/IntRect.h"
@@ -117,6 +118,7 @@ public:
     // |setSelection()| to avoid conflict of four parameters version.
     void setSelection(const VisibleSelection& selection, TextGranularity granularity) { setSelection(selection, CloseTyping | ClearTypingStyle, CursorAlignOnScroll::IfNeeded, granularity); }
     void setSelection(const VisibleSelectionInComposedTree& selection, TextGranularity granularity) { setSelection(selection, CloseTyping | ClearTypingStyle, CursorAlignOnScroll::IfNeeded, granularity); }
+    void setSelectionInTextFormControl(const VisibleSelection&, SetSelectionOptions);
     // TODO(yosin) We should get rid of |Range| version of |setSelectedRagne()|
     // for Oilpan.
     bool setSelectedRange(Range*, TextAffinity, SelectionDirectionalMode = SelectionDirectionalMode::NonDirectional, SetSelectionOptions = CloseTyping | ClearTypingStyle);
@@ -224,7 +226,7 @@ public:
     void clearTypingStyle();
 
     String selectedHTMLForClipboard() const;
-    String selectedText() const;
+    String selectedText(TextIteratorBehavior = TextIteratorDefaultBehavior) const;
     String selectedTextForClipboard() const;
 
     // The bounds are clipped to the viewport as this is what callers expect.