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 1083 matching lines @@
     }
 
     if (caretBrowsing)
         m_frame->page()->focusController().setFocusedElement(0, m_frame);
 }
 
 template <typename Strategy>
 String extractSelectedTextAlgorithm(const FrameSelection& selection, TextIteratorBehavior behavior)
 {
     const VisibleSelectionTemplate<Strategy> visibleSelection = selection.visibleSelection<Strategy>();
+    if (!visibleSelection.isRange())

[yosin_UTC9, 2015/10/06 05:41:51]

I think it is easier to make |normalizeRange()| to handle null range case
rather than each call site.

[kotenkov, 2015/10/06 12:29:23]

Actually, now the problem is not in |normalizeRange()| but in |createMarkup()|
-- it is not supposed to handle null position and I'm not sure whether we should
change this behavior. The check here is just for symmetry with
|extractSelectedHTMLAlgorithm()|, |plainText()| can handle empty ranges.

[yosin_UTC9, 2015/10/15 07:45:46]

Let's make both |normalizeRange()| and |createMarkup()| to handle null
range case to avoid null check on each call site.

+        return String();
     const EphemeralRangeTemplate<Strategy> range = visibleSelection.toNormalizedEphemeralRange();
     // We remove '\0' characters because they are not visibly rendered to the user.
     return plainText(range, behavior).replace(0, "");
 }
 
 static String extractSelectedText(const FrameSelection& selection, TextIteratorBehavior behavior)
 {
     if (RuntimeEnabledFeatures::selectionForComposedTreeEnabled())
         return extractSelectedTextAlgorithm<EditingInComposedTreeStrategy>(selection, behavior);
     return extractSelectedTextAlgorithm<EditingStrategy>(selection, behavior);
 }
 
 template <typename Strategy>
 static String extractSelectedHTMLAlgorithm(const FrameSelection& selection)
 {
     const VisibleSelectionTemplate<Strategy> visibleSelection = selection.visibleSelection<Strategy>();
+    if (!visibleSelection.isRange())
+        return String();
     const EphemeralRangeTemplate<Strategy> range = visibleSelection.toNormalizedEphemeralRange();
     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 249 matching lines @@
 
 void showTree(const blink::FrameSelection* sel)
 {
     if (sel)
         sel->showTreeForThis();
     else
         fprintf(stderr, "Cannot showTree for (nil) FrameSelection.\n");
 }
 
 #endif