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

Side by Side Diff: cc/quads/render_pass.h

Issue 882673002: Move tracing namespace from base::debug to base::trace_event. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_trace_part1
Patch Set: Edited formatting 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
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
Primiano Tucci (use gerrit) 2015/02/03 10:42:36 Nit: I think you want this blank line below "class
ssid 2015/02/03 15:08:07 Done.
26 class Value; 27 class Value;
27 }; 28 // This is added temporarily. Once the renaming of namespace usages
29 // accross all folders are done, this will be removed.
30 // TODO(ssid): crrev.com/837303004
31 namespace debug {
32 using ::base::trace_event::TracedValue;
33 }
34 } // namespace base
28 35
29 namespace cc { 36 namespace cc {
30 37
31 class DrawQuad; 38 class DrawQuad;
32 class CopyOutputRequest; 39 class CopyOutputRequest;
33 class RenderPassDrawQuad; 40 class RenderPassDrawQuad;
34 class SharedQuadState; 41 class SharedQuadState;
35 42
36 // A list of DrawQuad objects, sorted internally in front-to-back order. 43 // A list of DrawQuad objects, sorted internally in front-to-back order.
37 class QuadList : public ListContainer<DrawQuad> { 44 class QuadList : public ListContainer<DrawQuad> {
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 } 147 }
141 }; 148 };
142 } // namespace BASE_HASH_NAMESPACE 149 } // namespace BASE_HASH_NAMESPACE
143 150
144 namespace cc { 151 namespace cc {
145 typedef ScopedPtrVector<RenderPass> RenderPassList; 152 typedef ScopedPtrVector<RenderPass> RenderPassList;
146 typedef base::hash_map<RenderPassId, RenderPass*> RenderPassIdHashMap; 153 typedef base::hash_map<RenderPassId, RenderPass*> RenderPassIdHashMap;
147 } // namespace cc 154 } // namespace cc
148 155
149 #endif // CC_QUADS_RENDER_PASS_H_ 156 #endif // CC_QUADS_RENDER_PASS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698