| 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 "core/animation/css/CSSPropertyEquality.h" | 5 #include "core/animation/css/CSSPropertyEquality.h" |
| 6 | 6 |
| 7 #include "core/animation/css/CSSAnimations.h" | 7 #include "core/animation/css/CSSAnimations.h" |
| 8 #include "core/style/DataEquivalency.h" | 8 #include "core/style/DataEquivalency.h" |
| 9 #include "core/style/ComputedStyle.h" | 9 #include "core/style/ComputedStyle.h" |
| 10 #include "core/style/ShadowList.h" | 10 #include "core/style/ShadowList.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 } | 45 } |
| 46 | 46 |
| 47 aLayer = aLayer->next(); | 47 aLayer = aLayer->next(); |
| 48 bLayer = bLayer->next(); | 48 bLayer = bLayer->next(); |
| 49 } | 49 } |
| 50 | 50 |
| 51 // FIXME: Shouldn't this be return !aLayer && !bLayer; ? | 51 // FIXME: Shouldn't this be return !aLayer && !bLayer; ? |
| 52 return true; | 52 return true; |
| 53 } | 53 } |
| 54 | 54 |
| 55 } | 55 } // namespace |
| 56 | 56 |
| 57 bool CSSPropertyEquality::propertiesEqual(CSSPropertyID prop, const ComputedStyl
e& a, const ComputedStyle& b) | 57 bool CSSPropertyEquality::propertiesEqual(CSSPropertyID prop, const ComputedStyl
e& a, const ComputedStyle& b) |
| 58 { | 58 { |
| 59 switch (prop) { | 59 switch (prop) { |
| 60 case CSSPropertyBackgroundColor: | 60 case CSSPropertyBackgroundColor: |
| 61 return a.backgroundColor() == b.backgroundColor() | 61 return a.backgroundColor() == b.backgroundColor() |
| 62 && a.visitedLinkBackgroundColor() == b.visitedLinkBackgroundColor(); | 62 && a.visitedLinkBackgroundColor() == b.visitedLinkBackgroundColor(); |
| 63 case CSSPropertyBackgroundImage: | 63 case CSSPropertyBackgroundImage: |
| 64 return fillLayersEqual<CSSPropertyBackgroundImage>(a.backgroundLayers(),
b.backgroundLayers()); | 64 return fillLayersEqual<CSSPropertyBackgroundImage>(a.backgroundLayers(),
b.backgroundLayers()); |
| 65 case CSSPropertyBackgroundPositionX: | 65 case CSSPropertyBackgroundPositionX: |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 case CSSPropertyRy: | 331 case CSSPropertyRy: |
| 332 return a.svgStyle().ry() == b.svgStyle().ry(); | 332 return a.svgStyle().ry() == b.svgStyle().ry(); |
| 333 case CSSPropertyZIndex: | 333 case CSSPropertyZIndex: |
| 334 return a.hasAutoZIndex() == b.hasAutoZIndex() && (a.hasAutoZIndex() || a
.zIndex() == b.zIndex()); | 334 return a.hasAutoZIndex() == b.hasAutoZIndex() && (a.hasAutoZIndex() || a
.zIndex() == b.zIndex()); |
| 335 default: | 335 default: |
| 336 ASSERT_NOT_REACHED(); | 336 ASSERT_NOT_REACHED(); |
| 337 return true; | 337 return true; |
| 338 } | 338 } |
| 339 } | 339 } |
| 340 | 340 |
| 341 } | 341 } // namespace blink |
| OLD | NEW |