Source/core/rendering/style/StyleRareNonInheritedData.h - Issue 636993002: [CSS Grid Layout] Upgrade justify-content parsing to CSS3 Box Alignment spec.

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

Issue 636993002: [CSS Grid Layout] Upgrade justify-content parsing to CSS3 Box Alignment spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebaseline some tests expectations. Created 6 years, 1 month 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/rendering/style/RenderStyleConstants.h ('k') | Source/core/rendering/style/StyleRareNonInheritedData.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 Apple Inc. All rights reserved.	5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights 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 137 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
148	148

149 unsigned m_pageSizeType : 2; // PageSizeType	149 unsigned m_pageSizeType : 2; // PageSizeType

150 unsigned m_transformStyle3D : 1; // ETransformStyle3D	150 unsigned m_transformStyle3D : 1; // ETransformStyle3D

151 unsigned m_backfaceVisibility : 1; // EBackfaceVisibility	151 unsigned m_backfaceVisibility : 1; // EBackfaceVisibility

152	152

153 unsigned m_alignContent : 3; // EAlignContent	153 unsigned m_alignContent : 3; // EAlignContent

154 unsigned m_alignItems : 4; // ItemPosition	154 unsigned m_alignItems : 4; // ItemPosition

155 unsigned m_alignItemsOverflowAlignment : 2; // OverflowAlignment	155 unsigned m_alignItemsOverflowAlignment : 2; // OverflowAlignment

156 unsigned m_alignSelf : 4; // ItemPosition	156 unsigned m_alignSelf : 4; // ItemPosition

157 unsigned m_alignSelfOverflowAlignment : 2; // OverflowAlignment	157 unsigned m_alignSelfOverflowAlignment : 2; // OverflowAlignment

158 unsigned m_justifyContent : 3; // EJustifyContent	158 unsigned m_justifyContent : 4; // ContentPosition

	159 unsigned m_justifyContentDistribution : 3; // ContentDistributionType

	160 unsigned m_justifyContentOverflowAlignment : 2; // OverflowAlignment

159	161

160 unsigned userDrag : 2; // EUserDrag	162 unsigned userDrag : 2; // EUserDrag

161 unsigned textOverflow : 1; // Whether or not lines that spill out should be truncated with "..."	163 unsigned textOverflow : 1; // Whether or not lines that spill out should be truncated with "..."

162 unsigned marginBeforeCollapse : 2; // EMarginCollapse	164 unsigned marginBeforeCollapse : 2; // EMarginCollapse

163 unsigned marginAfterCollapse : 2; // EMarginCollapse	165 unsigned marginAfterCollapse : 2; // EMarginCollapse

164 unsigned m_appearance : 6; // EAppearance	166 unsigned m_appearance : 6; // EAppearance

165 unsigned m_textCombine : 1; // CSS3 text-combine properties	167 unsigned m_textCombine : 1; // CSS3 text-combine properties

166	168

167 unsigned m_textDecorationStyle : 3; // TextDecorationStyle	169 unsigned m_textDecorationStyle : 3; // TextDecorationStyle

168 unsigned m_wrapFlow: 3; // WrapFlow	170 unsigned m_wrapFlow: 3; // WrapFlow

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
204 unsigned m_hasInlineTransform : 1;	206 unsigned m_hasInlineTransform : 1;

205	207

206 private:	208 private:

207 StyleRareNonInheritedData();	209 StyleRareNonInheritedData();

208 StyleRareNonInheritedData(const StyleRareNonInheritedData&);	210 StyleRareNonInheritedData(const StyleRareNonInheritedData&);

209 };	211 };

210	212

211 } // namespace blink	213 } // namespace blink

212	214

213 #endif // StyleRareNonInheritedData_h	215 #endif // StyleRareNonInheritedData_h

OLD	NEW