Clean up names related to EditCommandComposition

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 34 matching lines @@
 EditCommand::~EditCommand() {}
 
 InputEvent::InputType EditCommand::inputType() const {
   return InputEvent::InputType::None;
 }
 
 String EditCommand::textDataForInputEvent() const {
   return nullAtom;
 }
 
-static inline UndoStep* compositionIfPossible(EditCommand* command) {
+static inline UndoStep* undoStepIfPossible(EditCommand* command) {
   if (!command->isCompositeEditCommand())
     return 0;
-  return toCompositeEditCommand(command)->composition();
+  return toCompositeEditCommand(command)->undoStep();
 }
 
 void EditCommand::setStartingSelection(const VisibleSelection& selection) {
   for (EditCommand* command = this;; command = command->m_parent) {
-    if (UndoStep* composition = compositionIfPossible(command)) {
+    if (UndoStep* undoStep = undoStepIfPossible(command)) {
       DCHECK(command->isTopLevelCommand());
-      composition->setStartingSelection(selection);
+      undoStep->setStartingSelection(selection);
     }
     command->m_startingSelection = selection;
     if (!command->m_parent || command->m_parent->isFirstCommand(command))
       break;
   }
 }
 
 // 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) {
   // 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(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* composition = compositionIfPossible(command)) {
+    if (UndoStep* undoStep = undoStepIfPossible(command)) {
       DCHECK(command->isTopLevelCommand());
-      composition->setEndingSelection(selection);
+      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)->composition());
+         !toCompositeEditCommand(this)->undoStep());
   m_parent = 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