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

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

Issue 438043002: [CSS Grid Layout] Support for justify-items property. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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
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 1600 matching lines...) Expand 10 before | Expand all | Expand 10 after
1611 static int initialOrder() { return 0; } 1611 static int initialOrder() { return 0; }
1612 static EAlignContent initialAlignContent() { return AlignContentStretch; } 1612 static EAlignContent initialAlignContent() { return AlignContentStretch; }
1613 static ItemPosition initialAlignItems() { return ItemPositionAuto; } 1613 static ItemPosition initialAlignItems() { return ItemPositionAuto; }
1614 static OverflowAlignment initialAlignItemsOverflowAlignment() { return Overf lowAlignmentDefault; } 1614 static OverflowAlignment initialAlignItemsOverflowAlignment() { return Overf lowAlignmentDefault; }
1615 static ItemPosition initialAlignSelf() { return ItemPositionAuto; } 1615 static ItemPosition initialAlignSelf() { return ItemPositionAuto; }
1616 static OverflowAlignment initialAlignSelfOverflowAlignment() { return Overfl owAlignmentDefault; } 1616 static OverflowAlignment initialAlignSelfOverflowAlignment() { return Overfl owAlignmentDefault; }
1617 static EFlexDirection initialFlexDirection() { return FlowRow; } 1617 static EFlexDirection initialFlexDirection() { return FlowRow; }
1618 static EFlexWrap initialFlexWrap() { return FlexNoWrap; } 1618 static EFlexWrap initialFlexWrap() { return FlexNoWrap; }
1619 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; } 1619 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; }
1620 static ItemPosition initialJustifyItems() { return ItemPositionAuto; } 1620 static ItemPosition initialJustifyItems() { return ItemPositionAuto; }
1621 static ItemPositionType initialJustifyItemsPositionType() { return NonLegacy Position; }
1621 static OverflowAlignment initialJustifyItemsOverflowAlignment() { return Ove rflowAlignmentDefault; } 1622 static OverflowAlignment initialJustifyItemsOverflowAlignment() { return Ove rflowAlignmentDefault; }
Julien - ping for review 2014/08/22 21:22:15 Again why is that change better than the existing
jfernandez 2014/08/26 11:23:14 Acknowledged.
1622 static ItemPositionType initialJustifyItemsPositionType() { return NonLegacy Position; }
1623 static ItemPosition initialJustifySelf() { return ItemPositionAuto; } 1623 static ItemPosition initialJustifySelf() { return ItemPositionAuto; }
1624 static OverflowAlignment initialJustifySelfOverflowAlignment() { return Over flowAlignmentDefault; } 1624 static OverflowAlignment initialJustifySelfOverflowAlignment() { return Over flowAlignmentDefault; }
1625 static int initialMarqueeLoopCount() { return -1; } 1625 static int initialMarqueeLoopCount() { return -1; }
1626 static int initialMarqueeSpeed() { return 85; } 1626 static int initialMarqueeSpeed() { return 85; }
1627 static Length initialMarqueeIncrement() { return Length(6, Fixed); } 1627 static Length initialMarqueeIncrement() { return Length(6, Fixed); }
1628 static EMarqueeBehavior initialMarqueeBehavior() { return MSCROLL; } 1628 static EMarqueeBehavior initialMarqueeBehavior() { return MSCROLL; }
1629 static EMarqueeDirection initialMarqueeDirection() { return MAUTO; } 1629 static EMarqueeDirection initialMarqueeDirection() { return MAUTO; }
1630 static EUserModify initialUserModify() { return READ_ONLY; } 1630 static EUserModify initialUserModify() { return READ_ONLY; }
1631 static EUserDrag initialUserDrag() { return DRAG_AUTO; } 1631 static EUserDrag initialUserDrag() { return DRAG_AUTO; }
1632 static EUserSelect initialUserSelect() { return SELECT_TEXT; } 1632 static EUserSelect initialUserSelect() { return SELECT_TEXT; }
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
1908 inline bool RenderStyle::hasPseudoElementStyle() const 1908 inline bool RenderStyle::hasPseudoElementStyle() const
1909 { 1909 {
1910 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1910 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1911 } 1911 }
1912 1912
1913 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1913 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1914 1914
1915 } // namespace blink 1915 } // namespace blink
1916 1916
1917 #endif // RenderStyle_h 1917 #endif // RenderStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698