diff options
| author | Steve Block <steveblock@google.com> | 2011-09-07 09:45:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-07 09:45:18 -0700 |
| commit | efe456e3824deb639f69f5900990c1de81fa33ab (patch) | |
| tree | 3350b1ae8f6e20120cecec3903f1442552928320 /Source/WebCore/rendering | |
| parent | 666a074f73aab3617c866ebe204ce841978ba270 (diff) | |
| parent | d3a21b5683eb14a1c0c880a30488578f484e8cca (diff) | |
| download | external_webkit-efe456e3824deb639f69f5900990c1de81fa33ab.zip external_webkit-efe456e3824deb639f69f5900990c1de81fa33ab.tar.gz external_webkit-efe456e3824deb639f69f5900990c1de81fa33ab.tar.bz2 | |
Merge "Cherry-pick WebKit change 92744 to fix RenderObjectChildList"
Diffstat (limited to 'Source/WebCore/rendering')
| -rw-r--r-- | Source/WebCore/rendering/RenderObjectChildList.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 |