Source/core/rendering/style/StyleRareNonInheritedData.h - Issue 333423005: [CSS Grid Layout] Implement 'justify-items' parsing

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

Issue 333423005: [CSS Grid Layout] Implement 'justify-items' parsing (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Suggested changes and additional test cases. Created 6 years, 6 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/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl ('K') | « Source/core/rendering/style/RenderStyle.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 173 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
184 unsigned m_hasAspectRatio : 1; // Whether or not an aspect ratio has been sp ecified.	184 unsigned m_hasAspectRatio : 1; // Whether or not an aspect ratio has been sp ecified.

185	185

186 unsigned m_effectiveBlendMode: 5; // EBlendMode	186 unsigned m_effectiveBlendMode: 5; // EBlendMode

187	187

188 unsigned m_touchAction : TouchActionBits; // TouchAction	188 unsigned m_touchAction : TouchActionBits; // TouchAction

189	189

190 unsigned m_objectFit : 3; // ObjectFit	190 unsigned m_objectFit : 3; // ObjectFit

191	191

192 unsigned m_isolation : 1; // Isolation	192 unsigned m_isolation : 1; // Isolation

193	193

	194 unsigned m_justifyItems : 4; // ItemPosition

	195 unsigned m_justifyItemsOverflowAlignment : 2; // OverflowAlignment

	196 bool m_justifyItemsIsLegacy;
	cbiesinger 2014/06/21 00:45:23 unsigned m_justifyItemsIsLegacy : 1; unsigned m_justifyItemsIsLegacy : 1;
	197

194 unsigned m_justifySelf : 4; // ItemPosition	198 unsigned m_justifySelf : 4; // ItemPosition

195 unsigned m_justifySelfOverflowAlignment : 2; // OverflowAlignment	199 unsigned m_justifySelfOverflowAlignment : 2; // OverflowAlignment

196	200

197 // ScrollBehavior. 'scroll-behavior' has 2 accepted values, but ScrollBehavi or has a third	201 // ScrollBehavior. 'scroll-behavior' has 2 accepted values, but ScrollBehavi or has a third

198 // value (that can only be specified using CSSOM scroll APIs) so 2 bits are needed.	202 // value (that can only be specified using CSSOM scroll APIs) so 2 bits are needed.

199 unsigned m_scrollBehavior: 2;	203 unsigned m_scrollBehavior: 2;

200	204

201 // Plugins require accelerated compositing for reasons external to blink.	205 // Plugins require accelerated compositing for reasons external to blink.

202 // In which case, we need to update the RenderStyle on the RenderEmbeddedObj ect,	206 // In which case, we need to update the RenderStyle on the RenderEmbeddedObj ect,

203 // so store this bit so that the style actually changes when the plugin	207 // so store this bit so that the style actually changes when the plugin

204 // becomes composited.	208 // becomes composited.

205 unsigned m_requiresAcceleratedCompositingForExternalReasons: 1;	209 unsigned m_requiresAcceleratedCompositingForExternalReasons: 1;

206	210

207 private:	211 private:

208 StyleRareNonInheritedData();	212 StyleRareNonInheritedData();

209 StyleRareNonInheritedData(const StyleRareNonInheritedData&);	213 StyleRareNonInheritedData(const StyleRareNonInheritedData&);

210 };	214 };

211	215

212 } // namespace WebCore	216 } // namespace WebCore

213	217

214 #endif // StyleRareNonInheritedData_h	218 #endif // StyleRareNonInheritedData_h

OLD	NEW