Revert of Utilize FrameSelection::setSelection() taking SelectionInDOMTree/SelectionInFlatTree

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  * Copyright (C) 2015 Google 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:
@@ skipping 749 matching lines @@
   // editing, place the caret.
   if (m_mouseDownWasSingleClickInSelection &&
       m_selectionState != SelectionState::ExtendedSelection &&
       dragStartPos == event.event().position() && selection().isRange() &&
       event.event().pointerProperties().button !=
           WebPointerProperties::Button::Right) {
     // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
     // needs to be audited.  See http://crbug.com/590369 for more details.
     m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
-    SelectionInFlatTree::Builder builder;
+    VisibleSelectionInFlatTree newSelection;
     Node* node = event.innerNode();
     if (node && node->layoutObject() && hasEditableStyle(*node)) {
       const VisiblePositionInFlatTree pos =
           visiblePositionOfHitTestResult(event.hitTestResult());
-      if (pos.isNotNull())
+      if (pos.isNotNull()) {
+        SelectionInFlatTree::Builder builder;
         builder.collapse(pos.toPositionWithAffinity());
+        newSelection = createVisibleSelection(builder.build());
+      }
     }
 
     if (selection().visibleSelection<EditingInFlatTreeStrategy>() !=
-        createVisibleSelection(builder.build())) {
-      selection().setSelection(builder.build());
+        newSelection) {
+      selection().setSelection(newSelection);
     }
 
     handled = true;
   }
 
   selection().notifyLayoutObjectOfSelectionChange(UserTriggered);
 
   selection().selectFrameElementInParentIfFullySelected();
 
   if (event.event().pointerProperties().button ==
@@ skipping 123 matching lines @@
   if (!selection().contains(p))
     return;
 
   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
   const VisiblePositionInFlatTree& visiblePos =
       visiblePositionOfHitTestResult(mev.hitTestResult());
   if (visiblePos.isNull()) {
-    selection().setSelection(SelectionInFlatTree());
+    selection().setSelection(VisibleSelectionInFlatTree());
     return;
   }
-  selection().setSelection(SelectionInFlatTree::Builder()
-                               .collapse(visiblePos.toPositionWithAffinity())
-                               .build());
+  SelectionInFlatTree::Builder builder;
+  builder.collapse(visiblePos.toPositionWithAffinity());
+  selection().setSelection(createVisibleSelection(builder.build()));
 }
 
 void SelectionController::initializeSelectionState() {
   m_selectionState = SelectionState::HaveNotStartedSelection;
 }
 
 void SelectionController::setMouseDownMayStartSelect(bool mayStartSelect) {
   m_mouseDownMayStartSelect = mayStartSelect;
 }
 
@@ skipping 22 matching lines @@
   return event.event().altKey() && event.isOverLink();
 }
 
 bool isExtendingSelection(const MouseEventWithHitTestResults& event) {
   bool isMouseDownOnLinkOrImage =
       event.isOverLink() || event.hitTestResult().image();
   return event.event().shiftKey() && !isMouseDownOnLinkOrImage;
 }
 
 }  // namespace blink