diff options
| author | Steve Block <steveblock@google.com> | 2012-04-13 07:44:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-13 07:44:48 -0700 |
| commit | 0d7a0fca6004661544e8bdfff9f96a0094eb0d4d (patch) | |
| tree | deaf5191751745c8686708d7e7d3456fe136810c | |
| parent | 4bce85f156520b887f758a4b03691c56f349f6e5 (diff) | |
| parent | 1da40458db9c373f30030565f5e2087f21683e0e (diff) | |
| download | external_webkit-0d7a0fca6004661544e8bdfff9f96a0094eb0d4d.zip external_webkit-0d7a0fca6004661544e8bdfff9f96a0094eb0d4d.tar.gz external_webkit-0d7a0fca6004661544e8bdfff9f96a0094eb0d4d.tar.bz2 | |
Merge "Cherry-pick WebKit change r94841 to fix a LayoutTest crash"
| -rw-r--r-- | Source/WebCore/editing/CompositeEditCommand.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/editing/CompositeEditCommand.cpp b/Source/WebCore/editing/CompositeEditCommand.cpp index cf2959a..bf515d7 100644 --- a/Source/WebCore/editing/CompositeEditCommand.cpp +++ b/Source/WebCore/editing/CompositeEditCommand.cpp @@ -781,7 +781,7 @@ void CompositeEditCommand::cloneParagraphUnderNewElement(Position& start, Positi appendNode(topNode, blockElement); RefPtr<Node> lastNode = topNode; - if (start.deprecatedNode() != outerNode) { + if (start.deprecatedNode() != outerNode && lastNode->isElementNode()) { Vector<RefPtr<Node> > ancestors; // Insert each node from innerNode to outerNode (excluded) in a list. |