Use PositionInFlatTreeWithAffinty for SelectionController::original_base_in_flat_tree_

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 122 matching lines @@
 }  // namespace
 
 SelectionController::~SelectionController() = default;
 
 Document& SelectionController::GetDocument() const {
   DCHECK(frame_->GetDocument());
   return *frame_->GetDocument();
 }
 
 void SelectionController::ContextDestroyed(Document*) {
-  original_base_in_flat_tree_ = VisiblePositionInFlatTree();
+  original_base_in_flat_tree_ = PositionInFlatTreeWithAffinity();
 }
 
 static PositionInFlatTree AdjustPositionRespectUserSelectAll(
     Node* inner_node,
     const PositionInFlatTree& selection_start,
     const PositionInFlatTree& selection_end,
     const PositionInFlatTree& position) {
   const VisibleSelectionInFlatTree& selection_in_user_select_all =
       CreateVisibleSelection(ExpandSelectionToRespectUserSelectAll(
           inner_node, position.IsNull() ? VisibleSelectionInFlatTree()
@@ skipping 568 matching lines @@
     const SelectionInFlatTree& passed_selection,
     TextGranularity granularity,
     EndPointsAdjustmentMode endpoints_adjustment_mode,
     HandleVisibility handle_visibility) {
   // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheets();
 
   const VisibleSelectionInFlatTree& new_selection =
       CreateVisibleSelection(passed_selection);
+  // TODO(editing-dev): We should use |PositionWithAffinity| to pass affinity
+  // to |CreateVisiblePosition()| for |original_base|.
   const PositionInFlatTree& base_position =
-      original_base_in_flat_tree_.DeepEquivalent();
+      original_base_in_flat_tree_.GetPosition();
   const VisiblePositionInFlatTree& original_base =
       base_position.IsConnected() ? CreateVisiblePosition(base_position)
                                   : VisiblePositionInFlatTree();
   const VisiblePositionInFlatTree& base =
       original_base.IsNotNull() ? original_base
                                 : CreateVisiblePosition(new_selection.Base());
   const VisiblePositionInFlatTree& extent =
       CreateVisiblePosition(new_selection.Extent());
   const SelectionInFlatTree& adjusted_selection =
       endpoints_adjustment_mode == kAdjustEndpointsAtBidiBoundary
           ? AdjustEndpointsAtBidiBoundary(base, extent)
           : SelectionInFlatTree::Builder()
                 .SetBaseAndExtent(base.DeepEquivalent(),
                                   extent.DeepEquivalent())
                 .Build();
 
   SelectionInFlatTree::Builder builder(new_selection.AsSelection());
   if (adjusted_selection.Base() != base.DeepEquivalent() ||
       adjusted_selection.Extent() != extent.DeepEquivalent()) {
-    original_base_in_flat_tree_ = base;
+    original_base_in_flat_tree_ = base.ToPositionWithAffinity();
     SetContext(&GetDocument());
     builder.SetBaseAndExtent(adjusted_selection.Base(),
                              adjusted_selection.Extent());
   } else if (original_base.IsNotNull()) {
     if (Selection().ComputeVisibleSelectionInFlatTree().Base() ==
         new_selection.Base()) {
       builder.SetBaseAndExtent(original_base.DeepEquivalent(),
                                new_selection.Extent());
     }
-    original_base_in_flat_tree_ = VisiblePositionInFlatTree();
+    original_base_in_flat_tree_ = PositionInFlatTreeWithAffinity();
   }
 
   builder.SetIsHandleVisible(handle_visibility == HandleVisibility::kVisible)
       .SetIsDirectional(frame_->GetEditor()
                             .Behavior()
                             .ShouldConsiderSelectionAsDirectional() ||
                         new_selection.IsDirectional());
   const SelectionInFlatTree& selection_in_flat_tree = builder.Build();
   if (Selection().ComputeVisibleSelectionInFlatTree() ==
           CreateVisibleSelection(selection_in_flat_tree) &&
@@ skipping 437 matching lines @@
 
 bool IsExtendingSelection(const MouseEventWithHitTestResults& event) {
   bool is_mouse_down_on_link_or_image =
       event.IsOverLink() || event.GetHitTestResult().GetImage();
   return (event.Event().GetModifiers() & WebInputEvent::Modifiers::kShiftKey) !=
              0 &&
          !is_mouse_down_on_link_or_image;
 }
 
 }  // namespace blink