Source/WebCore/rendering/RenderBlock.cpp - Issue 8666016: Merge 100630

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/RenderBlock.cpp

Issue 8666016: Merge 100630 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/912/

Patch Set: Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Source/WebCore/rendering/RenderBlock.cpp

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

--- Source/WebCore/rendering/RenderBlock.cpp (revision 101036)

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

@@ -674,7 +674,7 @@

{

// Make sure we don't append things after :after-generated content if we have it.

if (!beforeChild)

- beforeChild = findAfterContentRenderer();

+ beforeChild = afterPseudoElementRenderer();

// If the requested beforeChild is not one of our children, then this is because

// there is an anonymous container within this object that contains the beforeChild.