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

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: Unskipped some repaint tests and rebaselined. Created 4 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:

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

Download patch

« third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp ('K') | « third_party/WebKit/Source/core/layout/LayoutGrid.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('J')
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 2b196491cb48de8fde0922295f4aa0b07f164cdb..32d83ef6ce092d2f064343d280845999ec14e627 100644

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

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

@@ -375,9 +375,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;

@@ -1737,6 +1738,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; }