Issue 12335038: Merge 142659

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

Issue 12335038: Merge 142659 (Closed)

Created:
7 years, 10 months ago by leviw_travelin_and_unemployed

Modified:
7 years, 10 months ago

Reviewers:
leviw_travelin_and_unemployed

CC:
chromium-reviews

Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/1410/

Visibility:
Public.

More Reviews

Description

Merge 142659 > REGRESSION(r136967): Combination of float and clear yields to bad layout > https://bugs.webkit.org/show_bug.cgi?id=109476 > > Reviewed by Levi Weintraub. > > Source/WebCore: > > Test: fast/block/margin-collapse/self-collapsing-block-with-float-children.html > > The change made at http://trac.webkit.org/changeset/136967 only needs to worry about the first floated > child of a self-collapsing block. The ones that follow are not affected by its margins. > > * rendering/RenderBlockLineLayout.cpp: > (WebCore::RenderBlock::LineBreaker::skipLeadingWhitespace): > > LayoutTests: > > * fast/block/margin-collapse/self-collapsing-block-with-float-children-expected.txt: Added. > * fast/block/margin-collapse/self-collapsing-block-with-float-children.html: Added. > TBR=robert@webkit.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=143752

Patch Set 1 #

Created: 7 years, 10 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+0 lines, -0 lines)			Patch
A +	LayoutTests/fast/block/margin-collapse/self-collapsing-block-with-float-children.html	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
A +	LayoutTests/fast/block/margin-collapse/self-collapsing-block-with-float-children-expected.txt	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
M	Source/WebCore/rendering/RenderBlockLineLayout.cpp	View	1 chunk	+2 lines, -2 lines	0 comments	Download

Messages

Total messages: 2 (0 generated)

Expand Messages | Collapse Messages

leviw_travelin_and_unemployed

7 years, 10 months ago (2013-02-22 18:43:04 UTC) #2

Message was sent while issue was closed.

Committed patchset #1 manually as r143752.

Expand Messages | Collapse Messages