Source/core/rendering/RenderBlock.h - Issue 23757029: Merge 157392 "Avoid collapsing anonymous block children already ..."

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/core/rendering/RenderBlock.h

Issue 23757029: Merge 157392 "Avoid collapsing anonymous block children already ..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1599/

Patch Set: Created 7 years, 3 months ago

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

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « LayoutTests/fast/css-generated-content/normalize-with-first-letter-and-before-content-crash-expected.txt ('k') | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderBlock.h

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

--- Source/core/rendering/RenderBlock.h (revision 157548)

+++ Source/core/rendering/RenderBlock.h (working copy)

@@ -606,7 +606,7 @@

void makeChildrenNonInline(RenderObject* insertionPoint = 0);

virtual void removeLeftoverAnonymousBlock(RenderBlock* child);

- static void collapseAnonymousBoxChild(RenderBlock* parent, RenderObject* child);

+ static void collapseAnonymousBlockChild(RenderBlock* parent, RenderBlock* child);

void moveAllChildrenIncludingFloatsTo(RenderBlock* toBlock, bool fullRemoveInsert);

virtual void dirtyLinesFromChangedChild(RenderObject* child) OVERRIDE FINAL { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }