Source/core/rendering/style/StyleRareNonInheritedData.h - Issue 134013002: Upgrade align-self and align-items parsing to CSS 3

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

Issue 134013002: Upgrade align-self and align-items parsing to CSS 3 (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Really fix the tests Created 6 years, 11 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 | Annotate | Revision Log

« Source/core/css/parser/BisonCSSParser-in.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 145 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
156	156

157 unsigned m_regionBreakAfter : 2; // EPageBreak	157 unsigned m_regionBreakAfter : 2; // EPageBreak

158 unsigned m_regionBreakBefore : 2; // EPageBreak	158 unsigned m_regionBreakBefore : 2; // EPageBreak

159 unsigned m_regionBreakInside : 2; // EPageBreak	159 unsigned m_regionBreakInside : 2; // EPageBreak

160	160

161 unsigned m_pageSizeType : 2; // PageSizeType	161 unsigned m_pageSizeType : 2; // PageSizeType

162 unsigned m_transformStyle3D : 1; // ETransformStyle3D	162 unsigned m_transformStyle3D : 1; // ETransformStyle3D

163 unsigned m_backfaceVisibility : 1; // EBackfaceVisibility	163 unsigned m_backfaceVisibility : 1; // EBackfaceVisibility

164	164

165 unsigned m_alignContent : 3; // EAlignContent	165 unsigned m_alignContent : 3; // EAlignContent

166 unsigned m_alignItems : 3; // EAlignItems	166 unsigned m_alignItems : 4; // ItemPosition

167 unsigned m_alignSelf : 3; // EAlignItems	167 unsigned m_alignItemsOverflowAlignment : 2; // OverflowAlignment

	168 unsigned m_alignSelf : 4; // ItemPosition

	169 unsigned m_alignSelfOverflowAlignment : 2; // OverflowAlignment

168 unsigned m_justifyContent : 3; // EJustifyContent	170 unsigned m_justifyContent : 3; // EJustifyContent

169	171

170 unsigned userDrag : 2; // EUserDrag	172 unsigned userDrag : 2; // EUserDrag

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

172 unsigned marginBeforeCollapse : 2; // EMarginCollapse	174 unsigned marginBeforeCollapse : 2; // EMarginCollapse

173 unsigned marginAfterCollapse : 2; // EMarginCollapse	175 unsigned marginAfterCollapse : 2; // EMarginCollapse

174 unsigned m_appearance : 6; // EAppearance	176 unsigned m_appearance : 6; // EAppearance

175 unsigned m_borderFit : 1; // EBorderFit	177 unsigned m_borderFit : 1; // EBorderFit

176 unsigned m_textCombine : 1; // CSS3 text-combine properties	178 unsigned m_textCombine : 1; // CSS3 text-combine properties

177	179

(...skipping 17 matching lines...) Expand all Loading...
195 unsigned m_justifySelfOverflowAlignment : 2; // OverflowAlignment	197 unsigned m_justifySelfOverflowAlignment : 2; // OverflowAlignment

196	198

197 private:	199 private:

198 StyleRareNonInheritedData();	200 StyleRareNonInheritedData();

199 StyleRareNonInheritedData(const StyleRareNonInheritedData&);	201 StyleRareNonInheritedData(const StyleRareNonInheritedData&);

200 };	202 };

201	203

202 } // namespace WebCore	204 } // namespace WebCore

203	205

204 #endif // StyleRareNonInheritedData_h	206 #endif // StyleRareNonInheritedData_h

OLD	NEW