Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

Side by Side Diff: cc/output/filter_operations.h

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/output/filter_operation.cc ('k') | cc/output/filter_operations.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/memory/scoped_ptr.h"
12 #include "cc/output/filter_operation.h" 12 #include "cc/output/filter_operation.h"
13 13
14 namespace base { 14 namespace base {
15 namespace trace_event { 15 namespace trace_event {
16 class TracedValue; 16 class TracedValue;
17 } 17 }
18 18 class Value;
19 // TODO(ssid): remove these aliases after the tracing clients are moved to the
20 // new trace_event namespace. See crbug.com/451032. ETA: March 2015
21 namespace debug {
22 using ::base::trace_event::TracedValue;
23 } 19 }
24 class Value;
25 } // namespace base
26 20
27 namespace cc { 21 namespace cc {
28 22
29 // An ordered list of filter operations. 23 // An ordered list of filter operations.
30 class CC_EXPORT FilterOperations { 24 class CC_EXPORT FilterOperations {
31 public: 25 public:
32 FilterOperations(); 26 FilterOperations();
33 27
34 FilterOperations(const FilterOperations& other); 28 FilterOperations(const FilterOperations& other);
35 29
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 // contain any reference filters, returns a FilterOperations formed by 63 // contain any reference filters, returns a FilterOperations formed by
70 // linearly interpolating at each position a |progress| fraction of the way 64 // linearly interpolating at each position a |progress| fraction of the way
71 // from the filter in |from| to the filter in this. If |from| and this are of 65 // from the filter in |from| to the filter in this. If |from| and this are of
72 // different lengths, they are treated as having the same length by padding 66 // different lengths, they are treated as having the same length by padding
73 // the shorter sequence with no-op filters of the same type as the filters in 67 // the shorter sequence with no-op filters of the same type as the filters in
74 // the corresponding positions in the longer sequence. If either sequence has 68 // the corresponding positions in the longer sequence. If either sequence has
75 // a reference filter or if there is a type mismatch at some position, returns 69 // a reference filter or if there is a type mismatch at some position, returns
76 // a copy of this. 70 // a copy of this.
77 FilterOperations Blend(const FilterOperations& from, double progress) const; 71 FilterOperations Blend(const FilterOperations& from, double progress) const;
78 72
79 void AsValueInto(base::debug::TracedValue* value) const; 73 void AsValueInto(base::trace_event::TracedValue* value) const;
80 74
81 private: 75 private:
82 std::vector<FilterOperation> operations_; 76 std::vector<FilterOperation> operations_;
83 }; 77 };
84 78
85 } // namespace cc 79 } // namespace cc
86 80
87 #endif // CC_OUTPUT_FILTER_OPERATIONS_H_ 81 #endif // CC_OUTPUT_FILTER_OPERATIONS_H_
OLDNEW
« no previous file with comments | « cc/output/filter_operation.cc ('k') | cc/output/filter_operations.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698