Revert of Introduce SelectionAdjuster to adjust selections between DOM tree version and composed tree version

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 69 matching lines @@
 }
 
 void SelectionEditor::setVisibleSelection(const VisibleSelection& newSelection, FrameSelection::SetSelectionOptions options)
 {
     m_selection = newSelection;
     if (options & FrameSelection::DoNotAdjustInComposedTree) {
         m_selectionInComposedTree.setWithoutValidation(toPositionInComposedTree(m_selection.base()), toPositionInComposedTree(m_selection.extent()));
         return;
     }
 
-    SelectionAdjuster::adjustSelectionInComposedTree(&m_selectionInComposedTree, m_selection);
+    adjustVisibleSelectionInComposedTree();
 }
 
 void SelectionEditor::setVisibleSelection(const VisibleSelectionInComposedTree& newSelection, FrameSelection::SetSelectionOptions options)
 {
     ASSERT(!(options & FrameSelection::DoNotAdjustInComposedTree));
     m_selectionInComposedTree = newSelection;
-    SelectionAdjuster::adjustSelectionInDOMTree(&m_selection, m_selectionInComposedTree);
+    adjustVisibleSelectionInDOMTree();
 }
 
-// TODO(yosin): We should move
-// |SelectionAdjuster::adjustSelectionInComposedTree()| to
-// "SelectionAdjuster.cpp"
-// Updates |selectionInComposedTree| to match with |selection|.
-void SelectionAdjuster::adjustSelectionInComposedTree(VisibleSelectionInComposedTree* selectionInComposedTree, const VisibleSelection& selection)
+// Updates |m_selectionInComposedTree| to match with |m_selection|.
+void SelectionEditor::adjustVisibleSelectionInComposedTree()
 {
-    if (selection.isNone()) {
-        *selectionInComposedTree = VisibleSelectionInComposedTree();
+    if (m_selection.isNone()) {
+        m_selectionInComposedTree = VisibleSelectionInComposedTree();
         return;
     }
 
-    const PositionInComposedTree& base = toPositionInComposedTree(selection.base());
-    const PositionInComposedTree& extent = toPositionInComposedTree(selection.extent());
-    const PositionInComposedTree& position1 = toPositionInComposedTree(selection.start());
-    const PositionInComposedTree& position2 = toPositionInComposedTree(selection.end());
+    const PositionInComposedTree base = toPositionInComposedTree(m_selection.base());
+    const PositionInComposedTree extent = toPositionInComposedTree(m_selection.extent());
+    const PositionInComposedTree position1 = toPositionInComposedTree(m_selection.start());
+    const PositionInComposedTree position2 = toPositionInComposedTree(m_selection.end());
     position1.anchorNode()->updateDistribution();
     position2.anchorNode()->updateDistribution();
-    selectionInComposedTree->m_base = base;
-    selectionInComposedTree->m_extent = extent;
-    selectionInComposedTree->m_affinity = selection.m_affinity;
-    selectionInComposedTree->m_isDirectional = selection.m_isDirectional;
-    selectionInComposedTree->m_baseIsFirst = base.isNull() || base.compareTo(extent) <= 0;
     if (position1.compareTo(position2) <= 0) {
-        selectionInComposedTree->m_start = position1;
-        selectionInComposedTree->m_end = position2;
-    } else {
-        selectionInComposedTree->m_start = position2;
-        selectionInComposedTree->m_end = position1;
+        m_selectionInComposedTree = VisibleSelectionInComposedTree::createWithoutValidation(base, extent, position1, position2, m_selection.affinity(), m_selection.isDirectional());
+        return;
     }
-    selectionInComposedTree->updateSelectionType();
+    m_selectionInComposedTree = VisibleSelectionInComposedTree::createWithoutValidation(base, extent, position2, position1, m_selection.affinity(), m_selection.isDirectional());
 }
 
 static bool isCrossingShadowBoundaries(const VisibleSelectionInComposedTree& selection)
 {
     if (!selection.isRange())
         return false;
     TreeScope& treeScope = selection.base().anchorNode()->treeScope();
     return selection.extent().anchorNode()->treeScope() != treeScope
         || selection.start().anchorNode()->treeScope() != treeScope
         || selection.end().anchorNode()->treeScope() != treeScope;
 }
 
-// TODO(yosin): We should move
-// |SelectionAdjuster::adjustSelectionInDOMTree()| to
-// "SelectionAdjuster.cpp"
-void SelectionAdjuster::adjustSelectionInDOMTree(VisibleSelection* selection, const VisibleSelectionInComposedTree& selectionInComposedTree)
+void SelectionEditor::adjustVisibleSelectionInDOMTree()
 {
-    if (selectionInComposedTree.isNone()) {
-        *selection = VisibleSelection();
+    if (m_selectionInComposedTree.isNone()) {
+        m_selection = VisibleSelection();
         return;
     }
 
-    const Position& base = toPositionInDOMTree(selectionInComposedTree.base());
-    const Position& extent = toPositionInDOMTree(selectionInComposedTree.extent());
+    const Position base = toPositionInDOMTree(m_selectionInComposedTree.base());
+    const Position extent = toPositionInDOMTree(m_selectionInComposedTree.extent());
 
-    if (isCrossingShadowBoundaries(selectionInComposedTree)) {
-        *selection = VisibleSelection(base, extent);
+    if (isCrossingShadowBoundaries(m_selectionInComposedTree)) {
+        m_selection = VisibleSelection(base, extent);
         return;
     }
 
-    const Position& position1 = toPositionInDOMTree(selectionInComposedTree.start());
-    const Position& position2 = toPositionInDOMTree(selectionInComposedTree.end());
-    selection->m_base = base;
-    selection->m_extent = extent;
-    selection->m_affinity = selectionInComposedTree.m_affinity;
-    selection->m_isDirectional = selectionInComposedTree.m_isDirectional;
-    selection->m_baseIsFirst = base.isNull() || base.compareTo(extent) <= 0;
-    if (position1.compareTo(position2) <= 0) {
-        selection->m_start = position1;
-        selection->m_end = position2;
-    } else {
-        selection->m_start = position2;
-        selection->m_end = position1;
+    const Position start = toPositionInDOMTree(m_selectionInComposedTree.start());
+    const Position end = toPositionInDOMTree(m_selectionInComposedTree.end());
+    const TextAffinity affinity = m_selectionInComposedTree.affinity();
+    const bool isDirectional = m_selectionInComposedTree.isDirectional();
+    if (start.compareTo(end) <= 0) {
+        m_selection = VisibleSelection::createWithoutValidation(base, extent, start, end, affinity, isDirectional);
+        return;
     }
-    selection->updateSelectionType();
+    m_selection = VisibleSelection::createWithoutValidation(base, extent, end, start, affinity, isDirectional);
 }
 
 void SelectionEditor::resetXPosForVerticalArrowNavigation()
 {
     m_xPosForVerticalArrowNavigation = NoXPosForVerticalArrowNavigation();
 }
 
 void SelectionEditor::setIsDirectional(bool isDirectional)
 {
     m_selection.setIsDirectional(isDirectional);
@@ skipping 777 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