Source/core/rendering/style/RenderStyle.h - Issue 361113002: Properly managing overlfow-aligment for inherit and initial.

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

Issue 361113002: Properly managing overlfow-aligment for inherit and initial. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

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

« no previous file with comments | « Source/core/css/resolver/StyleBuilderCustom.cpp ('k') | no next file » | 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 1612 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1623 static EAlignContent initialAlignContent() { return AlignContentStretch; }	1623 static EAlignContent initialAlignContent() { return AlignContentStretch; }

1624 static ItemPosition initialAlignItems() { return ItemPositionStretch; }	1624 static ItemPosition initialAlignItems() { return ItemPositionStretch; }

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

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

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

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

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

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

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

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

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

1633 static ItemPosition initialJustifySelf() { return ItemPositionAuto; }	1634 static ItemPosition initialJustifySelf() { return ItemPositionAuto; }

1634 static OverflowAlignment initialJustifySelfOverflowAlignment() { return Over flowAlignmentDefault; }	1635 static OverflowAlignment initialJustifySelfOverflowAlignment() { return Over flowAlignmentDefault; }

1635 static int initialMarqueeLoopCount() { return -1; }	1636 static int initialMarqueeLoopCount() { return -1; }

1636 static int initialMarqueeSpeed() { return 85; }	1637 static int initialMarqueeSpeed() { return 85; }

1637 static Length initialMarqueeIncrement() { return Length(6, Fixed); }	1638 static Length initialMarqueeIncrement() { return Length(6, Fixed); }

1638 static EMarqueeBehavior initialMarqueeBehavior() { return MSCROLL; }	1639 static EMarqueeBehavior initialMarqueeBehavior() { return MSCROLL; }

1639 static EMarqueeDirection initialMarqueeDirection() { return MAUTO; }	1640 static EMarqueeDirection initialMarqueeDirection() { return MAUTO; }

1640 static EUserModify initialUserModify() { return READ_ONLY; }	1641 static EUserModify initialUserModify() { return READ_ONLY; }

1641 static EUserDrag initialUserDrag() { return DRAG_AUTO; }	1642 static EUserDrag initialUserDrag() { return DRAG_AUTO; }

1642 static EUserSelect initialUserSelect() { return SELECT_TEXT; }	1643 static EUserSelect initialUserSelect() { return SELECT_TEXT; }

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

1920 {	1921 {

1921 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK;	1922 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK;

1922 }	1923 }

1923	1924

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

1925	1926

1926 } // namespace WebCore	1927 } // namespace WebCore

1927	1928

1928 #endif // RenderStyle_h	1929 #endif // RenderStyle_h

OLD	NEW