Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1707)

Side by Side Diff: Source/core/style/StyleRareNonInheritedData.cpp

Issue 1070143002: [Alignment] Single class for holding the alignment data. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Using the StyleConverter. Created 5 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 , m_textDecorationColor(StyleColor::currentColor()) 47 , m_textDecorationColor(StyleColor::currentColor())
48 , m_visitedLinkTextDecorationColor(StyleColor::currentColor()) 48 , m_visitedLinkTextDecorationColor(StyleColor::currentColor())
49 , m_visitedLinkBackgroundColor(ComputedStyle::initialBackgroundColor()) 49 , m_visitedLinkBackgroundColor(ComputedStyle::initialBackgroundColor())
50 , m_visitedLinkOutlineColor(StyleColor::currentColor()) 50 , m_visitedLinkOutlineColor(StyleColor::currentColor())
51 , m_visitedLinkBorderLeftColor(StyleColor::currentColor()) 51 , m_visitedLinkBorderLeftColor(StyleColor::currentColor())
52 , m_visitedLinkBorderRightColor(StyleColor::currentColor()) 52 , m_visitedLinkBorderRightColor(StyleColor::currentColor())
53 , m_visitedLinkBorderTopColor(StyleColor::currentColor()) 53 , m_visitedLinkBorderTopColor(StyleColor::currentColor())
54 , m_visitedLinkBorderBottomColor(StyleColor::currentColor()) 54 , m_visitedLinkBorderBottomColor(StyleColor::currentColor())
55 , m_order(ComputedStyle::initialOrder()) 55 , m_order(ComputedStyle::initialOrder())
56 , m_objectPosition(ComputedStyle::initialObjectPosition()) 56 , m_objectPosition(ComputedStyle::initialObjectPosition())
57 , m_alignContent(ComputedStyle::initialAlignContent())
58 , m_alignItems(ComputedStyle::initialAlignItems())
59 , m_alignSelf(ComputedStyle::initialAlignSelf())
60 , m_justifyContent(ComputedStyle::initialJustifyContent())
61 , m_justifyItems(ComputedStyle::initialJustifyItems())
62 , m_justifySelf(ComputedStyle::initialJustifySelf())
57 , m_pageSizeType(PAGE_SIZE_AUTO) 63 , m_pageSizeType(PAGE_SIZE_AUTO)
58 , m_transformStyle3D(ComputedStyle::initialTransformStyle3D()) 64 , m_transformStyle3D(ComputedStyle::initialTransformStyle3D())
59 , m_backfaceVisibility(ComputedStyle::initialBackfaceVisibility()) 65 , m_backfaceVisibility(ComputedStyle::initialBackfaceVisibility())
60 , m_alignContent(ComputedStyle::initialAlignContent())
61 , m_alignContentDistribution(ComputedStyle::initialAlignContentDistribution( ))
62 , m_alignContentOverflowAlignment(ComputedStyle::initialAlignContentOverflow Alignment())
63 , m_alignItems(ComputedStyle::initialAlignItems())
64 , m_alignItemsOverflowAlignment(ComputedStyle::initialAlignItemsOverflowAlig nment())
65 , m_alignSelf(ComputedStyle::initialAlignSelf())
66 , m_alignSelfOverflowAlignment(ComputedStyle::initialAlignSelfOverflowAlignm ent())
67 , m_justifyContent(ComputedStyle::initialJustifyContent())
68 , m_justifyContentDistribution(ComputedStyle::initialJustifyContentDistribut ion())
69 , m_justifyContentOverflowAlignment(ComputedStyle::initialJustifyContentOver flowAlignment())
70 , userDrag(ComputedStyle::initialUserDrag()) 66 , userDrag(ComputedStyle::initialUserDrag())
71 , textOverflow(ComputedStyle::initialTextOverflow()) 67 , textOverflow(ComputedStyle::initialTextOverflow())
72 , marginBeforeCollapse(MCOLLAPSE) 68 , marginBeforeCollapse(MCOLLAPSE)
73 , marginAfterCollapse(MCOLLAPSE) 69 , marginAfterCollapse(MCOLLAPSE)
74 , m_appearance(ComputedStyle::initialAppearance()) 70 , m_appearance(ComputedStyle::initialAppearance())
75 , m_textCombine(ComputedStyle::initialTextCombine()) 71 , m_textCombine(ComputedStyle::initialTextCombine())
76 , m_textDecorationStyle(ComputedStyle::initialTextDecorationStyle()) 72 , m_textDecorationStyle(ComputedStyle::initialTextDecorationStyle())
77 , m_wrapFlow(ComputedStyle::initialWrapFlow()) 73 , m_wrapFlow(ComputedStyle::initialWrapFlow())
78 , m_wrapThrough(ComputedStyle::initialWrapThrough()) 74 , m_wrapThrough(ComputedStyle::initialWrapThrough())
79 , m_hasCurrentOpacityAnimation(false) 75 , m_hasCurrentOpacityAnimation(false)
80 , m_hasCurrentTransformAnimation(false) 76 , m_hasCurrentTransformAnimation(false)
81 , m_hasCurrentFilterAnimation(false) 77 , m_hasCurrentFilterAnimation(false)
82 , m_runningOpacityAnimationOnCompositor(false) 78 , m_runningOpacityAnimationOnCompositor(false)
83 , m_runningTransformAnimationOnCompositor(false) 79 , m_runningTransformAnimationOnCompositor(false)
84 , m_runningFilterAnimationOnCompositor(false) 80 , m_runningFilterAnimationOnCompositor(false)
85 , m_effectiveBlendMode(ComputedStyle::initialBlendMode()) 81 , m_effectiveBlendMode(ComputedStyle::initialBlendMode())
86 , m_touchAction(ComputedStyle::initialTouchAction()) 82 , m_touchAction(ComputedStyle::initialTouchAction())
87 , m_objectFit(ComputedStyle::initialObjectFit()) 83 , m_objectFit(ComputedStyle::initialObjectFit())
88 , m_isolation(ComputedStyle::initialIsolation()) 84 , m_isolation(ComputedStyle::initialIsolation())
89 , m_justifyItems(ComputedStyle::initialJustifyItems())
90 , m_justifyItemsOverflowAlignment(ComputedStyle::initialJustifyItemsOverflow Alignment())
91 , m_justifyItemsPositionType(ComputedStyle::initialJustifyItemsPositionType( ))
92 , m_justifySelf(ComputedStyle::initialJustifySelf())
93 , m_justifySelfOverflowAlignment(ComputedStyle::initialJustifySelfOverflowAl ignment())
94 , m_scrollBehavior(ComputedStyle::initialScrollBehavior()) 85 , m_scrollBehavior(ComputedStyle::initialScrollBehavior())
95 , m_scrollBlocksOn(ComputedStyle::initialScrollBlocksOn()) 86 , m_scrollBlocksOn(ComputedStyle::initialScrollBlocksOn())
96 , m_requiresAcceleratedCompositingForExternalReasons(false) 87 , m_requiresAcceleratedCompositingForExternalReasons(false)
97 , m_hasInlineTransform(false) 88 , m_hasInlineTransform(false)
98 , m_resize(ComputedStyle::initialResize()) 89 , m_resize(ComputedStyle::initialResize())
99 , m_hasCompositorProxy(false) 90 , m_hasCompositorProxy(false)
100 { 91 {
101 m_maskBoxImage.setMaskDefaults(); 92 m_maskBoxImage.setMaskDefaults();
102 } 93 }
103 94
(...skipping 28 matching lines...) Expand all
132 , m_textDecorationColor(o.m_textDecorationColor) 123 , m_textDecorationColor(o.m_textDecorationColor)
133 , m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor) 124 , m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor)
134 , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor) 125 , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor)
135 , m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor) 126 , m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor)
136 , m_visitedLinkBorderLeftColor(o.m_visitedLinkBorderLeftColor) 127 , m_visitedLinkBorderLeftColor(o.m_visitedLinkBorderLeftColor)
137 , m_visitedLinkBorderRightColor(o.m_visitedLinkBorderRightColor) 128 , m_visitedLinkBorderRightColor(o.m_visitedLinkBorderRightColor)
138 , m_visitedLinkBorderTopColor(o.m_visitedLinkBorderTopColor) 129 , m_visitedLinkBorderTopColor(o.m_visitedLinkBorderTopColor)
139 , m_visitedLinkBorderBottomColor(o.m_visitedLinkBorderBottomColor) 130 , m_visitedLinkBorderBottomColor(o.m_visitedLinkBorderBottomColor)
140 , m_order(o.m_order) 131 , m_order(o.m_order)
141 , m_objectPosition(o.m_objectPosition) 132 , m_objectPosition(o.m_objectPosition)
133 , m_alignContent(o.m_alignContent)
134 , m_alignItems(o.m_alignItems)
135 , m_alignSelf(o.m_alignSelf)
136 , m_justifyContent(o.m_justifyContent)
137 , m_justifyItems(o.m_justifyItems)
138 , m_justifySelf(o.m_justifySelf)
142 , m_pageSizeType(o.m_pageSizeType) 139 , m_pageSizeType(o.m_pageSizeType)
143 , m_transformStyle3D(o.m_transformStyle3D) 140 , m_transformStyle3D(o.m_transformStyle3D)
144 , m_backfaceVisibility(o.m_backfaceVisibility) 141 , m_backfaceVisibility(o.m_backfaceVisibility)
145 , m_alignContent(o.m_alignContent)
146 , m_alignContentDistribution(o.m_alignContentDistribution)
147 , m_alignContentOverflowAlignment(o.m_alignContentOverflowAlignment)
148 , m_alignItems(o.m_alignItems)
149 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment)
150 , m_alignSelf(o.m_alignSelf)
151 , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment)
152 , m_justifyContent(o.m_justifyContent)
153 , m_justifyContentDistribution(o.m_justifyContentDistribution)
154 , m_justifyContentOverflowAlignment(o.m_justifyContentOverflowAlignment)
155 , userDrag(o.userDrag) 142 , userDrag(o.userDrag)
156 , textOverflow(o.textOverflow) 143 , textOverflow(o.textOverflow)
157 , marginBeforeCollapse(o.marginBeforeCollapse) 144 , marginBeforeCollapse(o.marginBeforeCollapse)
158 , marginAfterCollapse(o.marginAfterCollapse) 145 , marginAfterCollapse(o.marginAfterCollapse)
159 , m_appearance(o.m_appearance) 146 , m_appearance(o.m_appearance)
160 , m_textCombine(o.m_textCombine) 147 , m_textCombine(o.m_textCombine)
161 , m_textDecorationStyle(o.m_textDecorationStyle) 148 , m_textDecorationStyle(o.m_textDecorationStyle)
162 , m_wrapFlow(o.m_wrapFlow) 149 , m_wrapFlow(o.m_wrapFlow)
163 , m_wrapThrough(o.m_wrapThrough) 150 , m_wrapThrough(o.m_wrapThrough)
164 , m_hasCurrentOpacityAnimation(o.m_hasCurrentOpacityAnimation) 151 , m_hasCurrentOpacityAnimation(o.m_hasCurrentOpacityAnimation)
165 , m_hasCurrentTransformAnimation(o.m_hasCurrentTransformAnimation) 152 , m_hasCurrentTransformAnimation(o.m_hasCurrentTransformAnimation)
166 , m_hasCurrentFilterAnimation(o.m_hasCurrentFilterAnimation) 153 , m_hasCurrentFilterAnimation(o.m_hasCurrentFilterAnimation)
167 , m_runningOpacityAnimationOnCompositor(o.m_runningOpacityAnimationOnComposi tor) 154 , m_runningOpacityAnimationOnCompositor(o.m_runningOpacityAnimationOnComposi tor)
168 , m_runningTransformAnimationOnCompositor(o.m_runningTransformAnimationOnCom positor) 155 , m_runningTransformAnimationOnCompositor(o.m_runningTransformAnimationOnCom positor)
169 , m_runningFilterAnimationOnCompositor(o.m_runningFilterAnimationOnComposito r) 156 , m_runningFilterAnimationOnCompositor(o.m_runningFilterAnimationOnComposito r)
170 , m_effectiveBlendMode(o.m_effectiveBlendMode) 157 , m_effectiveBlendMode(o.m_effectiveBlendMode)
171 , m_touchAction(o.m_touchAction) 158 , m_touchAction(o.m_touchAction)
172 , m_objectFit(o.m_objectFit) 159 , m_objectFit(o.m_objectFit)
173 , m_isolation(o.m_isolation) 160 , m_isolation(o.m_isolation)
174 , m_justifyItems(o.m_justifyItems)
175 , m_justifyItemsOverflowAlignment(o.m_justifyItemsOverflowAlignment)
176 , m_justifyItemsPositionType(o.m_justifyItemsPositionType)
177 , m_justifySelf(o.m_justifySelf)
178 , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment)
179 , m_scrollBehavior(o.m_scrollBehavior) 161 , m_scrollBehavior(o.m_scrollBehavior)
180 , m_scrollBlocksOn(o.m_scrollBlocksOn) 162 , m_scrollBlocksOn(o.m_scrollBlocksOn)
181 , m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAccelerated CompositingForExternalReasons) 163 , m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAccelerated CompositingForExternalReasons)
182 , m_hasInlineTransform(o.m_hasInlineTransform) 164 , m_hasInlineTransform(o.m_hasInlineTransform)
183 , m_resize(o.m_resize) 165 , m_resize(o.m_resize)
184 , m_hasCompositorProxy(o.m_hasCompositorProxy) 166 , m_hasCompositorProxy(o.m_hasCompositorProxy)
185 { 167 {
186 } 168 }
187 169
188 StyleRareNonInheritedData::~StyleRareNonInheritedData() 170 StyleRareNonInheritedData::~StyleRareNonInheritedData()
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColo r 206 && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColo r
225 && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor 207 && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor
226 && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor 208 && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor
227 && m_visitedLinkBorderLeftColor == o.m_visitedLinkBorderLeftColor 209 && m_visitedLinkBorderLeftColor == o.m_visitedLinkBorderLeftColor
228 && m_visitedLinkBorderRightColor == o.m_visitedLinkBorderRightColor 210 && m_visitedLinkBorderRightColor == o.m_visitedLinkBorderRightColor
229 && m_visitedLinkBorderTopColor == o.m_visitedLinkBorderTopColor 211 && m_visitedLinkBorderTopColor == o.m_visitedLinkBorderTopColor
230 && m_visitedLinkBorderBottomColor == o.m_visitedLinkBorderBottomColor 212 && m_visitedLinkBorderBottomColor == o.m_visitedLinkBorderBottomColor
231 && m_order == o.m_order 213 && m_order == o.m_order
232 && m_objectPosition == o.m_objectPosition 214 && m_objectPosition == o.m_objectPosition
233 && m_callbackSelectors == o.m_callbackSelectors 215 && m_callbackSelectors == o.m_callbackSelectors
216 && m_alignContent == o.m_alignContent
217 && m_alignItems == o.m_alignItems
218 && m_alignSelf == o.m_alignSelf
219 && m_justifyContent == o.m_justifyContent
220 && m_justifyItems == o.m_justifyItems
221 && m_justifySelf == o.m_justifySelf
234 && m_pageSizeType == o.m_pageSizeType 222 && m_pageSizeType == o.m_pageSizeType
235 && m_transformStyle3D == o.m_transformStyle3D 223 && m_transformStyle3D == o.m_transformStyle3D
236 && m_backfaceVisibility == o.m_backfaceVisibility 224 && m_backfaceVisibility == o.m_backfaceVisibility
237 && m_alignContent == o.m_alignContent
238 && m_alignContentDistribution == o.m_alignContentDistribution
239 && m_alignContentOverflowAlignment == o.m_alignContentOverflowAlignment
240 && m_alignItems == o.m_alignItems
241 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment
242 && m_alignSelf == o.m_alignSelf
243 && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment
244 && m_justifyContent == o.m_justifyContent
245 && m_justifyContentDistribution == o.m_justifyContentDistribution
246 && m_justifyContentOverflowAlignment == o.m_justifyContentOverflowAlignm ent
247 && userDrag == o.userDrag 225 && userDrag == o.userDrag
248 && textOverflow == o.textOverflow 226 && textOverflow == o.textOverflow
249 && marginBeforeCollapse == o.marginBeforeCollapse 227 && marginBeforeCollapse == o.marginBeforeCollapse
250 && marginAfterCollapse == o.marginAfterCollapse 228 && marginAfterCollapse == o.marginAfterCollapse
251 && m_appearance == o.m_appearance 229 && m_appearance == o.m_appearance
252 && m_textCombine == o.m_textCombine 230 && m_textCombine == o.m_textCombine
253 && m_textDecorationStyle == o.m_textDecorationStyle 231 && m_textDecorationStyle == o.m_textDecorationStyle
254 && m_wrapFlow == o.m_wrapFlow 232 && m_wrapFlow == o.m_wrapFlow
255 && m_wrapThrough == o.m_wrapThrough 233 && m_wrapThrough == o.m_wrapThrough
256 && m_hasCurrentOpacityAnimation == o.m_hasCurrentOpacityAnimation 234 && m_hasCurrentOpacityAnimation == o.m_hasCurrentOpacityAnimation
257 && m_hasCurrentTransformAnimation == o.m_hasCurrentTransformAnimation 235 && m_hasCurrentTransformAnimation == o.m_hasCurrentTransformAnimation
258 && m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation 236 && m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation
259 && m_effectiveBlendMode == o.m_effectiveBlendMode 237 && m_effectiveBlendMode == o.m_effectiveBlendMode
260 && m_touchAction == o.m_touchAction 238 && m_touchAction == o.m_touchAction
261 && m_objectFit == o.m_objectFit 239 && m_objectFit == o.m_objectFit
262 && m_isolation == o.m_isolation 240 && m_isolation == o.m_isolation
263 && m_justifyItems == o.m_justifyItems
264 && m_justifyItemsOverflowAlignment == o.m_justifyItemsOverflowAlignment
265 && m_justifyItemsPositionType == o.m_justifyItemsPositionType
266 && m_justifySelf == o.m_justifySelf
267 && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment
268 && m_scrollBehavior == o.m_scrollBehavior 241 && m_scrollBehavior == o.m_scrollBehavior
269 && m_scrollBlocksOn == o.m_scrollBlocksOn 242 && m_scrollBlocksOn == o.m_scrollBlocksOn
270 && m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcc eleratedCompositingForExternalReasons 243 && m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcc eleratedCompositingForExternalReasons
271 && m_hasInlineTransform == o.m_hasInlineTransform 244 && m_hasInlineTransform == o.m_hasInlineTransform
272 && m_resize == o.m_resize 245 && m_resize == o.m_resize
273 && m_hasCompositorProxy == o.m_hasCompositorProxy; 246 && m_hasCompositorProxy == o.m_hasCompositorProxy;
274 } 247 }
275 248
276 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite dData& o) const 249 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite dData& o) const
277 { 250 {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 { 301 {
329 return dataEquivalent(m_shapeOutside, o.m_shapeOutside); 302 return dataEquivalent(m_shapeOutside, o.m_shapeOutside);
330 } 303 }
331 304
332 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInherit edData& o) const 305 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInherit edData& o) const
333 { 306 {
334 return dataEquivalent(m_clipPath, o.m_clipPath); 307 return dataEquivalent(m_clipPath, o.m_clipPath);
335 } 308 }
336 309
337 } // namespace blink 310 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698