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

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

Issue 869043008: Reland of Move tracing namespace from base::debug to base::trace_event. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Fix suppressions 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.h ('k') | cc/quads/draw_quad.h » ('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 debug { 15 namespace trace_event {
16 class TracedValue; 16 class TracedValue;
17 } 17 }
18
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 }
18 class Value; 24 class Value;
19 } 25 } // namespace base
20 26
21 namespace cc { 27 namespace cc {
22 28
23 // An ordered list of filter operations. 29 // An ordered list of filter operations.
24 class CC_EXPORT FilterOperations { 30 class CC_EXPORT FilterOperations {
25 public: 31 public:
26 FilterOperations(); 32 FilterOperations();
27 33
28 FilterOperations(const FilterOperations& other); 34 FilterOperations(const FilterOperations& other);
29 35
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 78
73 void AsValueInto(base::debug::TracedValue* value) const; 79 void AsValueInto(base::debug::TracedValue* value) const;
74 80
75 private: 81 private:
76 std::vector<FilterOperation> operations_; 82 std::vector<FilterOperation> operations_;
77 }; 83 };
78 84
79 } // namespace cc 85 } // namespace cc
80 86
81 #endif // CC_OUTPUT_FILTER_OPERATIONS_H_ 87 #endif // CC_OUTPUT_FILTER_OPERATIONS_H_
OLDNEW
« no previous file with comments | « cc/output/filter_operation.h ('k') | cc/quads/draw_quad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698