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

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

Issue 2223133004: Removed Wrap-Flow and Wrap-Through from ComputedStyle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed stale comment and rebase Created 4 years, 4 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
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 , m_justifySelf(ComputedStyle::initialSelfAlignment()) 96 , m_justifySelf(ComputedStyle::initialSelfAlignment())
97 , m_pageSizeType(PAGE_SIZE_AUTO) 97 , m_pageSizeType(PAGE_SIZE_AUTO)
98 , m_transformStyle3D(ComputedStyle::initialTransformStyle3D()) 98 , m_transformStyle3D(ComputedStyle::initialTransformStyle3D())
99 , m_backfaceVisibility(ComputedStyle::initialBackfaceVisibility()) 99 , m_backfaceVisibility(ComputedStyle::initialBackfaceVisibility())
100 , userDrag(ComputedStyle::initialUserDrag()) 100 , userDrag(ComputedStyle::initialUserDrag())
101 , textOverflow(ComputedStyle::initialTextOverflow()) 101 , textOverflow(ComputedStyle::initialTextOverflow())
102 , marginBeforeCollapse(MarginCollapseCollapse) 102 , marginBeforeCollapse(MarginCollapseCollapse)
103 , marginAfterCollapse(MarginCollapseCollapse) 103 , marginAfterCollapse(MarginCollapseCollapse)
104 , m_appearance(ComputedStyle::initialAppearance()) 104 , m_appearance(ComputedStyle::initialAppearance())
105 , m_textDecorationStyle(ComputedStyle::initialTextDecorationStyle()) 105 , m_textDecorationStyle(ComputedStyle::initialTextDecorationStyle())
106 , m_wrapFlow(ComputedStyle::initialWrapFlow())
107 , m_wrapThrough(ComputedStyle::initialWrapThrough())
108 , m_hasCurrentOpacityAnimation(false) 106 , m_hasCurrentOpacityAnimation(false)
109 , m_hasCurrentTransformAnimation(false) 107 , m_hasCurrentTransformAnimation(false)
110 , m_hasCurrentFilterAnimation(false) 108 , m_hasCurrentFilterAnimation(false)
111 , m_hasCurrentBackdropFilterAnimation(false) 109 , m_hasCurrentBackdropFilterAnimation(false)
112 , m_runningOpacityAnimationOnCompositor(false) 110 , m_runningOpacityAnimationOnCompositor(false)
113 , m_runningTransformAnimationOnCompositor(false) 111 , m_runningTransformAnimationOnCompositor(false)
114 , m_runningFilterAnimationOnCompositor(false) 112 , m_runningFilterAnimationOnCompositor(false)
115 , m_runningBackdropFilterAnimationOnCompositor(false) 113 , m_runningBackdropFilterAnimationOnCompositor(false)
116 , m_isStackingContext(false) 114 , m_isStackingContext(false)
117 , m_effectiveBlendMode(ComputedStyle::initialBlendMode()) 115 , m_effectiveBlendMode(ComputedStyle::initialBlendMode())
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 , m_justifySelf(o.m_justifySelf) 177 , m_justifySelf(o.m_justifySelf)
180 , m_pageSizeType(o.m_pageSizeType) 178 , m_pageSizeType(o.m_pageSizeType)
181 , m_transformStyle3D(o.m_transformStyle3D) 179 , m_transformStyle3D(o.m_transformStyle3D)
182 , m_backfaceVisibility(o.m_backfaceVisibility) 180 , m_backfaceVisibility(o.m_backfaceVisibility)
183 , userDrag(o.userDrag) 181 , userDrag(o.userDrag)
184 , textOverflow(o.textOverflow) 182 , textOverflow(o.textOverflow)
185 , marginBeforeCollapse(o.marginBeforeCollapse) 183 , marginBeforeCollapse(o.marginBeforeCollapse)
186 , marginAfterCollapse(o.marginAfterCollapse) 184 , marginAfterCollapse(o.marginAfterCollapse)
187 , m_appearance(o.m_appearance) 185 , m_appearance(o.m_appearance)
188 , m_textDecorationStyle(o.m_textDecorationStyle) 186 , m_textDecorationStyle(o.m_textDecorationStyle)
189 , m_wrapFlow(o.m_wrapFlow)
190 , m_wrapThrough(o.m_wrapThrough)
191 , m_hasCurrentOpacityAnimation(o.m_hasCurrentOpacityAnimation) 187 , m_hasCurrentOpacityAnimation(o.m_hasCurrentOpacityAnimation)
192 , m_hasCurrentTransformAnimation(o.m_hasCurrentTransformAnimation) 188 , m_hasCurrentTransformAnimation(o.m_hasCurrentTransformAnimation)
193 , m_hasCurrentFilterAnimation(o.m_hasCurrentFilterAnimation) 189 , m_hasCurrentFilterAnimation(o.m_hasCurrentFilterAnimation)
194 , m_hasCurrentBackdropFilterAnimation(o.m_hasCurrentBackdropFilterAnimation) 190 , m_hasCurrentBackdropFilterAnimation(o.m_hasCurrentBackdropFilterAnimation)
195 , m_runningOpacityAnimationOnCompositor(o.m_runningOpacityAnimationOnComposi tor) 191 , m_runningOpacityAnimationOnCompositor(o.m_runningOpacityAnimationOnComposi tor)
196 , m_runningTransformAnimationOnCompositor(o.m_runningTransformAnimationOnCom positor) 192 , m_runningTransformAnimationOnCompositor(o.m_runningTransformAnimationOnCom positor)
197 , m_runningFilterAnimationOnCompositor(o.m_runningFilterAnimationOnComposito r) 193 , m_runningFilterAnimationOnCompositor(o.m_runningFilterAnimationOnComposito r)
198 , m_runningBackdropFilterAnimationOnCompositor(o.m_runningBackdropFilterAnim ationOnCompositor) 194 , m_runningBackdropFilterAnimationOnCompositor(o.m_runningBackdropFilterAnim ationOnCompositor)
199 , m_isStackingContext(o.m_isStackingContext) 195 , m_isStackingContext(o.m_isStackingContext)
200 , m_effectiveBlendMode(o.m_effectiveBlendMode) 196 , m_effectiveBlendMode(o.m_effectiveBlendMode)
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 && m_justifySelf == o.m_justifySelf 262 && m_justifySelf == o.m_justifySelf
267 && m_pageSizeType == o.m_pageSizeType 263 && m_pageSizeType == o.m_pageSizeType
268 && m_transformStyle3D == o.m_transformStyle3D 264 && m_transformStyle3D == o.m_transformStyle3D
269 && m_backfaceVisibility == o.m_backfaceVisibility 265 && m_backfaceVisibility == o.m_backfaceVisibility
270 && userDrag == o.userDrag 266 && userDrag == o.userDrag
271 && textOverflow == o.textOverflow 267 && textOverflow == o.textOverflow
272 && marginBeforeCollapse == o.marginBeforeCollapse 268 && marginBeforeCollapse == o.marginBeforeCollapse
273 && marginAfterCollapse == o.marginAfterCollapse 269 && marginAfterCollapse == o.marginAfterCollapse
274 && m_appearance == o.m_appearance 270 && m_appearance == o.m_appearance
275 && m_textDecorationStyle == o.m_textDecorationStyle 271 && m_textDecorationStyle == o.m_textDecorationStyle
276 && m_wrapFlow == o.m_wrapFlow
277 && m_wrapThrough == o.m_wrapThrough
278 && m_hasCurrentOpacityAnimation == o.m_hasCurrentOpacityAnimation 272 && m_hasCurrentOpacityAnimation == o.m_hasCurrentOpacityAnimation
279 && m_hasCurrentTransformAnimation == o.m_hasCurrentTransformAnimation 273 && m_hasCurrentTransformAnimation == o.m_hasCurrentTransformAnimation
280 && m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation 274 && m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation
281 && m_hasCurrentBackdropFilterAnimation == o.m_hasCurrentBackdropFilterAn imation 275 && m_hasCurrentBackdropFilterAnimation == o.m_hasCurrentBackdropFilterAn imation
282 && m_isStackingContext == o.m_isStackingContext 276 && m_isStackingContext == o.m_isStackingContext
283 && m_effectiveBlendMode == o.m_effectiveBlendMode 277 && m_effectiveBlendMode == o.m_effectiveBlendMode
284 && m_touchAction == o.m_touchAction 278 && m_touchAction == o.m_touchAction
285 && m_objectFit == o.m_objectFit 279 && m_objectFit == o.m_objectFit
286 && m_isolation == o.m_isolation 280 && m_isolation == o.m_isolation
287 && m_contain == o.m_contain 281 && m_contain == o.m_contain
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 { 349 {
356 return dataEquivalent(m_shapeOutside, o.m_shapeOutside); 350 return dataEquivalent(m_shapeOutside, o.m_shapeOutside);
357 } 351 }
358 352
359 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInherit edData& o) const 353 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInherit edData& o) const
360 { 354 {
361 return dataEquivalent(m_clipPath, o.m_clipPath); 355 return dataEquivalent(m_clipPath, o.m_clipPath);
362 } 356 }
363 357
364 } // namespace blink 358 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698