diff options
| author | Steve Block <steveblock@google.com> | 2010-05-26 10:11:43 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-27 11:14:42 +0100 |
| commit | e78cbe89e6f337f2f1fe40315be88f742b547151 (patch) | |
| tree | d778000b84a04f24bbad50c7fa66244365e960e9 /WebCore/editing/CompositeEditCommand.cpp | |
| parent | 7b582e96e4e909ed7dba1e07153d20fbddaec3f7 (diff) | |
| download | external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.zip external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.tar.gz external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.tar.bz2 | |
Merge WebKit at r60074: Initial merge by git
Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
Diffstat (limited to 'WebCore/editing/CompositeEditCommand.cpp')
| -rw-r--r-- | WebCore/editing/CompositeEditCommand.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/editing/CompositeEditCommand.cpp b/WebCore/editing/CompositeEditCommand.cpp index 9dc918d..e33f143 100644 --- a/WebCore/editing/CompositeEditCommand.cpp +++ b/WebCore/editing/CompositeEditCommand.cpp @@ -940,7 +940,7 @@ void CompositeEditCommand::moveParagraphs(const VisiblePosition& startOfParagrap // too, <div><b><br></b></div> for example. Save it so that we can preserve it later. RefPtr<CSSMutableStyleDeclaration> styleInEmptyParagraph; if (startOfParagraphToMove == endOfParagraphToMove && preserveStyle) { - styleInEmptyParagraph = editingStyleAtPosition(startOfParagraphToMove.deepEquivalent(), IncludeTypingStyle); + styleInEmptyParagraph = ApplyStyleCommand::editingStyleAtPosition(startOfParagraphToMove.deepEquivalent(), IncludeTypingStyle); // The moved paragraph should assume the block style of the destination. styleInEmptyParagraph->removeBlockProperties(); } @@ -1003,7 +1003,7 @@ bool CompositeEditCommand::breakOutOfEmptyListItem() if (!emptyListItem) return false; - RefPtr<CSSMutableStyleDeclaration> style = editingStyleAtPosition(endingSelection().start(), IncludeTypingStyle); + RefPtr<CSSMutableStyleDeclaration> style = ApplyStyleCommand::editingStyleAtPosition(endingSelection().start(), IncludeTypingStyle); Node* listNode = emptyListItem->parentNode(); // FIXME: Can't we do something better when the immediate parent wasn't a list node? |