summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/dom/Range.cpp
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-05-13 16:23:25 +0100
committerBen Murdoch <benm@google.com>2011-05-16 11:35:02 +0100
commit65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch)
treef478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/dom/Range.cpp
parent47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff)
downloadexternal_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip
external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz
external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/dom/Range.cpp')
-rw-r--r--Source/WebCore/dom/Range.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/Source/WebCore/dom/Range.cpp b/Source/WebCore/dom/Range.cpp
index 1f15f26..a41fc49 100644
--- a/Source/WebCore/dom/Range.cpp
+++ b/Source/WebCore/dom/Range.cpp
@@ -794,13 +794,8 @@ PassRefPtr<DocumentFragment> Range::processContents(ActionType action, Exception
Node* n = m_end.container()->firstChild();
if (n && m_end.offset()) {
NodeVector nodes;
- int i = 0;
- do {
+ for (int i = 0; i < m_end.offset() && n; i++, n = n->nextSibling())
nodes.append(n);
- if (!n->nextSibling())
- break;
- n = n->nextSibling();
- } while (i + 1 < m_end.offset());
for (int i = nodes.size() - 1; i >= 0; i--) {
n = nodes[i].get();
if (action == EXTRACT_CONTENTS)