CONTINUED Make FrameSelection to hold non-canonicalized positions

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 167 matching lines @@
   }
 
   const VisiblePositionInFlatTree& visibleHitPos =
       visiblePositionOfHitTestResult(event.hitTestResult());
   const VisiblePositionInFlatTree& visiblePos =
       visibleHitPos.isNull()
           ? createVisiblePosition(
                 PositionInFlatTree::firstPositionInOrBeforeNode(innerNode))
           : visibleHitPos;
   const VisibleSelectionInFlatTree& selection =
-      this->selection().visibleSelection<EditingInFlatTreeStrategy>();
+      this->selection().computeVisibleSelectionInFlatTree();
 
   if (extendSelection && !selection.isNone()) {
     // Note: "fast/events/shift-click-user-select-none.html" makes
     // |pos.isNull()| true.
     const PositionInFlatTree& pos = adjustPositionRespectUserSelectAll(
         innerNode, selection.start(), selection.end(),
         visiblePos.deepEquivalent());
     SelectionInFlatTree::Builder builder;
     builder.setGranularity(this->selection().granularity());
     if (m_frame->editor().behavior().shouldConsiderSelectionAsDirectional()) {
@@ skipping 61 matching lines @@
   VisiblePositionInFlatTree targetPosition = createVisiblePosition(
       fromPositionInDOMTree<EditingInFlatTreeStrategy>(rawTargetPosition));
   // Don't modify the selection if we're not on a node.
   if (targetPosition.isNull())
     return;
 
   // Restart the selection if this is the first mouse move. This work is usually
   // done in handleMousePressEvent, but not if the mouse press was on an
   // existing selection.
   VisibleSelectionInFlatTree newSelection =
-      selection().visibleSelection<EditingInFlatTreeStrategy>();
+      selection().computeVisibleSelectionInFlatTree();
 
   // Special case to limit selection to the containing block for SVG text.
   // FIXME: Isn't there a better non-SVG-specific way to do this?
   if (Node* selectionBaseNode = newSelection.base().anchorNode()) {
     if (LayoutObject* selectionBaseLayoutObject =
             selectionBaseNode->layoutObject()) {
       if (selectionBaseLayoutObject->isSVGText()) {
         if (target->layoutObject()->containingBlock() !=
             selectionBaseLayoutObject->containingBlock())
           return;
@@ skipping 344 matching lines @@
   if (endpointsAdjustmentMode == AdjustEndpointsAtBidiBoundary)
     adjustEndpointsAtBidiBoundary(newBase, newExtent);
 
   if (newBase.deepEquivalent() != base.deepEquivalent() ||
       newExtent.deepEquivalent() != extent.deepEquivalent()) {
     m_originalBaseInFlatTree = base;
     setContext(&document());
     newSelection.setBase(newBase);
     newSelection.setExtent(newExtent);
   } else if (originalBase.isNotNull()) {
-    if (selection().visibleSelection<EditingInFlatTreeStrategy>().base() ==
+    if (selection().computeVisibleSelectionInFlatTree().base() ==
         newSelection.base())
       newSelection.setBase(originalBase);
     m_originalBaseInFlatTree = VisiblePositionInFlatTree();
   }
 
   // Adjusting base and extent will make newSelection always directional
   newSelection.setIsDirectional(isDirectional);
-  if (selection().visibleSelection<EditingInFlatTreeStrategy>() == newSelection)
+  if (selection().computeVisibleSelectionInFlatTree() == newSelection)
     return;
 
   const FrameSelection::SetSelectionOptions options =
       FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle;
   selection().setSelection(newSelection, options, CursorAlignOnScroll::IfNeeded,
                            granularity);
 }
 
 void SelectionController::setCaretAtHitTestResult(
     const HitTestResult& hitTestResult) {
@@ skipping 160 matching lines @@
           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;
     Node* node = event.innerNode();
     if (node && node->layoutObject() && hasEditableStyle(*node)) {
       const VisiblePositionInFlatTree pos =
           visiblePositionOfHitTestResult(event.hitTestResult());
-      if (pos.isNotNull())
+      if (pos.isNotNull()) {
         builder.collapse(pos.toPositionWithAffinity());
+      }
     }
 
-    if (selection().visibleSelection<EditingInFlatTreeStrategy>() !=
+    if (selection().computeVisibleSelectionInFlatTree() !=
         createVisibleSelection(builder.build())) {
       selection().setSelection(builder.build());
     }
 
     handled = true;
   }
 
   selection().notifyLayoutObjectOfSelectionChange(UserTriggered);
 
   selection().selectFrameElementInParentIfFullySelected();
@@ skipping 134 matching lines @@
   // 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());
     return;
   }
-  selection().setSelection(SelectionInFlatTree::Builder()
-                               .collapse(visiblePos.toPositionWithAffinity())
-                               .build());
+  SelectionInFlatTree::Builder builder;
+  builder.collapse(visiblePos.toPositionWithAffinity());
+  selection().setSelection(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