OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "sky/engine/config.h" | 5 #include "sky/engine/config.h" |
6 #include "sky/engine/core/animation/css/CSSPropertyEquality.h" | 6 #include "sky/engine/core/animation/css/CSSPropertyEquality.h" |
7 | 7 |
8 #include "sky/engine/core/animation/css/CSSAnimations.h" | 8 #include "sky/engine/core/animation/css/CSSAnimations.h" |
9 #include "sky/engine/core/rendering/style/DataEquivalency.h" | 9 #include "sky/engine/core/rendering/style/DataEquivalency.h" |
10 #include "sky/engine/core/rendering/style/RenderStyle.h" | 10 #include "sky/engine/core/rendering/style/RenderStyle.h" |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 case CSSPropertyBorderTopWidth: | 102 case CSSPropertyBorderTopWidth: |
103 return a.borderTopWidth() == b.borderTopWidth(); | 103 return a.borderTopWidth() == b.borderTopWidth(); |
104 case CSSPropertyBottom: | 104 case CSSPropertyBottom: |
105 return a.bottom() == b.bottom(); | 105 return a.bottom() == b.bottom(); |
106 case CSSPropertyBoxShadow: | 106 case CSSPropertyBoxShadow: |
107 return dataEquivalent(a.boxShadow(), b.boxShadow()); | 107 return dataEquivalent(a.boxShadow(), b.boxShadow()); |
108 case CSSPropertyClip: | 108 case CSSPropertyClip: |
109 return a.clip() == b.clip(); | 109 return a.clip() == b.clip(); |
110 case CSSPropertyColor: | 110 case CSSPropertyColor: |
111 return a.color() == b.color(); | 111 return a.color() == b.color(); |
| 112 case CSSPropertyFilter: |
| 113 return a.filter() == b.filter(); |
112 case CSSPropertyFlexBasis: | 114 case CSSPropertyFlexBasis: |
113 return a.flexBasis() == b.flexBasis(); | 115 return a.flexBasis() == b.flexBasis(); |
114 case CSSPropertyFlexGrow: | 116 case CSSPropertyFlexGrow: |
115 return a.flexGrow() == b.flexGrow(); | 117 return a.flexGrow() == b.flexGrow(); |
116 case CSSPropertyFlexShrink: | 118 case CSSPropertyFlexShrink: |
117 return a.flexShrink() == b.flexShrink(); | 119 return a.flexShrink() == b.flexShrink(); |
118 case CSSPropertyFontSize: | 120 case CSSPropertyFontSize: |
119 // CSSPropertyFontSize: Must pass a specified size to setFontSize if Tex
t Autosizing is enabled, but a computed size | 121 // CSSPropertyFontSize: Must pass a specified size to setFontSize if Tex
t Autosizing is enabled, but a computed size |
120 // if text zoom is enabled (if neither is enabled it's irrelevant as the
y're probably the same). | 122 // if text zoom is enabled (if neither is enabled it's irrelevant as the
y're probably the same). |
121 // FIXME: Should we introduce an option to pass the computed font size h
ere, allowing consumers to | 123 // FIXME: Should we introduce an option to pass the computed font size h
ere, allowing consumers to |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
187 case CSSPropertyWebkitBackgroundSize: | 189 case CSSPropertyWebkitBackgroundSize: |
188 return fillLayersEqual<CSSPropertyWebkitBackgroundSize>(a.backgroundLaye
rs(), b.backgroundLayers()); | 190 return fillLayersEqual<CSSPropertyWebkitBackgroundSize>(a.backgroundLaye
rs(), b.backgroundLayers()); |
189 case CSSPropertyWebkitBorderHorizontalSpacing: | 191 case CSSPropertyWebkitBorderHorizontalSpacing: |
190 return a.horizontalBorderSpacing() == b.horizontalBorderSpacing(); | 192 return a.horizontalBorderSpacing() == b.horizontalBorderSpacing(); |
191 case CSSPropertyWebkitBorderVerticalSpacing: | 193 case CSSPropertyWebkitBorderVerticalSpacing: |
192 return a.verticalBorderSpacing() == b.verticalBorderSpacing(); | 194 return a.verticalBorderSpacing() == b.verticalBorderSpacing(); |
193 case CSSPropertyWebkitBoxShadow: | 195 case CSSPropertyWebkitBoxShadow: |
194 return dataEquivalent(a.boxShadow(), b.boxShadow()); | 196 return dataEquivalent(a.boxShadow(), b.boxShadow()); |
195 case CSSPropertyWebkitClipPath: | 197 case CSSPropertyWebkitClipPath: |
196 return dataEquivalent(a.clipPath(), b.clipPath()); | 198 return dataEquivalent(a.clipPath(), b.clipPath()); |
197 case CSSPropertyWebkitFilter: | |
198 return a.filter() == b.filter(); | |
199 case CSSPropertyWebkitMaskBoxImageOutset: | 199 case CSSPropertyWebkitMaskBoxImageOutset: |
200 return a.maskBoxImageOutset() == b.maskBoxImageOutset(); | 200 return a.maskBoxImageOutset() == b.maskBoxImageOutset(); |
201 case CSSPropertyWebkitMaskBoxImageSlice: | 201 case CSSPropertyWebkitMaskBoxImageSlice: |
202 return a.maskBoxImageSlices() == b.maskBoxImageSlices(); | 202 return a.maskBoxImageSlices() == b.maskBoxImageSlices(); |
203 case CSSPropertyWebkitMaskBoxImageSource: | 203 case CSSPropertyWebkitMaskBoxImageSource: |
204 return dataEquivalent(a.maskBoxImageSource(), b.maskBoxImageSource()); | 204 return dataEquivalent(a.maskBoxImageSource(), b.maskBoxImageSource()); |
205 case CSSPropertyWebkitMaskBoxImageWidth: | 205 case CSSPropertyWebkitMaskBoxImageWidth: |
206 return a.maskBoxImageWidth() == b.maskBoxImageWidth(); | 206 return a.maskBoxImageWidth() == b.maskBoxImageWidth(); |
207 case CSSPropertyWebkitMaskImage: | 207 case CSSPropertyWebkitMaskImage: |
208 return dataEquivalent(a.maskImage(), b.maskImage()); | 208 return dataEquivalent(a.maskImage(), b.maskImage()); |
(...skipping 21 matching lines...) Expand all Loading... |
230 return a.wordSpacing() == b.wordSpacing(); | 230 return a.wordSpacing() == b.wordSpacing(); |
231 case CSSPropertyZIndex: | 231 case CSSPropertyZIndex: |
232 return a.zIndex() == b.zIndex(); | 232 return a.zIndex() == b.zIndex(); |
233 default: | 233 default: |
234 ASSERT_NOT_REACHED(); | 234 ASSERT_NOT_REACHED(); |
235 return true; | 235 return true; |
236 } | 236 } |
237 } | 237 } |
238 | 238 |
239 } | 239 } |
OLD | NEW |