Make DOMSelection cache Range

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/DOMSelection.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/Editor.h"
 #include "core/editing/SelectionAdjuster.h"
 #include "core/frame/LocalFrame.h"
 
 namespace blink {
 
 SelectionEditor::SelectionEditor(LocalFrame& frame)
     : m_frame(frame), m_observingVisibleSelection(false) {
   clearVisibleSelection();
@@ skipping 35 matching lines @@
 const VisibleSelectionInFlatTree&
 SelectionEditor::visibleSelection<EditingInFlatTreeStrategy>() const {
   DCHECK_EQ(frame()->document(), document());
   DCHECK_EQ(frame(), document().frame());
   if (m_selectionInFlatTree.isNone())
     return m_selectionInFlatTree;
   DCHECK_EQ(m_selectionInFlatTree.base().document(), document());
   return m_selectionInFlatTree;
 }
 
+static void markDOMSelectionDirty(const VisibleSelection& selection) {
+  if (selection.isNone())
+    return;
+
+  DCHECK(selection.start().anchorNode());

[yosin_UTC9, 2017/01/26 08:12:49]

nit: We don't need to have this DCHECK() because following statement uses it.

[yoichio, 2017/01/27 08:33:04]

Done.

+  selection.start().anchorNode()->treeScope().getSelection()->markRangeDirty();
+  if (selection.isCaret())
+    return;
+
+  DCHECK(selection.end().anchorNode());

[yosin_UTC9, 2017/01/26 08:12:49]

nit: We don't need to have this DCHECK() because following statement uses it.

[yoichio, 2017/01/27 08:33:04]

Done.

+  selection.end().anchorNode()->treeScope().getSelection()->markRangeDirty();
+}
+
 void SelectionEditor::setVisibleSelection(
     const VisibleSelection& newSelection,
     FrameSelection::SetSelectionOptions options) {
   DCHECK(newSelection.isValidFor(document())) << newSelection;
   resetLogicalRange();
+  markDOMSelectionDirty(m_selection);
+
   m_selection = newSelection;
   if (options & FrameSelection::DoNotAdjustInFlatTree) {
     m_selectionInFlatTree.setWithoutValidation(
         toPositionInFlatTree(m_selection.base()),
         toPositionInFlatTree(m_selection.extent()));
     return;
   }
 
   SelectionAdjuster::adjustSelectionInFlatTree(&m_selectionInFlatTree,
                                                m_selection);
+
+  markDOMSelectionDirty(m_selection);
 }
 
 void SelectionEditor::setVisibleSelection(
     const VisibleSelectionInFlatTree& newSelection,
     FrameSelection::SetSelectionOptions options) {
   DCHECK(newSelection.isValidFor(document())) << newSelection;
   DCHECK(!(options & FrameSelection::DoNotAdjustInFlatTree));
   resetLogicalRange();
+  markDOMSelectionDirty(m_selection);
+
   m_selectionInFlatTree = newSelection;
   SelectionAdjuster::adjustSelectionInDOMTree(&m_selection,
                                               m_selectionInFlatTree);
+
+  markDOMSelectionDirty(m_selection);
 }
 
 void SelectionEditor::setWithoutValidation(const Position& base,
                                            const Position& extent) {
   resetLogicalRange();
   if (base.isNotNull())
     DCHECK_EQ(base.document(), document());
   if (extent.isNotNull())
     DCHECK_EQ(extent.document(), document());
+  markDOMSelectionDirty(m_selection);
+
   m_selection.setWithoutValidation(base, extent);
   m_selectionInFlatTree.setWithoutValidation(toPositionInFlatTree(base),
                                              toPositionInFlatTree(extent));
+  markDOMSelectionDirty(m_selection);
 }
 
 void SelectionEditor::documentAttached(Document* document) {
   DCHECK(document);
   DCHECK(!m_document) << m_document;
   m_document = document;
 }
 
 void SelectionEditor::documentDetached(const Document& document) {
   DCHECK_EQ(m_document, &document);
@@ skipping 35 matching lines @@
 
 DEFINE_TRACE(SelectionEditor) {
   visitor->trace(m_document);
   visitor->trace(m_frame);
   visitor->trace(m_selection);
   visitor->trace(m_selectionInFlatTree);
   visitor->trace(m_logicalRange);
 }
 
 }  // namespace blink