Reland 'Use FrameSelection::selectedText where possible.'

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

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 Apple 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:
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 839 matching lines @@
 
     if (selectStartTarget && !selectStartTarget->dispatchEvent(Event::createCancelableBubble(EventTypeNames::selectstart)))
         return;
 
     VisibleSelection newSelection(VisibleSelection::selectionFromContentsOfNode(root.get()));
     setSelection(newSelection);
     selectFrameElementInParentIfFullySelected();
     notifyLayoutObjectOfSelectionChange(UserTriggered);
 }
 
+void FrameSelection::setSelectionInTextFormControl(const VisibleSelection& selection, SetSelectionOptions options)
+{
+    setSelection(selection, options);

[yosin_UTC9, 2015/10/29 06:44:47]

FrameSelection::setSelection() calls SelectionEditor::setSelection(). So, we
update
VisibleSelection{InDOMTree,InComposedTree} twice, one SE:setSelection(), another
is
SE::setSelectionInTextFormControl().

What do you think about introducing SetSelectionOptions::ForTextFormControl and
makes FrameSelection::setSelection() to call SE:setSelection() or
SE:setSelectionInTextForm()

+    m_selectionEditor->setSelectionInTextFormControl(selection.base(), selection.extent());
+}
+
 bool FrameSelection::setSelectedRange(Range* range, TextAffinity affinity, SelectionDirectionalMode directional, SetSelectionOptions options)
 {
     if (!range || !range->startContainer() || !range->endContainer())
         return false;
     ASSERT(range->startContainer()->document() == range->endContainer()->document());
     return setSelectedRange(EphemeralRange(range), affinity, directional, options);
 }
 
 bool FrameSelection::setSelectedRange(const EphemeralRange& range, TextAffinity affinity, SelectionDirectionalMode directional, SetSelectionOptions options)
 {
@@ skipping 266 matching lines @@
     return createMarkup(range.startPosition(), range.endPosition(), AnnotateForInterchange, ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
 }
 
 String FrameSelection::selectedHTMLForClipboard() const
 {
     if (!RuntimeEnabledFeatures::selectionForComposedTreeEnabled())
         return extractSelectedHTMLAlgorithm<EditingStrategy>(*this);
     return extractSelectedHTMLAlgorithm<EditingInComposedTreeStrategy>(*this);
 }
 
-String FrameSelection::selectedText() const
+String FrameSelection::selectedText(TextIteratorBehavior behavior) const
 {
-    return extractSelectedText(*this, TextIteratorDefaultBehavior);
+    return extractSelectedText(*this, behavior);
 }
 
 String FrameSelection::selectedTextForClipboard() const
 {
     if (m_frame->settings() && m_frame->settings()->selectionIncludesAltImageText())
         return extractSelectedText(*this, TextIteratorEmitsImageAltText);
     return selectedText();
 }
 
 LayoutRect FrameSelection::bounds() const
@@ skipping 250 matching lines @@
 
 void showTree(const blink::FrameSelection* sel)
 {
     if (sel)
         sel->showTreeForThis();
     else
         fprintf(stderr, "Cannot showTree for (nil) FrameSelection.\n");
 }
 
 #endif