| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 CC_OUTPUT_FILTER_OPERATIONS_H_ | 5 #ifndef CC_OUTPUT_FILTER_OPERATIONS_H_ |
| 6 #define CC_OUTPUT_FILTER_OPERATIONS_H_ | 6 #define CC_OUTPUT_FILTER_OPERATIONS_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/memory/scoped_ptr.h" |
| 11 #include "cc/output/filter_operation.h" | 12 #include "cc/output/filter_operation.h" |
| 12 | 13 |
| 14 namespace base { |
| 15 class Value; |
| 16 } |
| 17 |
| 13 namespace cc { | 18 namespace cc { |
| 14 | 19 |
| 15 // An ordered list of filter operations. | 20 // An ordered list of filter operations. |
| 16 class CC_EXPORT FilterOperations { | 21 class CC_EXPORT FilterOperations { |
| 17 public: | 22 public: |
| 18 FilterOperations(); | 23 FilterOperations(); |
| 19 | 24 |
| 20 FilterOperations(const FilterOperations& other); | 25 FilterOperations(const FilterOperations& other); |
| 21 | 26 |
| 22 ~FilterOperations(); | 27 ~FilterOperations(); |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 // |progress| fraction of the way from the filter in |from| | 60 // |progress| fraction of the way from the filter in |from| |
| 56 // to the filter in this. If either |from| or this is an empty sequence, | 61 // to the filter in this. If either |from| or this is an empty sequence, |
| 57 // it is treated as a sequence of the same length as the other sequence, | 62 // it is treated as a sequence of the same length as the other sequence, |
| 58 // where the filter at each position is a no-op filter of the same type | 63 // where the filter at each position is a no-op filter of the same type |
| 59 // as the filter in that position in the other sequence. Otherwise, if | 64 // as the filter in that position in the other sequence. Otherwise, if |
| 60 // both |from| and this are non-empty sequences but are either of different | 65 // both |from| and this are non-empty sequences but are either of different |
| 61 // lengths or if there is a type mismatch at some position, returns a copy | 66 // lengths or if there is a type mismatch at some position, returns a copy |
| 62 // of this. | 67 // of this. |
| 63 FilterOperations Blend(const FilterOperations& from, double progress) const; | 68 FilterOperations Blend(const FilterOperations& from, double progress) const; |
| 64 | 69 |
| 70 scoped_ptr<base::Value> AsValue() const; |
| 71 |
| 65 private: | 72 private: |
| 66 std::vector<FilterOperation> operations_; | 73 std::vector<FilterOperation> operations_; |
| 67 }; | 74 }; |
| 68 | 75 |
| 69 } // namespace cc | 76 } // namespace cc |
| 70 | 77 |
| 71 #endif // CC_OUTPUT_FILTER_OPERATIONS_H_ | 78 #endif // CC_OUTPUT_FILTER_OPERATIONS_H_ |
| OLD | NEW |