From d3a21b5683eb14a1c0c880a30488578f484e8cca Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 7 Sep 2011 16:45:49 +0100
Subject: Cherry-pick WebKit change 92744 to fix RenderObjectChildList

See http://trac.webkit.org/changeset/92744

Bug: 5263877
Change-Id: I672c48d3fb6dc90d0721b6c5638070eb944596f4
---
 Source/WebCore/rendering/RenderObjectChildList.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/WebCore/rendering/RenderObjectChildList.cpp')

diff --git a/Source/WebCore/rendering/RenderObjectChildList.cpp b/Source/WebCore/rendering/RenderObjectChildList.cpp
index ff9ff15..1ea8675 100644
--- a/Source/WebCore/rendering/RenderObjectChildList.cpp
+++ b/Source/WebCore/rendering/RenderObjectChildList.cpp
@@ -258,7 +258,7 @@ static RenderObject* findBeforeAfterParent(RenderObject* object)
     RenderObject* beforeAfterParent = object;
     while (beforeAfterParent && !(beforeAfterParent->isText() || beforeAfterParent->isImage()))
         beforeAfterParent = beforeAfterParent->firstChild();
-    return beforeAfterParent;
+    return beforeAfterParent ? beforeAfterParent->parent() : 0;
 }
 
 RenderObject* RenderObjectChildList::beforePseudoElementRenderer(const RenderObject* owner) const
-- 
cgit v1.1