third_party/WebKit/Source/core/style/ComputedStyle.h - Issue 1709963002: [css-align] New CSS Value 'normal' for Self Alignment

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: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 1709963002: [css-align] New CSS Value 'normal' for Self Alignment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Applied suggested changes. Created 4 years, 9 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

« third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp ('K') | « third_party/WebKit/Source/core/layout/LayoutGrid.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/style/ComputedStyle.h

diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h

index 0e36cfe64a9afdf16aa4904146c6ec6bdc8eba6d..46bf34d374c569cdef878f3bed0cce526fb69197 100644

--- a/third_party/WebKit/Source/core/style/ComputedStyle.h

+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h

@@ -381,9 +381,10 @@ public:

ContentDistributionType resolvedJustifyContentDistribution(const StyleContentAlignmentData& normalValueBehavior) const;

ContentPosition resolvedAlignContentPosition(const StyleContentAlignmentData& normalValueBehavior) const;

ContentDistributionType resolvedAlignContentDistribution(const StyleContentAlignmentData& normalValueBehavior) const;

- const StyleSelfAlignmentData resolvedAlignment(const ComputedStyle& parentStyle, ItemPosition resolvedAutoPositionForLayoutObject) const;

- static ItemPosition resolveAlignment(const ComputedStyle& parentStyle, const ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayoutObject);

- static ItemPosition resolveJustification(const ComputedStyle& parentStyle, const ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayoutObject);

+ const StyleSelfAlignmentData resolvedAlignItems(ItemPosition normalValueBehaviour) const;

+ const StyleSelfAlignmentData resolvedAlignSelf(const ComputedStyle& parentStyle, ItemPosition normalValueBehaviour) const;

+ const StyleSelfAlignmentData resolvedJustifyItems(ItemPosition normalValueBehaviour) const;

+ const StyleSelfAlignmentData resolvedJustifySelf(const ComputedStyle& parentStyle, ItemPosition normalValueBehaviour) const;

StyleDifference visualInvalidationDiff(const ComputedStyle&) const;

@@ -1744,6 +1745,7 @@ public:

static Length initialFlexBasis() { return Length(Auto); }

static int initialOrder() { return 0; }

static StyleContentAlignmentData initialContentAlignment() { return StyleContentAlignmentData(ContentPositionNormal, ContentDistributionDefault, OverflowAlignmentDefault); }

+ static StyleSelfAlignmentData initialDefaultAlignment() { return StyleSelfAlignmentData(ItemPositionNormal, OverflowAlignmentDefault); }

static StyleSelfAlignmentData initialSelfAlignment() { return StyleSelfAlignmentData(ItemPositionAuto, OverflowAlignmentDefault); }

static EFlexDirection initialFlexDirection() { return FlowRow; }

static EFlexWrap initialFlexWrap() { return FlexNoWrap; }