Source/WebCore/rendering/RenderBlock.h - Issue 10448067: Merge 117482

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.h

Issue 10448067: Merge 117482 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/

Patch Set: Created 8 years, 7 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:

Index: Source/WebCore/rendering/RenderBlock.h

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

--- Source/WebCore/rendering/RenderBlock.h (revision 118862)

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

@@ -904,7 +904,11 @@

bool handleSpecialChild(RenderBox* child, const MarginInfo&);

bool handleFloatingChild(RenderBox* child, const MarginInfo&);

bool handlePositionedChild(RenderBox* child, const MarginInfo&);

- bool handleRunInChild(RenderBox* child);

+ RenderBoxModelObject* createReplacementRunIn(RenderBoxModelObject* runIn);

+ void moveRunInUnderSiblingBlockIfNeeded(RenderObject* runIn);

+ void moveRunInToOriginalPosition(RenderObject* runIn);

LayoutUnit collapseMargins(RenderBox* child, MarginInfo&);

LayoutUnit clearFloatsIfNeeded(RenderBox* child, MarginInfo&, LayoutUnit oldTopPosMargin, LayoutUnit oldTopNegMargin, LayoutUnit yPos);

LayoutUnit estimateLogicalTopPosition(RenderBox* child, const MarginInfo&, LayoutUnit& estimateWithoutPagination);