Index: Source/core/animation/animatable/AnimatableFilterOperations.h |
diff --git a/Source/core/animation/animatable/AnimatableFilterOperations.h b/Source/core/animation/animatable/AnimatableFilterOperations.h |
index 073155a23bb5e394b095a4a1c535fbb719a8702f..915fbd8ba47d4e79e8ed56fc341befd5969198aa 100644 |
--- a/Source/core/animation/animatable/AnimatableFilterOperations.h |
+++ b/Source/core/animation/animatable/AnimatableFilterOperations.h |
@@ -38,30 +38,44 @@ namespace blink { |
class AnimatableFilterOperations final : public AnimatableValue { |
public: |
- static PassRefPtrWillBeRawPtr<AnimatableFilterOperations> create(const FilterOperations& operations) |
+ static PassRefPtr<AnimatableFilterOperations> create(const FilterOperations& operations) |
{ |
- return adoptRefWillBeNoop(new AnimatableFilterOperations(operations)); |
+ return adoptRef(new AnimatableFilterOperations(operations)); |
} |
~AnimatableFilterOperations() override { } |
- DECLARE_VIRTUAL_TRACE(); |
- const FilterOperations& operations() const { return m_operations; } |
+ const FilterOperations& operations() const |
+ { |
+#if ENABLE(OILPAN) |
+ return m_operationWrapper->operations(); |
+#else |
+ return m_operations; |
+#endif |
+ } |
protected: |
- PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const override; |
+ PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const override; |
bool usesDefaultInterpolationWith(const AnimatableValue*) const override; |
private: |
AnimatableFilterOperations(const FilterOperations& operations) |
+#if ENABLE(OILPAN) |
+ : m_operationWrapper(FilterOperationsWrapper::create(operations)) |
+#else |
: m_operations(operations) |
+#endif |
{ |
} |
bool equalTo(const AnimatableValue*) const override; |
AnimatableType type() const override { return TypeFilterOperations; } |
+#if ENABLE(OILPAN) |
+ Persistent<FilterOperationsWrapper> m_operationWrapper; |
alancutter (OOO until 2018)
2015/09/03 02:28:09
Why do we need to wrap the non Oilpanned FilterOpe
haraken
2015/09/03 02:40:12
Your point is valid and I'm planning to remove the
|
+#else |
FilterOperations m_operations; |
+#endif |
}; |
DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableFilterOperations, isFilterOperations()); |