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: Created 6 years, 2 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/resolver/StyleBuilderCustom.cpp ('K') | « Source/core/rendering/style/RenderStyleConstants.h ('k') | Source/core/rendering/style/StyleRareNonInheritedData.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 141 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
152	152

153 unsigned m_pageSizeType : 2; // PageSizeType	153 unsigned m_pageSizeType : 2; // PageSizeType

154 unsigned m_transformStyle3D : 1; // ETransformStyle3D	154 unsigned m_transformStyle3D : 1; // ETransformStyle3D

155 unsigned m_backfaceVisibility : 1; // EBackfaceVisibility	155 unsigned m_backfaceVisibility : 1; // EBackfaceVisibility

156	156

157 unsigned m_alignContent : 3; // EAlignContent	157 unsigned m_alignContent : 3; // EAlignContent

158 unsigned m_alignItems : 4; // ItemPosition	158 unsigned m_alignItems : 4; // ItemPosition

159 unsigned m_alignItemsOverflowAlignment : 2; // OverflowAlignment	159 unsigned m_alignItemsOverflowAlignment : 2; // OverflowAlignment

160 unsigned m_alignSelf : 4; // ItemPosition	160 unsigned m_alignSelf : 4; // ItemPosition

161 unsigned m_alignSelfOverflowAlignment : 2; // OverflowAlignment	161 unsigned m_alignSelfOverflowAlignment : 2; // OverflowAlignment

162 unsigned m_justifyContent : 3; // EJustifyContent	162 unsigned m_justifyContent : 4; // ContentPosition
Julien - ping for review 2014/10/20 21:24:02 Shouldn't we remove EJustifyContent? Shouldn't we remove EJustifyContent? jfernandez 2014/10/27 11:44:37 Acknowledged. Show quoted text On 2014/10/20 21:24:02, Julien Chaffraix - PST wrote: > Shouldn't we remove EJustifyContent? Acknowledged.
	163 unsigned m_justifyContentDistribution : 3; // ContentDistributionType

	164 unsigned m_justifyContentOverflowAlignment : 2; // OverflowAlignment

163	165

164 unsigned userDrag : 2; // EUserDrag	166 unsigned userDrag : 2; // EUserDrag

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

166 unsigned marginBeforeCollapse : 2; // EMarginCollapse	168 unsigned marginBeforeCollapse : 2; // EMarginCollapse

167 unsigned marginAfterCollapse : 2; // EMarginCollapse	169 unsigned marginAfterCollapse : 2; // EMarginCollapse

168 unsigned m_appearance : 6; // EAppearance	170 unsigned m_appearance : 6; // EAppearance

169 unsigned m_borderFit : 1; // EBorderFit	171 unsigned m_borderFit : 1; // EBorderFit

170 unsigned m_textCombine : 1; // CSS3 text-combine properties	172 unsigned m_textCombine : 1; // CSS3 text-combine properties

171	173

172 unsigned m_textDecorationStyle : 3; // TextDecorationStyle	174 unsigned m_textDecorationStyle : 3; // TextDecorationStyle

(...skipping 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
211 unsigned m_hasInlineTransform : 1;	213 unsigned m_hasInlineTransform : 1;

212	214

213 private:	215 private:

214 StyleRareNonInheritedData();	216 StyleRareNonInheritedData();

215 StyleRareNonInheritedData(const StyleRareNonInheritedData&);	217 StyleRareNonInheritedData(const StyleRareNonInheritedData&);

216 };	218 };

217	219

218 } // namespace blink	220 } // namespace blink

219	221

220 #endif // StyleRareNonInheritedData_h	222 #endif // StyleRareNonInheritedData_h

OLD	NEW