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

Side by Side Diff: cc/quads/render_pass.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/quads/draw_quad.h ('k') | cc/quads/shared_quad_state.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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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_QUADS_RENDER_PASS_H_ 5 #ifndef CC_QUADS_RENDER_PASS_H_
6 #define CC_QUADS_RENDER_PASS_H_ 6 #define CC_QUADS_RENDER_PASS_H_
7 7
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/containers/hash_tables.h" 12 #include "base/containers/hash_tables.h"
13 #include "cc/base/cc_export.h" 13 #include "cc/base/cc_export.h"
14 #include "cc/base/scoped_ptr_vector.h" 14 #include "cc/base/scoped_ptr_vector.h"
15 #include "cc/quads/list_container.h" 15 #include "cc/quads/list_container.h"
16 #include "cc/quads/render_pass_id.h" 16 #include "cc/quads/render_pass_id.h"
17 #include "skia/ext/refptr.h" 17 #include "skia/ext/refptr.h"
18 #include "ui/gfx/geometry/rect.h" 18 #include "ui/gfx/geometry/rect.h"
19 #include "ui/gfx/geometry/rect_f.h" 19 #include "ui/gfx/geometry/rect_f.h"
20 #include "ui/gfx/transform.h" 20 #include "ui/gfx/transform.h"
21 21
22 namespace base { 22 namespace base {
23 namespace debug { 23 namespace trace_event {
24 class TracedValue; 24 class TracedValue;
25 } 25 }
26 class Value; 26 class Value;
27 }; 27
28 // TODO(ssid): remove these aliases after the tracing clients are moved to the
29 // new trace_event namespace. See crbug.com/451032. ETA: March 2015
30 namespace debug {
31 using ::base::trace_event::TracedValue;
32 }
33 } // namespace base
28 34
29 namespace cc { 35 namespace cc {
30 36
31 class DrawQuad; 37 class DrawQuad;
32 class CopyOutputRequest; 38 class CopyOutputRequest;
33 class RenderPassDrawQuad; 39 class RenderPassDrawQuad;
34 class SharedQuadState; 40 class SharedQuadState;
35 41
36 // A list of DrawQuad objects, sorted internally in front-to-back order. 42 // A list of DrawQuad objects, sorted internally in front-to-back order.
37 class QuadList : public ListContainer<DrawQuad> { 43 class QuadList : public ListContainer<DrawQuad> {
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 } 146 }
141 }; 147 };
142 } // namespace BASE_HASH_NAMESPACE 148 } // namespace BASE_HASH_NAMESPACE
143 149
144 namespace cc { 150 namespace cc {
145 typedef ScopedPtrVector<RenderPass> RenderPassList; 151 typedef ScopedPtrVector<RenderPass> RenderPassList;
146 typedef base::hash_map<RenderPassId, RenderPass*> RenderPassIdHashMap; 152 typedef base::hash_map<RenderPassId, RenderPass*> RenderPassIdHashMap;
147 } // namespace cc 153 } // namespace cc
148 154
149 #endif // CC_QUADS_RENDER_PASS_H_ 155 #endif // CC_QUADS_RENDER_PASS_H_
OLDNEW
« no previous file with comments | « cc/quads/draw_quad.h ('k') | cc/quads/shared_quad_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698