Revert of Move SelectionAdjust to its own file

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
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/editing/SelectionEditor.h"
 
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/Editor.h"
-#include "core/editing/SelectionAdjuster.h"
 #include "core/events/Event.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/line/InlineTextBox.h"
 #include "core/page/SpatialNavigation.h"
 
 namespace blink {
 
 static inline LayoutUnit NoXPosForVerticalArrowNavigation()
@@ skipping 50 matching lines @@
     SelectionAdjuster::adjustSelectionInComposedTree(&m_selectionInComposedTree, m_selection);
 }
 
 void SelectionEditor::setVisibleSelection(const VisibleSelectionInComposedTree& newSelection, FrameSelection::SetSelectionOptions options)
 {
     ASSERT(!(options & FrameSelection::DoNotAdjustInComposedTree));
     m_selectionInComposedTree = newSelection;
     SelectionAdjuster::adjustSelectionInDOMTree(&m_selection, m_selectionInComposedTree);
 }
 
+// TODO(yosin): We should move
+// |SelectionAdjuster::adjustSelectionInComposedTree()| to
+// "SelectionAdjuster.cpp"
+// Updates |selectionInComposedTree| to match with |selection|.
+void SelectionAdjuster::adjustSelectionInComposedTree(VisibleSelectionInComposedTree* selectionInComposedTree, const VisibleSelection& selection)
+{
+    if (selection.isNone()) {
+        *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());
+    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;
+    }
+    selectionInComposedTree->updateSelectionType();
+}
+
+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)
+{
+    if (selectionInComposedTree.isNone()) {
+        *selection = VisibleSelection();
+        return;
+    }
+
+    const Position& base = toPositionInDOMTree(selectionInComposedTree.base());
+    const Position& extent = toPositionInDOMTree(selectionInComposedTree.extent());
+
+    if (isCrossingShadowBoundaries(selectionInComposedTree)) {
+        *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;
+    }
+    selection->updateSelectionType();
+}
+
 void SelectionEditor::resetXPosForVerticalArrowNavigation()
 {
     m_xPosForVerticalArrowNavigation = NoXPosForVerticalArrowNavigation();
 }
 
 void SelectionEditor::setIsDirectional(bool isDirectional)
 {
     m_selection.setIsDirectional(isDirectional);
     m_selectionInComposedTree.setIsDirectional(isDirectional);
 }
@@ skipping 775 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