Moves an implementation of LayoutView::commitPendingSelection() to PendingSelection::commit()

Source/core/layout/LayoutView.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 755 matching lines @@
 
 void LayoutView::setSelection(const FrameSelection& selection)
 {
     // No need to create a pending clearSelection() to be executed in PendingSelection::commit()
     // if there's no selection, since it's no-op. This is a frequent code path worth to optimize.
     if (selection.isNone() && !m_selectionStart && !m_selectionEnd && !hasPendingSelection())
         return;
     m_pendingSelection->setSelection(selection);
 }
 
-template <typename Strategy>
-void LayoutView::commitPendingSelectionAlgorithm()
-{
-    using PositionType = typename Strategy::PositionType;
-
-    if (!hasPendingSelection())
-        return;
-    ASSERT(!needsLayout());
-
-    // Skip if pending VisibilePositions became invalid before we reach here.
-    if (!m_pendingSelection->isInDocument(document())) {
-        m_pendingSelection->clear();
-        return;
-    }
-
-    // Construct a new VisibleSolution, since m_selection is not necessarily valid, and the following steps
-    // assume a valid selection. See <https://bugs.webkit.org/show_bug.cgi?id=69563> and <rdar://problem/10232866>.
-    VisibleSelection selection = m_pendingSelection->calcVisibleSelection();
-    m_pendingSelection->clear();
-
-    if (!selection.isRange()) {
-        clearSelection();
-        return;
-    }
-
-    // Use the rightmost candidate for the start of the selection, and the leftmost candidate for the end of the selection.
-    // Example: foo <a>bar</a>.  Imagine that a line wrap occurs after 'foo', and that 'bar' is selected.   If we pass [foo, 3]
-    // as the start of the selection, the selection painting code will think that content on the line containing 'foo' is selected
-    // and will fill the gap before 'bar'.
-    PositionType startPos = Strategy::selectionStart(selection);
-    PositionType candidate = mostForwardCaretPosition(startPos);
-    if (isVisuallyEquivalentCandidate(candidate))
-        startPos = candidate;
-    PositionType endPos = Strategy::selectionEnd(selection);
-    candidate = mostBackwardCaretPosition(endPos);
-    if (isVisuallyEquivalentCandidate(candidate))
-        endPos = candidate;
-
-    // We can get into a state where the selection endpoints map to the same VisiblePosition when a selection is deleted
-    // because we don't yet notify the FrameSelection of text removal.
-    if (startPos.isNull() || endPos.isNull() || Strategy::selectionVisibleStart(selection).deepEquivalent() == Strategy::selectionVisibleEnd(selection).deepEquivalent())
-        return;
-    LayoutObject* startLayoutObject = startPos.anchorNode()->layoutObject();
-    LayoutObject* endLayoutObject = endPos.anchorNode()->layoutObject();
-    if (!startLayoutObject || !endLayoutObject)
-        return;
-    ASSERT(startLayoutObject->view() == this && endLayoutObject->view() == this);
-    setSelection(startLayoutObject, startPos.computeEditingOffset(), endLayoutObject, endPos.computeEditingOffset());
-}
-
 void LayoutView::commitPendingSelection()
 {
-    if (RuntimeEnabledFeatures::selectionForComposedTreeEnabled())
-        return commitPendingSelectionAlgorithm<VisibleSelection::InComposedTree>();
-    commitPendingSelectionAlgorithm<VisibleSelection::InDOMTree>();
+    m_pendingSelection->commit(*this);
 }
 
 LayoutObject* LayoutView::selectionStart()
 {
     commitPendingSelection();
     return m_selectionStart;
 }
 
 LayoutObject* LayoutView::selectionEnd()
 {
@@ skipping 165 matching lines @@
     return viewHeight(IncludeScrollbars) / scale;
 }
 
 void LayoutView::willBeDestroyed()
 {
     LayoutBlockFlow::willBeDestroyed();
     m_compositor.clear();
 }
 
 } // namespace blink