| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #ifndef InterpolationValue_h | 5 #ifndef InterpolationValue_h |
| 6 #define InterpolationValue_h | 6 #define InterpolationValue_h |
| 7 | 7 |
| 8 #include "core/animation/InterpolableValue.h" | 8 #include "core/animation/InterpolableValue.h" |
| 9 #include "core/animation/NonInterpolableValue.h" | 9 #include "core/animation/NonInterpolableValue.h" |
| 10 #include "platform/heap/Handle.h" | 10 #include "platform/heap/Handle.h" |
| 11 #include <memory> | 11 #include <memory> |
| 12 | 12 |
| 13 namespace blink { | 13 namespace blink { |
| 14 | 14 |
| 15 // Represents a (non-strict) subset of a PropertySpecificKeyframe's value broken
down into interpolable and non-interpolable parts. | 15 // Represents a (non-strict) subset of a PropertySpecificKeyframe's value broken |
| 16 // InterpolationValues can be composed together to represent a whole PropertySpe
cificKeyframe value. | 16 // down into interpolable and non-interpolable parts. InterpolationValues can be |
| 17 // composed together to represent a whole PropertySpecificKeyframe value. |
| 17 struct InterpolationValue { | 18 struct InterpolationValue { |
| 18 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW(); | 19 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW(); |
| 19 | 20 |
| 20 explicit InterpolationValue( | 21 explicit InterpolationValue( |
| 21 std::unique_ptr<InterpolableValue> interpolableValue, | 22 std::unique_ptr<InterpolableValue> interpolableValue, |
| 22 PassRefPtr<NonInterpolableValue> nonInterpolableValue = nullptr) | 23 PassRefPtr<NonInterpolableValue> nonInterpolableValue = nullptr) |
| 23 : interpolableValue(std::move(interpolableValue)), | 24 : interpolableValue(std::move(interpolableValue)), |
| 24 nonInterpolableValue(nonInterpolableValue) {} | 25 nonInterpolableValue(nonInterpolableValue) {} |
| 25 | 26 |
| 26 InterpolationValue(std::nullptr_t) {} | 27 InterpolationValue(std::nullptr_t) {} |
| (...skipping 20 matching lines...) Expand all Loading... |
| 47 nonInterpolableValue.clear(); | 48 nonInterpolableValue.clear(); |
| 48 } | 49 } |
| 49 | 50 |
| 50 std::unique_ptr<InterpolableValue> interpolableValue; | 51 std::unique_ptr<InterpolableValue> interpolableValue; |
| 51 RefPtr<NonInterpolableValue> nonInterpolableValue; | 52 RefPtr<NonInterpolableValue> nonInterpolableValue; |
| 52 }; | 53 }; |
| 53 | 54 |
| 54 } // namespace blink | 55 } // namespace blink |
| 55 | 56 |
| 56 #endif // InterpolationValue_h | 57 #endif // InterpolationValue_h |
| OLD | NEW |