| 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 7bcefc8d95781f7bc46dc53e7937e6c557740f6a..141ad348861ab8d7c72fb40a2a3ae1e99c81684d 100644
|
| --- a/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.h
|
| +++ b/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.h
|
| @@ -114,7 +114,7 @@ protected:
|
| void insertNodeBefore(PassRefPtrWillBeRawPtr<Node>, PassRefPtrWillBeRawPtr<Node> refChild, EditingState* = ASSERT_NO_EDITING_ABORT, ShouldAssumeContentIsAlwaysEditable = DoNotAssumeContentIsAlwaysEditable);
|
| void insertParagraphSeparator(bool useDefaultParagraphElement = false, bool pasteBlockqutoeIntoUnquotedArea = false);
|
| void insertTextIntoNode(PassRefPtrWillBeRawPtr<Text>, unsigned offset, const String& text);
|
| - void mergeIdenticalElements(PassRefPtrWillBeRawPtr<Element>, PassRefPtrWillBeRawPtr<Element>);
|
| + void mergeIdenticalElements(PassRefPtrWillBeRawPtr<Element>, PassRefPtrWillBeRawPtr<Element>, EditingState*);
|
| void rebalanceWhitespace();
|
| void rebalanceWhitespaceAt(const Position&);
|
| void rebalanceWhitespaceOnTextSubstring(PassRefPtrWillBeRawPtr<Text>, int startOffset, int endOffset);
|
| @@ -124,14 +124,14 @@ protected:
|
| bool shouldRebalanceLeadingWhitespaceFor(const String&) const;
|
| void removeCSSProperty(PassRefPtrWillBeRawPtr<Element>, CSSPropertyID);
|
| void removeElementAttribute(PassRefPtrWillBeRawPtr<Element>, const QualifiedName& attribute);
|
| - void removeChildrenInRange(PassRefPtrWillBeRawPtr<Node>, unsigned from, unsigned to);
|
| - virtual void removeNode(PassRefPtrWillBeRawPtr<Node>, EditingState* = ASSERT_NO_EDITING_ABORT, ShouldAssumeContentIsAlwaysEditable = DoNotAssumeContentIsAlwaysEditable);
|
| + void removeChildrenInRange(PassRefPtrWillBeRawPtr<Node>, unsigned from, unsigned to, EditingState*);
|
| + virtual void removeNode(PassRefPtrWillBeRawPtr<Node>, EditingState*, ShouldAssumeContentIsAlwaysEditable = DoNotAssumeContentIsAlwaysEditable);
|
| HTMLSpanElement* replaceElementWithSpanPreservingChildrenAndAttributes(PassRefPtrWillBeRawPtr<HTMLElement>);
|
| void removeNodePreservingChildren(PassRefPtrWillBeRawPtr<Node>, EditingState* = ASSERT_NO_EDITING_ABORT, ShouldAssumeContentIsAlwaysEditable = DoNotAssumeContentIsAlwaysEditable);
|
| - void removeNodeAndPruneAncestors(PassRefPtrWillBeRawPtr<Node>, Node* excludeNode = nullptr);
|
| - void moveRemainingSiblingsToNewParent(Node*, Node* pastLastNodeToMove, PassRefPtrWillBeRawPtr<Element> prpNewParent);
|
| + void removeNodeAndPruneAncestors(PassRefPtrWillBeRawPtr<Node>, EditingState*, Node* excludeNode = nullptr);
|
| + void moveRemainingSiblingsToNewParent(Node*, Node* pastLastNodeToMove, PassRefPtrWillBeRawPtr<Element> prpNewParent, EditingState*);
|
| void updatePositionForNodeRemovalPreservingChildren(Position&, Node&);
|
| - void prune(PassRefPtrWillBeRawPtr<Node>, Node* excludeNode = nullptr);
|
| + void prune(PassRefPtrWillBeRawPtr<Node>, EditingState*, Node* excludeNode = nullptr);
|
| void replaceTextInNode(PassRefPtrWillBeRawPtr<Text>, unsigned offset, unsigned count, const String& replacementText);
|
| Position replaceSelectedTextInNode(const String&);
|
| void replaceTextInNodePreservingMarkers(PassRefPtrWillBeRawPtr<Text>, unsigned offset, unsigned count, const String& replacementText);
|
| @@ -162,10 +162,10 @@ protected:
|
| void moveParagraphs(const VisiblePosition&, const VisiblePosition&, const VisiblePosition&, EditingState*, bool preserveSelection = false, bool preserveStyle = true, Node* constrainingAncestor = nullptr);
|
| void moveParagraphWithClones(const VisiblePosition& startOfParagraphToMove, const VisiblePosition& endOfParagraphToMove, HTMLElement* blockElement, Node* outerNode, EditingState* = ASSERT_NO_EDITING_ABORT);
|
| void cloneParagraphUnderNewElement(const Position& start, const Position& end, Node* outerNode, Element* blockElement, EditingState*);
|
| - void cleanupAfterDeletion(VisiblePosition destination = VisiblePosition());
|
| + void cleanupAfterDeletion(EditingState*, VisiblePosition destination = VisiblePosition());
|
|
|
| - bool breakOutOfEmptyListItem();
|
| - bool breakOutOfEmptyMailBlockquotedParagraph();
|
| + bool breakOutOfEmptyListItem(EditingState*);
|
| + bool breakOutOfEmptyMailBlockquotedParagraph(EditingState*);
|
|
|
| Position positionAvoidingSpecialElementBoundary(const Position&, EditingState*);
|
|
|
|
|