Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Issues Search
    My Issues | Starred     Open | Closed | All

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: A new approach for resolving auto values. 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
« Source/core/css/CSSComputedStyleDeclaration.cpp ('K') | « Source/core/rendering/RenderGrid.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | Source/core/rendering/style/RenderStyle.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1515 matching lines...) Expand 10 before | Expand all | Expand 10 after
1526 Color visitedDependentColor(int colorProperty) const; 1526 Color visitedDependentColor(int colorProperty) const;
1527 1527
1528 void setHasExplicitlyInheritedProperties() { noninherited_flags.explicitInhe ritance = true; } 1528 void setHasExplicitlyInheritedProperties() { noninherited_flags.explicitInhe ritance = true; }
1529 bool hasExplicitlyInheritedProperties() const { return noninherited_flags.ex plicitInheritance; } 1529 bool hasExplicitlyInheritedProperties() const { return noninherited_flags.ex plicitInheritance; }
1530 1530
1531 void setHasCurrentColor() { noninherited_flags.currentColor = true; } 1531 void setHasCurrentColor() { noninherited_flags.currentColor = true; }
1532 bool hasCurrentColor() const { return noninherited_flags.currentColor; } 1532 bool hasCurrentColor() const { return noninherited_flags.currentColor; }
1533 1533
1534 bool hasBoxDecorations() const { return hasBorder() || hasBorderRadius() || hasOutline() || hasAppearance() || boxShadow() || hasFilter(); } 1534 bool hasBoxDecorations() const { return hasBorder() || hasBorderRadius() || hasOutline() || hasAppearance() || boxShadow() || hasFilter(); }
1535 1535
1536 void resolveJustifyItemsAuto(const RenderStyle&);
1537 void resolveJustifySelfAuto(const RenderStyle&);
1538 void resolveAlignItemsAuto(const RenderStyle&);
1539 void resolveAlignSelfAuto(const RenderStyle&);
1540
1536 // Initial values for all the properties 1541 // Initial values for all the properties
1537 static EBorderCollapse initialBorderCollapse() { return BSEPARATE; } 1542 static EBorderCollapse initialBorderCollapse() { return BSEPARATE; }
1538 static EBorderStyle initialBorderStyle() { return BNONE; } 1543 static EBorderStyle initialBorderStyle() { return BNONE; }
1539 static OutlineIsAuto initialOutlineStyleIsAuto() { return AUTO_OFF; } 1544 static OutlineIsAuto initialOutlineStyleIsAuto() { return AUTO_OFF; }
1540 static NinePieceImage initialNinePieceImage() { return NinePieceImage(); } 1545 static NinePieceImage initialNinePieceImage() { return NinePieceImage(); }
1541 static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed) , Length(0, Fixed)); } 1546 static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed) , Length(0, Fixed)); }
1542 static ECaptionSide initialCaptionSide() { return CAPTOP; } 1547 static ECaptionSide initialCaptionSide() { return CAPTOP; }
1543 static EClear initialClear() { return CNONE; } 1548 static EClear initialClear() { return CNONE; }
1544 static TextDirection initialDirection() { return LTR; } 1549 static TextDirection initialDirection() { return LTR; }
1545 static WritingMode initialWritingMode() { return TopToBottomWritingMode; } 1550 static WritingMode initialWritingMode() { return TopToBottomWritingMode; }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
1601 static float initialBoxFlex() { return 0.0f; } 1606 static float initialBoxFlex() { return 0.0f; }
1602 static unsigned initialBoxFlexGroup() { return 1; } 1607 static unsigned initialBoxFlexGroup() { return 1; }
1603 static unsigned initialBoxOrdinalGroup() { return 1; } 1608 static unsigned initialBoxOrdinalGroup() { return 1; }
1604 static EBoxSizing initialBoxSizing() { return CONTENT_BOX; } 1609 static EBoxSizing initialBoxSizing() { return CONTENT_BOX; }
1605 static StyleReflection* initialBoxReflect() { return 0; } 1610 static StyleReflection* initialBoxReflect() { return 0; }
1606 static float initialFlexGrow() { return 0; } 1611 static float initialFlexGrow() { return 0; }
1607 static float initialFlexShrink() { return 1; } 1612 static float initialFlexShrink() { return 1; }
1608 static Length initialFlexBasis() { return Length(Auto); } 1613 static Length initialFlexBasis() { return Length(Auto); }
1609 static int initialOrder() { return 0; } 1614 static int initialOrder() { return 0; }
1610 static EAlignContent initialAlignContent() { return AlignContentStretch; } 1615 static EAlignContent initialAlignContent() { return AlignContentStretch; }
1611 static ItemPosition initialAlignItems() { return ItemPositionStretch; } 1616 static ItemPosition initialAlignItems() { return ItemPositionAuto; }
1612 static OverflowAlignment initialAlignItemsOverflowAlignment() { return Overf lowAlignmentDefault; } 1617 static OverflowAlignment initialAlignItemsOverflowAlignment() { return Overf lowAlignmentDefault; }
1613 static ItemPosition initialAlignSelf() { return ItemPositionAuto; } 1618 static ItemPosition initialAlignSelf() { return ItemPositionAuto; }
1614 static OverflowAlignment initialAlignSelfOverflowAlignment() { return Overfl owAlignmentDefault; } 1619 static OverflowAlignment initialAlignSelfOverflowAlignment() { return Overfl owAlignmentDefault; }
1615 static EFlexDirection initialFlexDirection() { return FlowRow; } 1620 static EFlexDirection initialFlexDirection() { return FlowRow; }
1616 static EFlexWrap initialFlexWrap() { return FlexNoWrap; } 1621 static EFlexWrap initialFlexWrap() { return FlexNoWrap; }
1617 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; } 1622 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; }
1618 static ItemPosition initialJustifyItems() { return ItemPositionAuto; } 1623 static ItemPosition initialJustifyItems() { return ItemPositionAuto; }
1619 static OverflowAlignment initialJustifyItemsOverflowAlignment() { return Ove rflowAlignmentDefault; } 1624 static OverflowAlignment initialJustifyItemsOverflowAlignment() { return Ove rflowAlignmentDefault; }
1620 static ItemPositionType initialJustifyItemsPositionType() { return NonLegacy Position; } 1625 static ItemPositionType initialJustifyItemsPositionType() { return NonLegacy Position; }
1621 static ItemPosition initialJustifySelf() { return ItemPositionAuto; } 1626 static ItemPosition initialJustifySelf() { return ItemPositionAuto; }
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
1907 inline bool RenderStyle::hasPseudoElementStyle() const 1912 inline bool RenderStyle::hasPseudoElementStyle() const
1908 { 1913 {
1909 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1914 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1910 } 1915 }
1911 1916
1912 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1917 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1913 1918
1914 } // namespace blink 1919 } // namespace blink
1915 1920
1916 #endif // RenderStyle_h 1921 #endif // RenderStyle_h
OLDNEW
« Source/core/css/CSSComputedStyleDeclaration.cpp ('K') | « Source/core/rendering/RenderGrid.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | Source/core/rendering/style/RenderStyle.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698