Make SelectionEditor::setWithoutValidation() not to use obsoleted layout objects

third_party/WebKit/Source/core/editing/SelectionEditor.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 66 matching lines @@
 template <>
 const VisibleSelectionInComposedTree& SelectionEditor::visibleSelection<EditingInComposedTreeStrategy>() const
 {
     return m_selectionInComposedTree;
 }
 
 void SelectionEditor::setVisibleSelection(const VisibleSelection& newSelection, FrameSelection::SetSelectionOptions options)
 {
     m_selection = newSelection;
     if (options & FrameSelection::DoNotAdjustInComposedTree) {
-        const auto& base = toPositionInComposedTree(m_selection.base());
-        const auto& extent = toPositionInComposedTree(m_selection.extent());
-        base.anchorNode()->updateDistribution();
-        extent.anchorNode()->updateDistribution();
-        m_selectionInComposedTree.setWithoutValidation(base, extent);
+        m_selectionInComposedTree.setWithoutValidation(toPositionInComposedTree(m_selection.base()), toPositionInComposedTree(m_selection.extent()));
         return;
     }
 
     adjustVisibleSelectionInComposedTree();
 }
 
 void SelectionEditor::setVisibleSelection(const VisibleSelectionInComposedTree& newSelection, FrameSelection::SetSelectionOptions options)
 {
     ASSERT(!(options & FrameSelection::DoNotAdjustInComposedTree));
     m_selectionInComposedTree = newSelection;
@@ skipping 61 matching lines @@
 {
     m_xPosForVerticalArrowNavigation = NoXPosForVerticalArrowNavigation();
 }
 
 void SelectionEditor::setIsDirectional(bool isDirectional)
 {
     m_selection.setIsDirectional(isDirectional);
     m_selectionInComposedTree.setIsDirectional(isDirectional);
 }
 
-void SelectionEditor::setWithoutValidation(const Position& start, const Position& end)
+void SelectionEditor::setWithoutValidation(const Position& base, const Position& extent)
 {
-    m_selection.setWithoutValidation(start, end);
-    adjustVisibleSelectionInComposedTree();
+    m_selection.setWithoutValidation(base, extent);
+    m_selectionInComposedTree.setWithoutValidation(toPositionInComposedTree(base), toPositionInComposedTree(extent));
 }
 
 TextDirection SelectionEditor::directionOfEnclosingBlock()
 {
     return blink::directionOfEnclosingBlock(m_selection.extent());
 }
 
 TextDirection SelectionEditor::directionOfSelection()
 {
     InlineBox* startBox = nullptr;
@@ skipping 754 matching lines @@
 DEFINE_TRACE(SelectionEditor)
 {
     visitor->trace(m_frameSelection);
     visitor->trace(m_selection);
     visitor->trace(m_selectionInComposedTree);
     visitor->trace(m_logicalRange);
     VisibleSelectionChangeObserver::trace(visitor);
 }
 
 } // namespace blink