Prune createVisibleSelectionDeprecated from FrameSelection

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 140 matching lines @@
 }
 
 const VisibleSelectionInFlatTree& FrameSelection::selectionInFlatTree() const {
   return visibleSelection<EditingInFlatTreeStrategy>();
 }
 
 void FrameSelection::moveTo(const VisiblePosition& pos,
                             EUserTriggered userTriggered,
                             CursorAlignOnScroll align) {
   SetSelectionOptions options = CloseTyping | ClearTypingStyle | userTriggered;
-  setSelection(
-      createVisibleSelectionDeprecated(pos, pos, selection().isDirectional()),
-      options, align);
+  setSelection(createVisibleSelection(pos, pos, selection().isDirectional()),
+               options, align);
 }
 
 void FrameSelection::moveTo(const Position& pos, TextAffinity affinity) {
   SetSelectionOptions options = CloseTyping | ClearTypingStyle;
-  setSelection(createVisibleSelectionDeprecated(pos, affinity,
-                                                selection().isDirectional()),
-               options);
+  setSelection(
+      createVisibleSelection(pos, affinity, selection().isDirectional()),
+      options);
 }
 
 // TODO(xiaochengh): We should not use reference to return value.
 template <typename Strategy>
 static void adjustEndpointsAtBidiBoundary(
     VisiblePositionTemplate<Strategy>& visibleBase,
     VisiblePositionTemplate<Strategy>& visibleExtent) {
   DCHECK(visibleBase.isValid());
   DCHECK(visibleExtent.isValid());
 
@@ skipping 718 matching lines @@
   // Create compute positions before and after the element.
   unsigned ownerElementNodeIndex = ownerElement->nodeIndex();
   VisiblePosition beforeOwnerElement = createVisiblePosition(
       Position(ownerElementParent, ownerElementNodeIndex));
   VisiblePosition afterOwnerElement = createVisiblePosition(
       Position(ownerElementParent, ownerElementNodeIndex + 1),
       VP_UPSTREAM_IF_POSSIBLE);
 
   // Focus on the parent frame, and then select from before this element to after.
   VisibleSelection newSelection =
-      createVisibleSelectionDeprecated(beforeOwnerElement, afterOwnerElement);
+      createVisibleSelection(beforeOwnerElement, afterOwnerElement);
   page->focusController().setFocusedFrame(parent);
   // setFocusedFrame can dispatch synchronous focus/blur events.  The document
   // tree might be modified.
   if (newSelection.isNonOrphanedCaretOrRange())
     toLocalFrame(parent)->selection().setSelection(newSelection);
 }
 
 // Returns a shadow tree node for legacy shadow trees, a child of the
 // ShadowRoot node for new shadow trees, or 0 for non-shadow trees.
 static Node* nonBoundaryShadowTreeRootNode(const Position& position) {
@@ skipping 65 matching lines @@
                                       TextAffinity affinity,
                                       SelectionDirectionalMode directional,
                                       SetSelectionOptions options) {
   if (range.isNull())
     return false;
   m_selectionEditor->resetLogicalRange();
   // Since |FrameSeleciton::setSelection()| dispatches events and DOM tree
   // can be modified by event handlers, we should create |Range| object before
   // calling it.
   Range* logicalRange = createRange(range);
-  VisibleSelection newSelection = createVisibleSelectionDeprecated(
+  VisibleSelection newSelection = createVisibleSelection(
       range.startPosition(), range.endPosition(), affinity,
       directional == SelectionDirectionalMode::Directional);
   setSelection(newSelection, options);
   m_selectionEditor->setLogicalRange(logicalRange);
   return true;
 }
 
 Range* FrameSelection::firstRange() const {
   return m_selectionEditor->firstRange();
 }
@@ skipping 292 matching lines @@
   Document* document = m_frame->document();
   bool caretBrowsing =
       m_frame->settings() && m_frame->settings()->caretBrowsingEnabled();
   if (!isNone() || !(blink::hasEditableStyle(*document) || caretBrowsing))
     return;
 
   Element* documentElement = document->documentElement();
   if (!documentElement)
     return;
   if (HTMLBodyElement* body =
-          Traversal<HTMLBodyElement>::firstChild(*documentElement))
-    setSelection(createVisibleSelectionDeprecated(
-        firstPositionInOrBeforeNode(body), TextAffinity::Downstream));
+          Traversal<HTMLBodyElement>::firstChild(*documentElement)) {
+    // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+    // needs to be audited.  See http://crbug.com/590369 for more details.
+    document->updateStyleAndLayoutIgnorePendingStylesheets();
+
+    setSelection(createVisibleSelection(firstPositionInOrBeforeNode(body),
+                                        TextAffinity::Downstream));
+  }
 }
 
 // TODO(yoichio): We should have LocalFrame having FrameCaret,
 // Editor and PendingSelection using FrameCaret directly
 // and get rid of this.
 bool FrameSelection::shouldShowBlockCursor() const {
   return m_frameCaret->shouldShowBlockCursor();
 }
 
 // TODO(yoichio): We should have LocalFrame having FrameCaret,
@@ skipping 55 matching lines @@
 
 bool FrameSelection::selectWordAroundPosition(const VisiblePosition& position) {
   static const EWordSide wordSideList[2] = {RightWordIfOnBoundary,
                                             LeftWordIfOnBoundary};
   for (EWordSide wordSide : wordSideList) {
     VisiblePosition start = startOfWord(position, wordSide);
     VisiblePosition end = endOfWord(position, wordSide);
     String text =
         plainText(EphemeralRange(start.deepEquivalent(), end.deepEquivalent()));
     if (!text.isEmpty() && !isSeparator(text.characterStartingAt(0))) {
-      setSelection(createVisibleSelectionDeprecated(start, end),
-                   WordGranularity);
+      setSelection(createVisibleSelection(start, end), WordGranularity);
       return true;
     }
   }
 
   return false;
 }
 
 GranularityStrategy* FrameSelection::granularityStrategy() {
   // We do lazy initalization for m_granularityStrategy, because if we
   // initialize it right in the constructor - the correct settings may not be
@@ skipping 22 matching lines @@
   setSelection(newSelection,
                FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle |
                    FrameSelection::DoNotClearStrategy | UserTriggered,
                CursorAlignOnScroll::IfNeeded, CharacterGranularity);
 }
 
 void FrameSelection::moveRangeSelection(const VisiblePosition& basePosition,
                                         const VisiblePosition& extentPosition,
                                         TextGranularity granularity) {
   VisibleSelection newSelection =
-      createVisibleSelectionDeprecated(basePosition, extentPosition);
+      createVisibleSelection(basePosition, extentPosition);
   newSelection.expandUsingGranularity(granularity);
 
   if (newSelection.isNone())
     return;
 
   setSelection(newSelection, granularity);
 }
 
 void FrameSelection::updateIfNeeded() {
   m_selectionEditor->updateIfNeeded();
@@ skipping 37 matching lines @@
 }
 
 void showTree(const blink::FrameSelection* sel) {
   if (sel)
     sel->showTreeForThis();
   else
     LOG(INFO) << "Cannot showTree for <null> FrameSelection.";
 }
 
 #endif