Source/WebCore/rendering/RenderObjectChildList.cpp - Issue 7637005: Merge 92744

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/rendering/RenderObjectChildList.cpp

Issue 7637005: Merge 92744 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/

Patch Set: Created 9 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: Source/WebCore/rendering/RenderObjectChildList.cpp

===================================================================

--- Source/WebCore/rendering/RenderObjectChildList.cpp (revision 92897)

+++ Source/WebCore/rendering/RenderObjectChildList.cpp (working copy)

@@ -258,7 +258,7 @@

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