Get rid of flat tree version of createVisibleSelection() taking two VisiblePosition

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 927 matching lines @@
     return;
 
   // 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);
 
+  SelectionInDOMTree::Builder builder;

[Xiaocheng, 2016/10/21 11:18:36]

Let's use setBaseAndExtentDeprecated, since having a null VP here might indicate
something going wrong.

[yosin_UTC9, 2016/10/24 06:19:44]

Done

+  if (beforeOwnerElement.isNotNull() && afterOwnerElement.isNotNull()) {
+    builder.collapse(beforeOwnerElement.toPositionWithAffinity())
+        .extend(afterOwnerElement.deepEquivalent());
+  } else if (beforeOwnerElement.isNotNull()) {
+    builder.collapse(beforeOwnerElement.toPositionWithAffinity());
+  } else if (afterOwnerElement.isNotNull()) {
+    builder.collapse(afterOwnerElement.toPositionWithAffinity());
+  }
+
   // Focus on the parent frame, and then select from before this element to
   // after.
-  VisibleSelection newSelection =
-      createVisibleSelection(beforeOwnerElement, afterOwnerElement);
+  VisibleSelection newSelection = createVisibleSelection(builder.build());
   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 418 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(createVisibleSelection(start, end),
-                   CloseTyping | ClearTypingStyle,
-                   CursorAlignOnScroll::IfNeeded, WordGranularity);
+      setSelection(
+          createVisibleSelection(SelectionInDOMTree::Builder()
+                                     .collapse(start.toPositionWithAffinity())
+                                     .extend(end.deepEquivalent())
+                                     .build()),
+          CloseTyping | ClearTypingStyle, CursorAlignOnScroll::IfNeeded,
+          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 21 matching lines @@
       granularityStrategy()->updateExtent(contentsPoint, m_frame);
   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 =
-      createVisibleSelection(basePosition, extentPosition);
+  SelectionInDOMTree::Builder builder;
+  if (basePosition.isNotNull() && extentPosition.isNotNull()) {

[Xiaocheng, 2016/10/21 11:18:36]

Let's use setBaseAndExtentDeprecated, since having a null VP here might indicate
something going wrong.

[yosin_UTC9, 2016/10/24 06:19:44]

Done

+    builder.collapse(basePosition.toPositionWithAffinity())
+        .extend(extentPosition.deepEquivalent());
+  } else if (basePosition.isNotNull()) {
+    builder.collapse(basePosition.toPositionWithAffinity());
+  } else if (extentPosition.isNotNull()) {
+    builder.collapse(extentPosition.toPositionWithAffinity());
+  }
+
+  VisibleSelection newSelection = createVisibleSelection(builder.build());
   newSelection.expandUsingGranularity(granularity);
 
   if (newSelection.isNone())
     return;
 
   setSelection(newSelection, CloseTyping | ClearTypingStyle,
                CursorAlignOnScroll::IfNeeded, granularity);
 }
 
 void FrameSelection::updateIfNeeded() {
@@ skipping 39 matching lines @@
 }
 
 void showTree(const blink::FrameSelection* sel) {
   if (sel)
     sel->showTreeForThis();
   else
     LOG(INFO) << "Cannot showTree for <null> FrameSelection.";
 }
 
 #endif