Move layouet/LayoutView::setSelection() to editing/LayoutSelection

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 13 matching lines @@
 #include "core/dom/Document.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/VisiblePosition.h"
 #include "core/editing/VisibleUnits.h"
 #include "core/html/TextControlElement.h"
 #include "core/layout/LayoutView.h"
 
 namespace blink {
 
-LayoutSelection::LayoutSelection(FrameSelection& frame_selection)
-    : frame_selection_(&frame_selection), has_pending_selection_(false) {}
+LayoutSelection::LayoutSelection(FrameSelection& frameSelection)

[dcheng, 2017/04/11 06:29:14]

Nit: mind fixing the name to be frame_selection?

[yoichio, 2017/04/11 07:23:58]

Done.

+    : frame_selection_(&frameSelection),
+      has_pending_selection_(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() &&
@@ skipping 74 matching lines @@
     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()) {
-    layout_view.ClearSelection();
+    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'.
   PositionInFlatTree start_pos = selection.Start();
@@ skipping 11 matching lines @@
   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());
-  layout_view.SetSelection(start_layout_object,
-                           start_pos.ComputeEditingOffset(), end_layout_object,
-                           end_pos.ComputeEditingOffset());
+  SetSelection(start_layout_object, start_pos.ComputeEditingOffset(),
+               end_layout_object, end_pos.ComputeEditingOffset());
+}
+
+void LayoutSelection::OnDocumentShutdown() {
+  has_pending_selection_ = false;
+  selection_start_ = nullptr;
+  selection_end_ = nullptr;
+  selection_start_pos_ = -1;
+  selection_end_pos_ = -1;
 }
 
 DEFINE_TRACE(LayoutSelection) {
   visitor->Trace(frame_selection_);
 }
 
 }  // namespace blink