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

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

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:
View unified diff | Download patch
« no previous file with comments | « sky/engine/core/rendering/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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 , m_transformStyle3D(RenderStyle::initialTransformStyle3D()) 47 , m_transformStyle3D(RenderStyle::initialTransformStyle3D())
48 , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility()) 48 , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility())
49 , m_alignContent(RenderStyle::initialAlignContent()) 49 , m_alignContent(RenderStyle::initialAlignContent())
50 , m_alignItems(RenderStyle::initialAlignItems()) 50 , m_alignItems(RenderStyle::initialAlignItems())
51 , m_alignItemsOverflowAlignment(RenderStyle::initialAlignItemsOverflowAlignm ent()) 51 , m_alignItemsOverflowAlignment(RenderStyle::initialAlignItemsOverflowAlignm ent())
52 , m_alignSelf(RenderStyle::initialAlignSelf()) 52 , m_alignSelf(RenderStyle::initialAlignSelf())
53 , m_alignSelfOverflowAlignment(RenderStyle::initialAlignSelfOverflowAlignmen t()) 53 , m_alignSelfOverflowAlignment(RenderStyle::initialAlignSelfOverflowAlignmen t())
54 , m_justifyContent(RenderStyle::initialJustifyContent()) 54 , m_justifyContent(RenderStyle::initialJustifyContent())
55 , userDrag(RenderStyle::initialUserDrag()) 55 , userDrag(RenderStyle::initialUserDrag())
56 , textOverflow(RenderStyle::initialTextOverflow()) 56 , textOverflow(RenderStyle::initialTextOverflow())
57 , marginBeforeCollapse(MCOLLAPSE)
58 , marginAfterCollapse(MCOLLAPSE)
59 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) 57 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle())
60 , m_wrapFlow(RenderStyle::initialWrapFlow()) 58 , m_wrapFlow(RenderStyle::initialWrapFlow())
61 , m_wrapThrough(RenderStyle::initialWrapThrough()) 59 , m_wrapThrough(RenderStyle::initialWrapThrough())
62 , m_hasCurrentOpacityAnimation(false) 60 , m_hasCurrentOpacityAnimation(false)
63 , m_hasCurrentTransformAnimation(false) 61 , m_hasCurrentTransformAnimation(false)
64 , m_hasCurrentFilterAnimation(false) 62 , m_hasCurrentFilterAnimation(false)
65 , m_runningOpacityAnimationOnCompositor(false) 63 , m_runningOpacityAnimationOnCompositor(false)
66 , m_runningTransformAnimationOnCompositor(false) 64 , m_runningTransformAnimationOnCompositor(false)
67 , m_runningFilterAnimationOnCompositor(false) 65 , m_runningFilterAnimationOnCompositor(false)
68 , m_hasAspectRatio(false) 66 , m_hasAspectRatio(false)
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 , m_transformStyle3D(o.m_transformStyle3D) 105 , m_transformStyle3D(o.m_transformStyle3D)
108 , m_backfaceVisibility(o.m_backfaceVisibility) 106 , m_backfaceVisibility(o.m_backfaceVisibility)
109 , m_alignContent(o.m_alignContent) 107 , m_alignContent(o.m_alignContent)
110 , m_alignItems(o.m_alignItems) 108 , m_alignItems(o.m_alignItems)
111 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment) 109 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment)
112 , m_alignSelf(o.m_alignSelf) 110 , m_alignSelf(o.m_alignSelf)
113 , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment) 111 , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment)
114 , m_justifyContent(o.m_justifyContent) 112 , m_justifyContent(o.m_justifyContent)
115 , userDrag(o.userDrag) 113 , userDrag(o.userDrag)
116 , textOverflow(o.textOverflow) 114 , textOverflow(o.textOverflow)
117 , marginBeforeCollapse(o.marginBeforeCollapse)
118 , marginAfterCollapse(o.marginAfterCollapse)
119 , m_textDecorationStyle(o.m_textDecorationStyle) 115 , m_textDecorationStyle(o.m_textDecorationStyle)
120 , m_wrapFlow(o.m_wrapFlow) 116 , m_wrapFlow(o.m_wrapFlow)
121 , m_wrapThrough(o.m_wrapThrough) 117 , m_wrapThrough(o.m_wrapThrough)
122 , m_hasCurrentOpacityAnimation(o.m_hasCurrentOpacityAnimation) 118 , m_hasCurrentOpacityAnimation(o.m_hasCurrentOpacityAnimation)
123 , m_hasCurrentTransformAnimation(o.m_hasCurrentTransformAnimation) 119 , m_hasCurrentTransformAnimation(o.m_hasCurrentTransformAnimation)
124 , m_hasCurrentFilterAnimation(o.m_hasCurrentFilterAnimation) 120 , m_hasCurrentFilterAnimation(o.m_hasCurrentFilterAnimation)
125 , m_runningOpacityAnimationOnCompositor(o.m_runningOpacityAnimationOnComposi tor) 121 , m_runningOpacityAnimationOnCompositor(o.m_runningOpacityAnimationOnComposi tor)
126 , m_runningTransformAnimationOnCompositor(o.m_runningTransformAnimationOnCom positor) 122 , m_runningTransformAnimationOnCompositor(o.m_runningTransformAnimationOnCom positor)
127 , m_runningFilterAnimationOnCompositor(o.m_runningFilterAnimationOnComposito r) 123 , m_runningFilterAnimationOnCompositor(o.m_runningFilterAnimationOnComposito r)
128 , m_hasAspectRatio(o.m_hasAspectRatio) 124 , m_hasAspectRatio(o.m_hasAspectRatio)
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 && m_transformStyle3D == o.m_transformStyle3D 166 && m_transformStyle3D == o.m_transformStyle3D
171 && m_backfaceVisibility == o.m_backfaceVisibility 167 && m_backfaceVisibility == o.m_backfaceVisibility
172 && m_alignContent == o.m_alignContent 168 && m_alignContent == o.m_alignContent
173 && m_alignItems == o.m_alignItems 169 && m_alignItems == o.m_alignItems
174 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment 170 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment
175 && m_alignSelf == o.m_alignSelf 171 && m_alignSelf == o.m_alignSelf
176 && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment 172 && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment
177 && m_justifyContent == o.m_justifyContent 173 && m_justifyContent == o.m_justifyContent
178 && userDrag == o.userDrag 174 && userDrag == o.userDrag
179 && textOverflow == o.textOverflow 175 && textOverflow == o.textOverflow
180 && marginBeforeCollapse == o.marginBeforeCollapse
181 && marginAfterCollapse == o.marginAfterCollapse
182 && m_textDecorationStyle == o.m_textDecorationStyle 176 && m_textDecorationStyle == o.m_textDecorationStyle
183 && m_wrapFlow == o.m_wrapFlow 177 && m_wrapFlow == o.m_wrapFlow
184 && m_wrapThrough == o.m_wrapThrough 178 && m_wrapThrough == o.m_wrapThrough
185 && m_hasCurrentOpacityAnimation == o.m_hasCurrentOpacityAnimation 179 && m_hasCurrentOpacityAnimation == o.m_hasCurrentOpacityAnimation
186 && m_hasCurrentTransformAnimation == o.m_hasCurrentTransformAnimation 180 && m_hasCurrentTransformAnimation == o.m_hasCurrentTransformAnimation
187 && m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation 181 && m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation
188 && m_hasAspectRatio == o.m_hasAspectRatio 182 && m_hasAspectRatio == o.m_hasAspectRatio
189 && m_touchAction == o.m_touchAction 183 && m_touchAction == o.m_touchAction
190 && m_objectFit == o.m_objectFit 184 && m_objectFit == o.m_objectFit
191 && m_justifyItems == o.m_justifyItems 185 && m_justifyItems == o.m_justifyItems
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 return false; 219 return false;
226 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions); 220 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions);
227 } 221 }
228 222
229 bool StyleRareNonInheritedData::hasFilters() const 223 bool StyleRareNonInheritedData::hasFilters() const
230 { 224 {
231 return m_filter.get() && !m_filter->m_operations.isEmpty(); 225 return m_filter.get() && !m_filter->m_operations.isEmpty();
232 } 226 }
233 227
234 } // namespace blink 228 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698