Clean up names related to EditCommandComposition

third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.h

 /*
  * Copyright (C) 2005, 2006, 2008 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 26 matching lines @@
 
 class EditingStyle;
 class Element;
 class HTMLBRElement;
 class HTMLElement;
 class HTMLSpanElement;
 class Text;
 
 enum class EditCommandSource { kMenuOrKeyBinding, kDOM };
 
-// TODO(xiaochengh): Cleanup the names with term "composition".
 class CORE_EXPORT CompositeEditCommand : public EditCommand {
  public:
   enum ShouldPreserveSelection { PreserveSelection, DoNotPreserveSelection };
   enum ShouldPreserveStyle { PreserveStyle, DoNotPreserveStyle };
 
   ~CompositeEditCommand() override;
 
   // Returns |false| if the command failed.  e.g. It's aborted.
   bool apply();
   bool isFirstCommand(EditCommand* command) {
     return !m_commands.isEmpty() && m_commands.front() == command;
   }
-  UndoStep* composition() { return m_composition.get(); }
-  UndoStep* ensureComposition();
-  // Append composition from an already applied command.
-  void appendCommandToComposite(CompositeEditCommand*);
+  UndoStep* undoStep() { return m_undoStep.get(); }
+  UndoStep* ensureUndoStep();
+  // Append undo step from an already applied command.
+  void appendCommandToUndoStep(CompositeEditCommand*);
 
   virtual bool isReplaceSelectionCommand() const;
   virtual bool isTypingCommand() const;
   virtual bool isCommandGroupWrapper() const;
   virtual bool isDragAndDropCommand() const;
   virtual bool preservesTypingStyle() const;
   virtual void setShouldRetainAutocorrectionIndicator(bool);
   virtual bool shouldStopCaretBlinking() const { return false; }
 
   DECLARE_VIRTUAL_TRACE();
@@ skipping 143 matching lines @@
   Position positionAvoidingSpecialElementBoundary(const Position&,
                                                   EditingState*);
 
   Node* splitTreeToNode(Node*, Node*, bool splitAncestor = false);
 
   HeapVector<Member<EditCommand>> m_commands;
 
  private:
   bool isCompositeEditCommand() const final { return true; }
 
-  Member<UndoStep> m_composition;
+  Member<UndoStep> m_undoStep;
 };
 
 DEFINE_TYPE_CASTS(CompositeEditCommand,
                   EditCommand,
                   command,
                   command->isCompositeEditCommand(),
                   command.isCompositeEditCommand());
 
 }  // namespace blink
 
 #endif  // CompositeEditCommand_h