Move EditCommand::starting/endingSelection() to CompositeEditCommand (1/2)

third_party/WebKit/Source/core/editing/commands/EditCommand.cpp

 /*
  * Copyright (C) 2005, 2006, 2007 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 20 matching lines @@
 #include "core/editing/commands/CompositeEditCommand.h"
 #include "core/frame/LocalFrame.h"
 #include "core/layout/LayoutText.h"
 
 namespace blink {
 
 EditCommand::EditCommand(Document& document)
     : m_document(&document), m_parent(nullptr) {
   DCHECK(m_document);
   DCHECK(m_document->frame());
-  setStartingSelection(m_document->frame()->selection().selection());
-  setEndingVisibleSelection(m_startingSelection);
 }
 
 EditCommand::~EditCommand() {}
 
 InputEvent::InputType EditCommand::inputType() const {
   return InputEvent::InputType::None;
 }
 
 String EditCommand::textDataForInputEvent() const {
   return nullAtom;
 }
 
-static inline UndoStep* undoStepIfPossible(EditCommand* command) {
-  if (!command->isCompositeEditCommand())
-    return 0;
-  return toCompositeEditCommand(command)->undoStep();
-}
-
-void EditCommand::setStartingSelection(const VisibleSelection& selection) {
-  for (EditCommand* command = this;; command = command->m_parent) {
-    if (UndoStep* undoStep = undoStepIfPossible(command)) {
+// TODO(xiaochengh): Move it to CompositeEditCommand.cpp
+void CompositeEditCommand::setStartingSelection(
+    const VisibleSelection& selection) {
+  for (CompositeEditCommand* command = this;; command = command->parent()) {
+    if (UndoStep* undoStep = command->undoStep()) {
       DCHECK(command->isTopLevelCommand());
       undoStep->setStartingSelection(selection);
     }
     command->m_startingSelection = selection;
-    if (!command->m_parent || command->m_parent->isFirstCommand(command))
+    if (!command->parent() || command->parent()->isFirstCommand(command))
       break;
   }
 }
 
+// TODO(xiaochengh): Move it to CompositeEditCommand.cpp
 // TODO(yosin): We will make |SelectionInDOMTree| version of
 // |setEndingSelection()| as primary function instead of wrapper, once
 // |EditCommand| holds other than |VisibleSelection|.
-void EditCommand::setEndingSelection(const SelectionInDOMTree& selection) {
+void CompositeEditCommand::setEndingSelection(
+    const SelectionInDOMTree& selection) {
   // TODO(editing-dev): The use of
   // updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   document().updateStyleAndLayoutIgnorePendingStylesheets();
   setEndingVisibleSelection(createVisibleSelection(selection));
 }
 
+// TODO(xiaochengh): Move it to CompositeEditCommand.cpp
 // TODO(yosin): We will make |SelectionInDOMTree| version of
 // |setEndingSelection()| as primary function instead of wrapper.
-void EditCommand::setEndingVisibleSelection(const VisibleSelection& selection) {
-  for (EditCommand* command = this; command; command = command->m_parent) {
-    if (UndoStep* undoStep = undoStepIfPossible(command)) {
+void CompositeEditCommand::setEndingVisibleSelection(
+    const VisibleSelection& selection) {
+  for (CompositeEditCommand* command = this; command;
+       command = command->parent()) {
+    if (UndoStep* undoStep = command->undoStep()) {
       DCHECK(command->isTopLevelCommand());
       undoStep->setEndingSelection(selection);
     }
     command->m_endingSelection = selection;
   }
 }
 
 bool EditCommand::isRenderedCharacter(const Position& position) {
   if (position.isNull())
     return false;
   DCHECK(position.isOffsetInAnchor()) << position;
   if (!position.anchorNode()->isTextNode())
     return false;
 
   LayoutObject* layoutObject = position.anchorNode()->layoutObject();
   if (!layoutObject)
     return false;
 
   return toLayoutText(layoutObject)
       ->isRenderedCharacter(position.offsetInContainerNode());
 }
 
 void EditCommand::setParent(CompositeEditCommand* parent) {
   DCHECK((parent && !m_parent) || (!parent && m_parent));
   DCHECK(!parent || !isCompositeEditCommand() ||
          !toCompositeEditCommand(this)->undoStep());
   m_parent = parent;
+}
+
+// TODO(xiaochengh): Move it to CompositeEditCommand.cpp
+void CompositeEditCommand::setParent(CompositeEditCommand* parent) {
+  EditCommand::setParent(parent);
   if (parent) {
     m_startingSelection = parent->m_endingSelection;
     m_endingSelection = parent->m_endingSelection;
   }
 }
 
 void SimpleEditCommand::doReapply() {
   EditingState editingState;
   doApply(&editingState);
 }
 
 DEFINE_TRACE(EditCommand) {
   visitor->trace(m_document);
-  visitor->trace(m_startingSelection);
-  visitor->trace(m_endingSelection);
   visitor->trace(m_parent);
 }
 
 }  // namespace blink