sky/engine/core/rendering/style/StyleRareNonInheritedData.h - Issue 760583004: Remove webkit-margin-collapse

Side by Side Diff: sky/engine/core/rendering/style/StyleRareNonInheritedData.h

Issue 760583004: Remove webkit-margin-collapse (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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

122 unsigned m_alignContent : 3; // EAlignContent	122 unsigned m_alignContent : 3; // EAlignContent

123 unsigned m_alignItems : 4; // ItemPosition	123 unsigned m_alignItems : 4; // ItemPosition

124 unsigned m_alignItemsOverflowAlignment : 2; // OverflowAlignment	124 unsigned m_alignItemsOverflowAlignment : 2; // OverflowAlignment

125 unsigned m_alignSelf : 4; // ItemPosition	125 unsigned m_alignSelf : 4; // ItemPosition

126 unsigned m_alignSelfOverflowAlignment : 2; // OverflowAlignment	126 unsigned m_alignSelfOverflowAlignment : 2; // OverflowAlignment

127 unsigned m_justifyContent : 3; // EJustifyContent	127 unsigned m_justifyContent : 3; // EJustifyContent

128	128

129 unsigned userDrag : 2; // EUserDrag	129 unsigned userDrag : 2; // EUserDrag

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

131 unsigned marginBeforeCollapse : 2; // EMarginCollapse

132 unsigned marginAfterCollapse : 2; // EMarginCollapse

133	131

134 unsigned m_textDecorationStyle : 3; // TextDecorationStyle	132 unsigned m_textDecorationStyle : 3; // TextDecorationStyle

135 unsigned m_wrapFlow: 3; // WrapFlow	133 unsigned m_wrapFlow: 3; // WrapFlow

136 unsigned m_wrapThrough: 1; // WrapThrough	134 unsigned m_wrapThrough: 1; // WrapThrough

137	135

138 unsigned m_hasCurrentOpacityAnimation : 1;	136 unsigned m_hasCurrentOpacityAnimation : 1;

139 unsigned m_hasCurrentTransformAnimation : 1;	137 unsigned m_hasCurrentTransformAnimation : 1;

140 unsigned m_hasCurrentFilterAnimation : 1;	138 unsigned m_hasCurrentFilterAnimation : 1;

141 unsigned m_runningOpacityAnimationOnCompositor : 1;	139 unsigned m_runningOpacityAnimationOnCompositor : 1;

142 unsigned m_runningTransformAnimationOnCompositor : 1;	140 unsigned m_runningTransformAnimationOnCompositor : 1;

(...skipping 28 matching lines...) Expand all Loading...
171 unsigned m_hasInlineTransform : 1;	169 unsigned m_hasInlineTransform : 1;

172	170

173 private:	171 private:

174 StyleRareNonInheritedData();	172 StyleRareNonInheritedData();

175 StyleRareNonInheritedData(const StyleRareNonInheritedData&);	173 StyleRareNonInheritedData(const StyleRareNonInheritedData&);

176 };	174 };

177	175

178 } // namespace blink	176 } // namespace blink

179	177

180 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_STYLERARENONINHERITEDDATA_H_	178 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_STYLERARENONINHERITEDDATA_H_

OLD	NEW