diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-11-04 14:48:40 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-11-04 14:48:40 (GMT) |
| commit | b4ef8b906c88e5d60e687d9018af93de0e735e0c (patch) | |
| tree | fe4167319039047ba3ac0c97651dddc0a526349b /src/3rdparty/webkit/WebCore/editing/ReplaceNodeWithSpanCommand.cpp | |
| parent | f4f6012d181cf60fd04fc5bf69b21786977f0de0 (diff) | |
| parent | 9cda9fb4bb496a7c589767bdcead131dbcdeeb79 (diff) | |
| download | Qt-b4ef8b906c88e5d60e687d9018af93de0e735e0c.zip Qt-b4ef8b906c88e5d60e687d9018af93de0e735e0c.tar.gz Qt-b4ef8b906c88e5d60e687d9018af93de0e735e0c.tar.bz2 | |
Merge commit 's60/4.6' into mmfphonon
Diffstat (limited to 'src/3rdparty/webkit/WebCore/editing/ReplaceNodeWithSpanCommand.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/editing/ReplaceNodeWithSpanCommand.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/editing/ReplaceNodeWithSpanCommand.cpp b/src/3rdparty/webkit/WebCore/editing/ReplaceNodeWithSpanCommand.cpp index 21ca924..0874201 100644 --- a/src/3rdparty/webkit/WebCore/editing/ReplaceNodeWithSpanCommand.cpp +++ b/src/3rdparty/webkit/WebCore/editing/ReplaceNodeWithSpanCommand.cpp @@ -57,7 +57,9 @@ static void swapInNodePreservingAttributesAndChildren(Node* newNode, Node* nodeT parentNode->insertBefore(newNode, nodeToReplace, ec); ASSERT(!ec); - for (Node* child = nodeToReplace->firstChild(); child; child = child->nextSibling()) { + Node* nextChild; + for (Node* child = nodeToReplace->firstChild(); child; child = nextChild) { + nextChild = child->nextSibling(); newNode->appendChild(child, ec); ASSERT(!ec); } |