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 18 matching lines...) Expand all Loading... | |
29 #include "core/layout/ClipPathOperation.h" | 29 #include "core/layout/ClipPathOperation.h" |
30 #include "core/style/BasicShapes.h" | 30 #include "core/style/BasicShapes.h" |
31 #include "core/style/CounterDirectives.h" | 31 #include "core/style/CounterDirectives.h" |
32 #include "core/style/CursorData.h" | 32 #include "core/style/CursorData.h" |
33 #include "core/style/DataRef.h" | 33 #include "core/style/DataRef.h" |
34 #include "core/style/FillLayer.h" | 34 #include "core/style/FillLayer.h" |
35 #include "core/style/ComputedStyleConstants.h" | 35 #include "core/style/ComputedStyleConstants.h" |
36 #include "core/style/LineClampValue.h" | 36 #include "core/style/LineClampValue.h" |
37 #include "core/style/NinePieceImage.h" | 37 #include "core/style/NinePieceImage.h" |
38 #include "core/style/ShapeValue.h" | 38 #include "core/style/ShapeValue.h" |
39 #include "core/style/StyleAlignmentData.h" | |
39 #include "platform/LengthPoint.h" | 40 #include "platform/LengthPoint.h" |
40 #include "wtf/OwnPtr.h" | 41 #include "wtf/OwnPtr.h" |
41 #include "wtf/PassRefPtr.h" | 42 #include "wtf/PassRefPtr.h" |
42 #include "wtf/Vector.h" | 43 #include "wtf/Vector.h" |
43 | 44 |
44 namespace blink { | 45 namespace blink { |
45 | 46 |
46 class ContentData; | 47 class ContentData; |
47 class CSSAnimationData; | 48 class CSSAnimationData; |
48 class CSSTransitionData; | 49 class CSSTransitionData; |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
139 StyleColor m_visitedLinkBorderRightColor; | 140 StyleColor m_visitedLinkBorderRightColor; |
140 StyleColor m_visitedLinkBorderTopColor; | 141 StyleColor m_visitedLinkBorderTopColor; |
141 StyleColor m_visitedLinkBorderBottomColor; | 142 StyleColor m_visitedLinkBorderBottomColor; |
142 | 143 |
143 int m_order; | 144 int m_order; |
144 | 145 |
145 LengthPoint m_objectPosition; | 146 LengthPoint m_objectPosition; |
146 | 147 |
147 Vector<String> m_callbackSelectors; | 148 Vector<String> m_callbackSelectors; |
148 | 149 |
150 StyleAlignmentData m_alignContent; | |
151 StyleAlignmentData m_alignItems; | |
152 StyleAlignmentData m_alignSelf; | |
153 StyleAlignmentData m_justifyContent; | |
154 StyleAlignmentData m_justifyItems; | |
155 StyleAlignmentData m_justifySelf; | |
esprehn
2015/04/14 00:48:55
This is making this object a bunch bigger since th
jfernandez
2015/04/14 22:56:21
As we commented in the IRC, I'll try yo land a pat
| |
156 | |
149 unsigned m_pageSizeType : 2; // PageSizeType | 157 unsigned m_pageSizeType : 2; // PageSizeType |
150 unsigned m_transformStyle3D : 1; // ETransformStyle3D | 158 unsigned m_transformStyle3D : 1; // ETransformStyle3D |
151 unsigned m_backfaceVisibility : 1; // EBackfaceVisibility | 159 unsigned m_backfaceVisibility : 1; // EBackfaceVisibility |
152 | 160 |
153 unsigned m_alignContent : 4; // ContentPosition | |
154 unsigned m_alignContentDistribution : 3; // ContentDistributionType | |
155 unsigned m_alignContentOverflowAlignment : 2; // OverflowAlignment | |
156 unsigned m_alignItems : 4; // ItemPosition | |
157 unsigned m_alignItemsOverflowAlignment : 2; // OverflowAlignment | |
158 unsigned m_alignSelf : 4; // ItemPosition | |
159 unsigned m_alignSelfOverflowAlignment : 2; // OverflowAlignment | |
160 unsigned m_justifyContent : 4; // ContentPosition | |
161 unsigned m_justifyContentDistribution : 3; // ContentDistributionType | |
162 unsigned m_justifyContentOverflowAlignment : 2; // OverflowAlignment | |
163 | |
164 unsigned userDrag : 2; // EUserDrag | 161 unsigned userDrag : 2; // EUserDrag |
165 unsigned textOverflow : 1; // Whether or not lines that spill out should be truncated with "..." | 162 unsigned textOverflow : 1; // Whether or not lines that spill out should be truncated with "..." |
166 unsigned marginBeforeCollapse : 2; // EMarginCollapse | 163 unsigned marginBeforeCollapse : 2; // EMarginCollapse |
167 unsigned marginAfterCollapse : 2; // EMarginCollapse | 164 unsigned marginAfterCollapse : 2; // EMarginCollapse |
168 unsigned m_appearance : 6; // EAppearance | 165 unsigned m_appearance : 6; // EAppearance |
169 unsigned m_textCombine : 1; // CSS3 text-combine properties | 166 unsigned m_textCombine : 1; // CSS3 text-combine properties |
170 | 167 |
171 unsigned m_textDecorationStyle : 3; // TextDecorationStyle | 168 unsigned m_textDecorationStyle : 3; // TextDecorationStyle |
172 unsigned m_wrapFlow: 3; // WrapFlow | 169 unsigned m_wrapFlow: 3; // WrapFlow |
173 unsigned m_wrapThrough: 1; // WrapThrough | 170 unsigned m_wrapThrough: 1; // WrapThrough |
174 | 171 |
175 unsigned m_hasCurrentOpacityAnimation : 1; | 172 unsigned m_hasCurrentOpacityAnimation : 1; |
176 unsigned m_hasCurrentTransformAnimation : 1; | 173 unsigned m_hasCurrentTransformAnimation : 1; |
177 unsigned m_hasCurrentFilterAnimation : 1; | 174 unsigned m_hasCurrentFilterAnimation : 1; |
178 unsigned m_runningOpacityAnimationOnCompositor : 1; | 175 unsigned m_runningOpacityAnimationOnCompositor : 1; |
179 unsigned m_runningTransformAnimationOnCompositor : 1; | 176 unsigned m_runningTransformAnimationOnCompositor : 1; |
180 unsigned m_runningFilterAnimationOnCompositor : 1; | 177 unsigned m_runningFilterAnimationOnCompositor : 1; |
181 | 178 |
182 unsigned m_effectiveBlendMode: 5; // EBlendMode | 179 unsigned m_effectiveBlendMode: 5; // EBlendMode |
183 | 180 |
184 unsigned m_touchAction : TouchActionBits; // TouchAction | 181 unsigned m_touchAction : TouchActionBits; // TouchAction |
185 | 182 |
186 unsigned m_objectFit : 3; // ObjectFit | 183 unsigned m_objectFit : 3; // ObjectFit |
187 | 184 |
188 unsigned m_isolation : 1; // Isolation | 185 unsigned m_isolation : 1; // Isolation |
189 | 186 |
190 unsigned m_justifyItems : 4; // ItemPosition | |
191 unsigned m_justifyItemsOverflowAlignment : 2; // OverflowAlignment | |
192 unsigned m_justifyItemsPositionType: 1; // Whether or not alignment uses the 'legacy' keyword. | |
193 | |
194 unsigned m_justifySelf : 4; // ItemPosition | |
195 unsigned m_justifySelfOverflowAlignment : 2; // OverflowAlignment | |
196 | |
197 // ScrollBehavior. 'scroll-behavior' has 2 accepted values, but ScrollBehavi or has a third | 187 // 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. | 188 // value (that can only be specified using CSSOM scroll APIs) so 2 bits are needed. |
199 unsigned m_scrollBehavior: 2; | 189 unsigned m_scrollBehavior: 2; |
200 | 190 |
201 unsigned m_scrollBlocksOn: 3; // WebScrollBlocksOn | 191 unsigned m_scrollBlocksOn: 3; // WebScrollBlocksOn |
202 | 192 |
203 // Plugins require accelerated compositing for reasons external to blink. | 193 // Plugins require accelerated compositing for reasons external to blink. |
204 // In which case, we need to update the ComputedStyle on the LayoutEmbeddedO bject, | 194 // In which case, we need to update the ComputedStyle on the LayoutEmbeddedO bject, |
205 // so store this bit so that the style actually changes when the plugin | 195 // so store this bit so that the style actually changes when the plugin |
206 // becomes composited. | 196 // becomes composited. |
207 unsigned m_requiresAcceleratedCompositingForExternalReasons: 1; | 197 unsigned m_requiresAcceleratedCompositingForExternalReasons: 1; |
208 | 198 |
209 // Whether the transform (if it exists) is stored in the element's inline st yle. | 199 // Whether the transform (if it exists) is stored in the element's inline st yle. |
210 unsigned m_hasInlineTransform : 1; | 200 unsigned m_hasInlineTransform : 1; |
211 unsigned m_resize : 2; // EResize | 201 unsigned m_resize : 2; // EResize |
212 unsigned m_hasCompositorProxy : 1; | 202 unsigned m_hasCompositorProxy : 1; |
213 | 203 |
214 private: | 204 private: |
215 StyleRareNonInheritedData(); | 205 StyleRareNonInheritedData(); |
216 StyleRareNonInheritedData(const StyleRareNonInheritedData&); | 206 StyleRareNonInheritedData(const StyleRareNonInheritedData&); |
217 }; | 207 }; |
218 | 208 |
219 } // namespace blink | 209 } // namespace blink |
220 | 210 |
221 #endif // StyleRareNonInheritedData_h | 211 #endif // StyleRareNonInheritedData_h |
OLD | NEW |