Get rid of redundant member variable SelectionEditor::m_logicalRange

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
@@ skipping 43 matching lines @@
   m_selection = SelectionInDOMTree();
   m_cachedVisibleSelectionInDOMTree = VisibleSelection();
   m_cachedVisibleSelectionInFlatTree = VisibleSelectionInFlatTree();
   m_cacheIsDirty = false;
   if (!shouldAlwaysUseDirectionalSelection())
     return;
   m_selection.m_isDirectional = true;
 }
 
 void SelectionEditor::dispose() {
-  resetLogicalRange();
   clearDocumentCachedRange();
   clearVisibleSelection();
 }
 
 Document& SelectionEditor::document() const {
   DCHECK(lifecycleContext());
   return *lifecycleContext();
 }
 
 const VisibleSelection& SelectionEditor::computeVisibleSelectionInDOMTree()
@@ skipping 40 matching lines @@
     return;
   m_cachedVisibleSelectionInFlatTree = VisibleSelectionInFlatTree();
   m_cachedVisibleSelectionInDOMTree = VisibleSelection();
   m_cacheIsDirty = true;
 }
 
 void SelectionEditor::setSelection(const SelectionInDOMTree& newSelection) {
   newSelection.assertValidFor(document());
   if (m_selection == newSelection)
     return;
-  resetLogicalRange();
   clearDocumentCachedRange();
   markCacheDirty();
   m_selection = newSelection;
 }
 
 void SelectionEditor::didChangeChildren(const ContainerNode&) {
   markCacheDirty();
   didFinishDOMMutation();
 }
 
@@ skipping 207 matching lines @@
     didFinishDOMMutation();
     return;
   }
   const Position& newBase =
       updatePostionAfterAdoptingTextNodeSplit(m_selection.m_base, oldNode);
   const Position& newExtent =
       updatePostionAfterAdoptingTextNodeSplit(m_selection.m_extent, oldNode);
   didFinishTextChange(newBase, newExtent);
 }
 
-void SelectionEditor::resetLogicalRange() {
-  // Non-collapsed ranges are not allowed to start at the end of a line that
-  // is wrapped, they start at the beginning of the next line instead
-  if (!m_logicalRange)
-    return;
-  m_logicalRange->dispose();
-  m_logicalRange = nullptr;
-}
-
-void SelectionEditor::setLogicalRange(Range* range) {
-  DCHECK_EQ(range->ownerDocument(), document());
-  DCHECK(!m_logicalRange) << "A logical range should be one.";
-  m_logicalRange = range;
-}
-
 Range* SelectionEditor::firstRange() const {
-  if (m_logicalRange)
-    return m_logicalRange->cloneRange();

[yoichio, 2017/03/03 01:54:20]

Could you proof logically
  m_logicalRange == firstRangeOf(computeVisibleSelectionInDOMTree()) ?
Then, this code can be removed w/o any behavior change. 

   return firstRangeOf(computeVisibleSelectionInDOMTree());
 }
 
 bool SelectionEditor::shouldAlwaysUseDirectionalSelection() const {
   return frame()->editor().behavior().shouldConsiderSelectionAsDirectional();
 }
 
 bool SelectionEditor::needsUpdateVisibleSelection() const {
   return m_cacheIsDirty || m_styleVersion != document().styleVersion();
 }
 
 void SelectionEditor::updateCachedVisibleSelectionIfNeeded() const {
   // Note: Since we |FrameCaret::updateApperance()| is called from
   // |FrameView::performPostLayoutTasks()|, we check lifecycle against
   // |AfterPerformLayout| instead of |LayoutClean|.
   DCHECK_GE(document().lifecycle().state(),
             DocumentLifecycle::AfterPerformLayout);
   assertSelectionValid();
   if (!needsUpdateVisibleSelection())
     return;

[Xiaocheng, 2017/03/02 20:34:24]

This patch has conflict with https://codereview.chromium.org/2724333002.

Could you make it a dependant patch? (Or just be more careful when
committing...)

[yosin_UTC9, 2017/03/03 10:35:15]

Dependent patch doesn't work well for me; I use four work spaces, 3 on office, 1
on home and I failed on rebase dependent patches so far.
This is speculative workflow for lazy rebasing (rebase for commit; we don't sure
which patch is committed first).
For me, this is more cheap to rebase every day; I sync every morning.

 
   m_cachedVisibleSelectionInDOMTree = createVisibleSelection(m_selection);
   m_cachedVisibleSelectionInFlatTree = createVisibleSelection(
       SelectionInFlatTree::Builder()
           .setBaseAndExtent(toPositionInFlatTree(m_selection.base()),
                             toPositionInFlatTree(m_selection.extent()))
           .setAffinity(m_selection.affinity())
           .setHasTrailingWhitespace(m_selection.hasTrailingWhitespace())
           .setGranularity(m_selection.granularity())
           .setIsDirectional(m_selection.isDirectional())
@@ skipping 12 matching lines @@
 
 void SelectionEditor::clearDocumentCachedRange() {
   m_cachedRange = nullptr;
 }
 
 DEFINE_TRACE(SelectionEditor) {
   visitor->trace(m_frame);
   visitor->trace(m_selection);
   visitor->trace(m_cachedVisibleSelectionInDOMTree);
   visitor->trace(m_cachedVisibleSelectionInFlatTree);
-  visitor->trace(m_logicalRange);
   visitor->trace(m_cachedRange);
   SynchronousMutationObserver::trace(visitor);
 }
 
 }  // namespace blink