diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/editing/CompositeEditCommand.h | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/editing/CompositeEditCommand.h')
| -rw-r--r-- | Source/WebCore/editing/CompositeEditCommand.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/WebCore/editing/CompositeEditCommand.h b/Source/WebCore/editing/CompositeEditCommand.h index 9066b65..4b96d8f 100644 --- a/Source/WebCore/editing/CompositeEditCommand.h +++ b/Source/WebCore/editing/CompositeEditCommand.h @@ -32,7 +32,6 @@ namespace WebCore { -class CSSStyleDeclaration; class EditingStyle; class HTMLElement; class StyledElement; @@ -50,7 +49,7 @@ protected: // // sugary-sweet convenience functions to help create and apply edit commands in composite commands // - void appendNode(PassRefPtr<Node>, PassRefPtr<Element> parent); + void appendNode(PassRefPtr<Node>, PassRefPtr<ContainerNode> parent); void applyCommandToComposite(PassRefPtr<EditCommand>); void applyStyle(const EditingStyle*, EditAction = EditActionChangeAttributes); void applyStyle(const EditingStyle*, const Position& start, const Position& end, EditAction = EditActionChangeAttributes); @@ -110,7 +109,7 @@ protected: void moveParagraphs(const VisiblePosition&, const VisiblePosition&, const VisiblePosition&, bool preserveSelection = false, bool preserveStyle = true); void moveParagraphWithClones(const VisiblePosition& startOfParagraphToMove, const VisiblePosition& endOfParagraphToMove, Element* blockElement, Node* outerNode); void cloneParagraphUnderNewElement(Position& start, Position& end, Node* outerNode, Element* blockElement); - void cleanupAfterDeletion(); + void cleanupAfterDeletion(VisiblePosition destination = VisiblePosition()); bool breakOutOfEmptyListItem(); bool breakOutOfEmptyMailBlockquotedParagraph(); |