| Index: third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp b/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp
|
| index ee81dce271d7319aab59e5652f6a218db8f031a0..866d02dfe99734e203c106c3f9c8b144b4f294f3 100644
|
| --- a/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp
|
| @@ -82,23 +82,20 @@ using namespace HTMLNames;
|
| EditCommandComposition* EditCommandComposition::create(
|
| Document* document,
|
| const VisibleSelection& startingSelection,
|
| - const VisibleSelection& endingSelection,
|
| - InputEvent::InputType inputType) {
|
| + const VisibleSelection& endingSelection) {
|
| return new EditCommandComposition(document, startingSelection,
|
| - endingSelection, inputType);
|
| + endingSelection);
|
| }
|
|
|
| EditCommandComposition::EditCommandComposition(
|
| Document* document,
|
| const VisibleSelection& startingSelection,
|
| - const VisibleSelection& endingSelection,
|
| - InputEvent::InputType inputType)
|
| + const VisibleSelection& endingSelection)
|
| : m_document(document),
|
| m_startingSelection(startingSelection),
|
| m_endingSelection(endingSelection),
|
| m_startingRootEditableElement(startingSelection.rootEditableElement()),
|
| - m_endingRootEditableElement(endingSelection.rootEditableElement()),
|
| - m_inputType(inputType) {}
|
| + m_endingRootEditableElement(endingSelection.rootEditableElement()) {}
|
|
|
| bool EditCommandComposition::belongsTo(const LocalFrame& frame) const {
|
| DCHECK(m_document);
|
| @@ -162,10 +159,6 @@ bool EditCommandComposition::willReapply(EditCommandSource) {
|
| return true;
|
| }
|
|
|
| -InputEvent::InputType EditCommandComposition::inputType() const {
|
| - return m_inputType;
|
| -}
|
| -
|
| void EditCommandComposition::append(SimpleEditCommand* command) {
|
| m_commands.push_back(command);
|
| }
|
| @@ -262,9 +255,10 @@ EditCommandComposition* CompositeEditCommand::ensureComposition() {
|
| CompositeEditCommand* command = this;
|
| while (command && command->parent())
|
| command = command->parent();
|
| - if (!command->m_composition)
|
| + if (!command->m_composition) {
|
| command->m_composition = EditCommandComposition::create(
|
| - &document(), startingSelection(), endingSelection(), inputType());
|
| + &document(), startingSelection(), endingSelection());
|
| + }
|
| return command->m_composition.get();
|
| }
|
|
|
|
|