Source/core/rendering/RenderFlexibleBox.h - Issue 134013002: Upgrade align-self and align-items parsing to CSS 3

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

Issue 134013002: Upgrade align-self and align-items parsing to CSS 3 (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Really fix the tests Created 6 years, 11 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/core/rendering/RenderFlexibleBox.h

diff --git a/Source/core/rendering/RenderFlexibleBox.h b/Source/core/rendering/RenderFlexibleBox.h

index 6e7a8f2b417379e1d4cd84f55f7b697893001623..2c3c26f5dd17ac306a6803aff21fc7a72531a8f4 100644

--- a/Source/core/rendering/RenderFlexibleBox.h

+++ b/Source/core/rendering/RenderFlexibleBox.h

@@ -117,7 +117,7 @@ private:

// FIXME: Supporting layout deltas.

void setFlowAwareLocationForChild(RenderBox* child, const LayoutPoint&);

void adjustAlignmentForChild(RenderBox* child, LayoutUnit);

- EAlignItems alignmentForChild(RenderBox* child) const;

+ ItemPosition alignmentForChild(RenderBox* child) const;

LayoutUnit mainAxisBorderAndPaddingExtentForChild(RenderBox* child) const;

LayoutUnit mainAxisScrollbarExtentForChild(RenderBox* child) const;

LayoutUnit preferredMainAxisContentExtentForChild(RenderBox* child, bool hasInfiniteLineLength);