Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 31 #ifndef AnimatableFilterOperations_h | 31 #ifndef AnimatableFilterOperations_h |
| 32 #define AnimatableFilterOperations_h | 32 #define AnimatableFilterOperations_h |
| 33 | 33 |
| 34 #include "core/animation/animatable/AnimatableValue.h" | 34 #include "core/animation/animatable/AnimatableValue.h" |
| 35 #include "platform/graphics/filters/FilterOperations.h" | 35 #include "platform/graphics/filters/FilterOperations.h" |
| 36 | 36 |
| 37 namespace blink { | 37 namespace blink { |
| 38 | 38 |
| 39 class AnimatableFilterOperations final : public AnimatableValue { | 39 class AnimatableFilterOperations final : public AnimatableValue { |
| 40 public: | 40 public: |
| 41 static PassRefPtrWillBeRawPtr<AnimatableFilterOperations> create(const Filte rOperations& operations) | 41 static PassRefPtr<AnimatableFilterOperations> create(const FilterOperations& operations) |
| 42 { | 42 { |
| 43 return adoptRefWillBeNoop(new AnimatableFilterOperations(operations)); | 43 return adoptRef(new AnimatableFilterOperations(operations)); |
| 44 } | 44 } |
| 45 | 45 |
| 46 ~AnimatableFilterOperations() override { } | 46 ~AnimatableFilterOperations() override { } |
| 47 DECLARE_VIRTUAL_TRACE(); | |
| 48 | 47 |
| 49 const FilterOperations& operations() const { return m_operations; } | 48 const FilterOperations& operations() const |
| 49 { | |
| 50 #if ENABLE(OILPAN) | |
| 51 return m_operationWrapper->operations(); | |
| 52 #else | |
| 53 return m_operations; | |
| 54 #endif | |
| 55 } | |
| 50 | 56 |
| 51 protected: | 57 protected: |
| 52 PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const AnimatableValue* , double fraction) const override; | 58 PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fra ction) const override; |
| 53 bool usesDefaultInterpolationWith(const AnimatableValue*) const override; | 59 bool usesDefaultInterpolationWith(const AnimatableValue*) const override; |
| 54 | 60 |
| 55 private: | 61 private: |
| 56 AnimatableFilterOperations(const FilterOperations& operations) | 62 AnimatableFilterOperations(const FilterOperations& operations) |
| 63 #if ENABLE(OILPAN) | |
| 64 : m_operationWrapper(FilterOperationsWrapper::create(operations)) | |
| 65 #else | |
| 57 : m_operations(operations) | 66 : m_operations(operations) |
| 67 #endif | |
| 58 { | 68 { |
| 59 } | 69 } |
| 60 | 70 |
| 61 bool equalTo(const AnimatableValue*) const override; | 71 bool equalTo(const AnimatableValue*) const override; |
| 62 AnimatableType type() const override { return TypeFilterOperations; } | 72 AnimatableType type() const override { return TypeFilterOperations; } |
| 63 | 73 |
| 74 #if ENABLE(OILPAN) | |
| 75 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
| |
| 76 #else | |
| 64 FilterOperations m_operations; | 77 FilterOperations m_operations; |
| 78 #endif | |
| 65 }; | 79 }; |
| 66 | 80 |
| 67 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableFilterOperations, isFilterOperation s()); | 81 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableFilterOperations, isFilterOperation s()); |
| 68 | 82 |
| 69 } // namespace blink | 83 } // namespace blink |
| 70 | 84 |
| 71 #endif // AnimatableFilterOperations_h | 85 #endif // AnimatableFilterOperations_h |
| OLD | NEW |