| Index: third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.h
|
| diff --git a/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.h b/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.h
|
| index 35caddecfd6c0dfb2ee6ac7f559b94366f265345..f9a287c7653e2b851ac84a61e53144b964bc9ac5 100644
|
| --- a/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.h
|
| +++ b/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.h
|
| @@ -44,6 +44,7 @@ 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 };
|
| @@ -56,8 +57,8 @@ class CORE_EXPORT CompositeEditCommand : public EditCommand {
|
| bool isFirstCommand(EditCommand* command) {
|
| return !m_commands.isEmpty() && m_commands.front() == command;
|
| }
|
| - EditCommandComposition* composition() { return m_composition.get(); }
|
| - EditCommandComposition* ensureComposition();
|
| + UndoStep* composition() { return m_composition.get(); }
|
| + UndoStep* ensureComposition();
|
| // Append composition from an already applied command.
|
| void appendCommandToComposite(CompositeEditCommand*);
|
|
|
| @@ -223,7 +224,7 @@ class CORE_EXPORT CompositeEditCommand : public EditCommand {
|
| private:
|
| bool isCompositeEditCommand() const final { return true; }
|
|
|
| - Member<EditCommandComposition> m_composition;
|
| + Member<UndoStep> m_composition;
|
| };
|
|
|
| DEFINE_TYPE_CASTS(CompositeEditCommand,
|
|
|