| 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 27dafaf45f88b13e0cdf9546e3f2ace3dc4adf51..4f79038db86e058eb80e5fcaa754c2dbfc906968 100644
|
| --- a/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp
|
| @@ -79,102 +79,6 @@ namespace blink {
|
|
|
| using namespace HTMLNames;
|
|
|
| -EditCommandComposition* EditCommandComposition::create(
|
| - Document* document,
|
| - const VisibleSelection& startingSelection,
|
| - const VisibleSelection& endingSelection,
|
| - InputEvent::InputType inputType) {
|
| - return new EditCommandComposition(document, startingSelection,
|
| - endingSelection, inputType);
|
| -}
|
| -
|
| -EditCommandComposition::EditCommandComposition(
|
| - Document* document,
|
| - const VisibleSelection& startingSelection,
|
| - const VisibleSelection& endingSelection,
|
| - InputEvent::InputType inputType)
|
| - : m_document(document),
|
| - m_startingSelection(startingSelection),
|
| - m_endingSelection(endingSelection),
|
| - m_startingRootEditableElement(startingSelection.rootEditableElement()),
|
| - m_endingRootEditableElement(endingSelection.rootEditableElement()),
|
| - m_inputType(inputType) {}
|
| -
|
| -void EditCommandComposition::unapply() {
|
| - DCHECK(m_document);
|
| - LocalFrame* frame = m_document->frame();
|
| - DCHECK(frame);
|
| -
|
| - // Changes to the document may have been made since the last editing operation
|
| - // that require a layout, as in <rdar://problem/5658603>. Low level
|
| - // operations, like RemoveNodeCommand, don't require a layout because the high
|
| - // level operations that use them perform one if one is necessary (like for
|
| - // the creation of VisiblePositions).
|
| - m_document->updateStyleAndLayoutIgnorePendingStylesheets();
|
| -
|
| - {
|
| - size_t size = m_commands.size();
|
| - for (size_t i = size; i; --i)
|
| - m_commands[i - 1]->doUnapply();
|
| - }
|
| -
|
| - frame->editor().unappliedEditing(this);
|
| -}
|
| -
|
| -void EditCommandComposition::reapply() {
|
| - DCHECK(m_document);
|
| - LocalFrame* frame = m_document->frame();
|
| - DCHECK(frame);
|
| -
|
| - // Changes to the document may have been made since the last editing operation
|
| - // that require a layout, as in <rdar://problem/5658603>. Low level
|
| - // operations, like RemoveNodeCommand, don't require a layout because the high
|
| - // level operations that use them perform one if one is necessary (like for
|
| - // the creation of VisiblePositions).
|
| - m_document->updateStyleAndLayoutIgnorePendingStylesheets();
|
| -
|
| - {
|
| - for (const auto& command : m_commands)
|
| - command->doReapply();
|
| - }
|
| -
|
| - frame->editor().reappliedEditing(this);
|
| -}
|
| -
|
| -InputEvent::InputType EditCommandComposition::inputType() const {
|
| - return m_inputType;
|
| -}
|
| -
|
| -void EditCommandComposition::append(SimpleEditCommand* command) {
|
| - m_commands.push_back(command);
|
| -}
|
| -
|
| -void EditCommandComposition::append(EditCommandComposition* composition) {
|
| - m_commands.appendVector(composition->m_commands);
|
| -}
|
| -
|
| -void EditCommandComposition::setStartingSelection(
|
| - const VisibleSelection& selection) {
|
| - m_startingSelection = selection;
|
| - m_startingRootEditableElement = selection.rootEditableElement();
|
| -}
|
| -
|
| -void EditCommandComposition::setEndingSelection(
|
| - const VisibleSelection& selection) {
|
| - m_endingSelection = selection;
|
| - m_endingRootEditableElement = selection.rootEditableElement();
|
| -}
|
| -
|
| -DEFINE_TRACE(EditCommandComposition) {
|
| - visitor->trace(m_document);
|
| - visitor->trace(m_startingSelection);
|
| - visitor->trace(m_endingSelection);
|
| - visitor->trace(m_commands);
|
| - visitor->trace(m_startingRootEditableElement);
|
| - visitor->trace(m_endingRootEditableElement);
|
| - UndoStep::trace(visitor);
|
| -}
|
| -
|
| CompositeEditCommand::CompositeEditCommand(Document& document)
|
| : EditCommand(document) {}
|
|
|
|
|