Remove LayoutView from LayoutSelection::commit()

third_party/WebKit/Source/core/editing/LayoutSelection.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.
  *
@@ skipping 27 matching lines @@
       force_hide_(false),
       selection_start_(nullptr),
       selection_end_(nullptr),
       selection_start_pos_(-1),
       selection_end_pos_(-1) {}
 
 const VisibleSelection& LayoutSelection::GetVisibleSelection() const {
   return frame_selection_->ComputeVisibleSelectionInDOMTree();
 }
 
-static bool IsSelectionInDocument(
-    const VisibleSelectionInFlatTree& visible_selection,
-    const Document& document) {
-  const PositionInFlatTree& start = visible_selection.Start();
-  if (start.IsNotNull() &&
-      (!start.IsConnected() || start.GetDocument() != document))
-    return false;
-  const PositionInFlatTree& end = visible_selection.end();
-  if (end.IsNotNull() && (!end.IsConnected() || end.GetDocument() != document))
-    return false;
-  const PositionInFlatTree extent = visible_selection.Extent();
-  if (extent.IsNotNull() &&
-      (!extent.IsConnected() || extent.GetDocument() != document))
-    return false;
-  return true;
-}
-
 SelectionInFlatTree LayoutSelection::CalcVisibleSelection(
     const VisibleSelectionInFlatTree& original_selection) const {
   const PositionInFlatTree& start = original_selection.Start();
   const PositionInFlatTree& end = original_selection.end();
   SelectionType selection_type = original_selection.GetSelectionType();
   const TextAffinity affinity = original_selection.Affinity();
 
   bool paint_block_cursor =
       frame_selection_->ShouldShowBlockCursor() &&
       selection_type == SelectionType::kCaretSelection &&
@@ skipping 242 matching lines @@
 
   // Any new blocks that remain were not found in the old blocks dict, and so
   // they need to be updated.
   SelectedBlockMap::iterator new_blocks_end = new_selected_blocks.end();
   for (SelectedBlockMap::iterator i = new_selected_blocks.begin();
        i != new_blocks_end; ++i)
     i->key->SetShouldInvalidateSelection();
 }
 
 void LayoutSelection::SelectionStartEnd(int& start_pos, int& end_pos) {
-  Commit(*frame_selection_->GetDocument().GetLayoutView());
+  Commit();
   start_pos = selection_start_pos_;
   end_pos = selection_end_pos_;
 }
 
 void LayoutSelection::ClearSelection() {
   // For querying Layer::compositingState()
   // This is correct, since destroying layout objects needs to cause eager paint
   // invalidations.
   DisableCompositingQueryAsserts disabler;
 
   SetSelection(0, -1, 0, -1, kPaintInvalidationNewMinusOld);
 }
 
 void LayoutSelection::SetHasPendingSelection(PaintHint hint) {
   has_pending_selection_ = true;
   if (hint == PaintHint::kHide)
     force_hide_ = true;
   else if (hint == PaintHint::kPaint)
     force_hide_ = false;
 }
 
-void LayoutSelection::Commit(LayoutView& layout_view) {
+void LayoutSelection::Commit() {
   if (!HasPendingSelection())
     return;
-  DCHECK(!layout_view.NeedsLayout());
   has_pending_selection_ = false;
 
   const VisibleSelectionInFlatTree& original_selection =
       frame_selection_->ComputeVisibleSelectionInFlatTree();
 
-  // Skip if pending VisibilePositions became invalid before we reach here.
-  if (!IsSelectionInDocument(original_selection, layout_view.GetDocument()))
-    return;
-
   // Construct a new VisibleSolution, since visibleSelection() 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>.
   const VisibleSelectionInFlatTree& selection =
       CreateVisibleSelection(CalcVisibleSelection(original_selection));
 
   if (!selection.IsRange() || force_hide_) {
     ClearSelection();
     return;
@@ skipping 18 matching lines @@
   // |VisiblePosition| when a selection is deleted because we don't yet notify
   // the |FrameSelection| of text removal.
   if (start_pos.IsNull() || end_pos.IsNull() ||
       selection.VisibleStart().DeepEquivalent() ==
           selection.VisibleEnd().DeepEquivalent())
     return;
   LayoutObject* start_layout_object = start_pos.AnchorNode()->GetLayoutObject();
   LayoutObject* end_layout_object = end_pos.AnchorNode()->GetLayoutObject();
   if (!start_layout_object || !end_layout_object)
     return;
-  DCHECK(layout_view == start_layout_object->View());
-  DCHECK(layout_view == end_layout_object->View());
+  DCHECK(start_layout_object->View() == end_layout_object->View());
   SetSelection(start_layout_object, start_pos.ComputeEditingOffset(),
                end_layout_object, end_pos.ComputeEditingOffset());
 }
 
 void LayoutSelection::OnDocumentShutdown() {
   has_pending_selection_ = false;
   force_hide_ = false;
   selection_start_ = nullptr;
   selection_end_ = nullptr;
   selection_start_pos_ = -1;
@@ skipping 10 matching lines @@
   return object->SelectionRectInViewCoordinates();
 }
 
 IntRect LayoutSelection::SelectionBounds() {
   // Now create a single bounding box rect that encloses the whole selection.
   LayoutRect sel_rect;
 
   typedef HashSet<const LayoutBlock*> VisitedContainingBlockSet;
   VisitedContainingBlockSet visited_containing_blocks;
 
-  Commit(*frame_selection_->GetDocument().GetLayoutView());
+  Commit();
   LayoutObject* os = selection_start_;
   LayoutObject* stop =
       LayoutObjectAfterPosition(selection_end_, selection_end_pos_);
   while (os && os != stop) {
     if ((os->CanBeSelectionLeaf() || os == selection_start_ ||
          os == selection_end_) &&
         os->GetSelectionState() != SelectionNone) {
       // Blocks are responsible for painting line gaps and margin gaps. They
       // must be examined as well.
       sel_rect.Unite(SelectionRectForLayoutObject(os));
@@ skipping 27 matching lines @@
 
     o->SetShouldInvalidateSelection();
   }
 }
 
 DEFINE_TRACE(LayoutSelection) {
   visitor->Trace(frame_selection_);
 }
 
 }  // namespace blink