| 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 "config.h" | 5 #include "config.h" |
| 6 #include "core/animation/DeferredLegacyStyleInterpolation.h" | 6 #include "core/animation/DeferredLegacyStyleInterpolation.h" |
| 7 | 7 |
| 8 #include "core/animation/ElementAnimations.h" | 8 #include "core/animation/ElementAnimations.h" |
| 9 #include "core/animation/css/CSSAnimatableValueFactory.h" | 9 #include "core/animation/css/CSSAnimatableValueFactory.h" |
| 10 #include "core/css/CSSBasicShapes.h" | 10 #include "core/css/CSSBasicShapes.h" |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 size_t length = valueList.length(); | 123 size_t length = valueList.length(); |
| 124 for (size_t index = 0; index < length; ++index) { | 124 for (size_t index = 0; index < length; ++index) { |
| 125 if (interpolationRequiresStyleResolve(*valueList.item(index))) | 125 if (interpolationRequiresStyleResolve(*valueList.item(index))) |
| 126 return true; | 126 return true; |
| 127 } | 127 } |
| 128 return false; | 128 return false; |
| 129 } | 129 } |
| 130 | 130 |
| 131 bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C
SSValuePair& pair) | 131 bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C
SSValuePair& pair) |
| 132 { | 132 { |
| 133 return interpolationRequiresStyleResolve(*pair.first()) | 133 return interpolationRequiresStyleResolve(pair.first()) |
| 134 || interpolationRequiresStyleResolve(*pair.second()); | 134 || interpolationRequiresStyleResolve(pair.second()); |
| 135 } | 135 } |
| 136 | 136 |
| 137 bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C
SSBasicShape& shape) | 137 bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C
SSBasicShape& shape) |
| 138 { | 138 { |
| 139 // FIXME: Should determine the specific shape, and inspect the members. | 139 // FIXME: Should determine the specific shape, and inspect the members. |
| 140 return false; | 140 return false; |
| 141 } | 141 } |
| 142 | 142 |
| 143 bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C
SSQuadValue& quad) | 143 bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C
SSQuadValue& quad) |
| 144 { | 144 { |
| 145 return interpolationRequiresStyleResolve(*quad.top()) | 145 return interpolationRequiresStyleResolve(*quad.top()) |
| 146 || interpolationRequiresStyleResolve(*quad.right()) | 146 || interpolationRequiresStyleResolve(*quad.right()) |
| 147 || interpolationRequiresStyleResolve(*quad.bottom()) | 147 || interpolationRequiresStyleResolve(*quad.bottom()) |
| 148 || interpolationRequiresStyleResolve(*quad.left()); | 148 || interpolationRequiresStyleResolve(*quad.left()); |
| 149 } | 149 } |
| 150 | 150 |
| 151 DEFINE_TRACE(DeferredLegacyStyleInterpolation) | 151 DEFINE_TRACE(DeferredLegacyStyleInterpolation) |
| 152 { | 152 { |
| 153 visitor->trace(m_startCSSValue); | 153 visitor->trace(m_startCSSValue); |
| 154 visitor->trace(m_endCSSValue); | 154 visitor->trace(m_endCSSValue); |
| 155 visitor->trace(m_innerInterpolation); | 155 visitor->trace(m_innerInterpolation); |
| 156 StyleInterpolation::trace(visitor); | 156 StyleInterpolation::trace(visitor); |
| 157 } | 157 } |
| 158 | 158 |
| 159 } | 159 } |
| OLD | NEW |