Source/core/rendering/style/RenderStyle.h - Issue 363133003: [CSS Grid Layout] Adapting align-self, align-items and justify-self to the last CSS 3 spec.

Side by Side Diff: Source/core/rendering/style/RenderStyle.h

Issue 363133003: [CSS Grid Layout] Adapting align-self, align-items and justify-self to the last CSS 3 spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Resolve grid and flex cases during cascade, the rest will wait for layout. Created 6 years, 4 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 unified diff | Download patch

« LayoutTests/fast/alignment/parse-align-items.html ('K') | « Source/core/rendering/RenderGrid.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)

3 * (C) 2000 Antti Koivisto (koivisto@kde.org)	3 * (C) 2000 Antti Koivisto (koivisto@kde.org)

4 * (C) 2000 Dirk Mueller (mueller@kde.org)	4 * (C) 2000 Dirk Mueller (mueller@kde.org)

5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.	5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.

6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)	6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)

7 *	7 *

8 * This library is free software; you can redistribute it and/or	8 * This library is free software; you can redistribute it and/or

9 * modify it under the terms of the GNU Library General Public	9 * modify it under the terms of the GNU Library General Public

10 * License as published by the Free Software Foundation; either	10 * License as published by the Free Software Foundation; either

(...skipping 1590 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1601 static float initialBoxFlex() { return 0.0f; }	1601 static float initialBoxFlex() { return 0.0f; }

1602 static unsigned initialBoxFlexGroup() { return 1; }	1602 static unsigned initialBoxFlexGroup() { return 1; }

1603 static unsigned initialBoxOrdinalGroup() { return 1; }	1603 static unsigned initialBoxOrdinalGroup() { return 1; }

1604 static EBoxSizing initialBoxSizing() { return CONTENT_BOX; }	1604 static EBoxSizing initialBoxSizing() { return CONTENT_BOX; }

1605 static StyleReflection* initialBoxReflect() { return 0; }	1605 static StyleReflection* initialBoxReflect() { return 0; }

1606 static float initialFlexGrow() { return 0; }	1606 static float initialFlexGrow() { return 0; }

1607 static float initialFlexShrink() { return 1; }	1607 static float initialFlexShrink() { return 1; }

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

1609 static int initialOrder() { return 0; }	1609 static int initialOrder() { return 0; }

1610 static EAlignContent initialAlignContent() { return AlignContentStretch; }	1610 static EAlignContent initialAlignContent() { return AlignContentStretch; }

1611 static ItemPosition initialAlignItems() { return ItemPositionStretch; }	1611 static ItemPosition initialAlignItems() { return ItemPositionAuto; }

1612 static OverflowAlignment initialAlignItemsOverflowAlignment() { return Overf lowAlignmentDefault; }	1612 static OverflowAlignment initialAlignItemsOverflowAlignment() { return Overf lowAlignmentDefault; }

1613 static ItemPosition initialAlignSelf() { return ItemPositionAuto; }	1613 static ItemPosition initialAlignSelf() { return ItemPositionAuto; }

1614 static OverflowAlignment initialAlignSelfOverflowAlignment() { return Overfl owAlignmentDefault; }	1614 static OverflowAlignment initialAlignSelfOverflowAlignment() { return Overfl owAlignmentDefault; }

1615 static EFlexDirection initialFlexDirection() { return FlowRow; }	1615 static EFlexDirection initialFlexDirection() { return FlowRow; }

1616 static EFlexWrap initialFlexWrap() { return FlexNoWrap; }	1616 static EFlexWrap initialFlexWrap() { return FlexNoWrap; }

1617 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; }	1617 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; }

1618 static ItemPosition initialJustifyItems() { return ItemPositionAuto; }	1618 static ItemPosition initialJustifyItems() { return ItemPositionAuto; }

1619 static OverflowAlignment initialJustifyItemsOverflowAlignment() { return Ove rflowAlignmentDefault; }	1619 static OverflowAlignment initialJustifyItemsOverflowAlignment() { return Ove rflowAlignmentDefault; }

1620 static ItemPositionType initialJustifyItemsPositionType() { return NonLegacy Position; }	1620 static ItemPositionType initialJustifyItemsPositionType() { return NonLegacy Position; }

1621 static ItemPosition initialJustifySelf() { return ItemPositionAuto; }	1621 static ItemPosition initialJustifySelf() { return ItemPositionAuto; }

(...skipping 285 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1907 inline bool RenderStyle::hasPseudoElementStyle() const	1907 inline bool RenderStyle::hasPseudoElementStyle() const

1908 {	1908 {

1909 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;	1909 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;

1910 }	1910 }

1911	1911

1912 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);	1912 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);

1913	1913

1914 } // namespace blink	1914 } // namespace blink

1915	1915

1916 #endif // RenderStyle_h	1916 #endif // RenderStyle_h

OLD	NEW