diff options
| author | Steve Block <steveblock@google.com> | 2011-09-07 16:45:49 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-09-07 16:46:19 +0100 |
| commit | d3a21b5683eb14a1c0c880a30488578f484e8cca (patch) | |
| tree | c0002896db574e26b55b9fa1f4b872a8271e0600 /Source/WebCore | |
| parent | 9cfd265316cc519626b677f26e498d8561088b2c (diff) | |
| download | external_webkit-d3a21b5683eb14a1c0c880a30488578f484e8cca.zip external_webkit-d3a21b5683eb14a1c0c880a30488578f484e8cca.tar.gz external_webkit-d3a21b5683eb14a1c0c880a30488578f484e8cca.tar.bz2 | |
Cherry-pick WebKit change 92744 to fix RenderObjectChildList
See http://trac.webkit.org/changeset/92744
Bug: 5263877
Change-Id: I672c48d3fb6dc90d0721b6c5638070eb944596f4
Diffstat (limited to 'Source/WebCore')
| -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 |