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

Side by Side Diff: cc/layers/layer_impl.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: Rebase. 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/layers/layer_client.h ('k') | cc/output/begin_frame_args.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_LAYERS_LAYER_IMPL_H_ 5 #ifndef CC_LAYERS_LAYER_IMPL_H_
6 #define CC_LAYERS_LAYER_IMPL_H_ 6 #define CC_LAYERS_LAYER_IMPL_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 23 matching lines...) Expand all
34 #include "third_party/skia/include/core/SkColor.h" 34 #include "third_party/skia/include/core/SkColor.h"
35 #include "third_party/skia/include/core/SkImageFilter.h" 35 #include "third_party/skia/include/core/SkImageFilter.h"
36 #include "third_party/skia/include/core/SkPicture.h" 36 #include "third_party/skia/include/core/SkPicture.h"
37 #include "ui/gfx/geometry/point3_f.h" 37 #include "ui/gfx/geometry/point3_f.h"
38 #include "ui/gfx/geometry/rect.h" 38 #include "ui/gfx/geometry/rect.h"
39 #include "ui/gfx/geometry/rect_f.h" 39 #include "ui/gfx/geometry/rect_f.h"
40 #include "ui/gfx/geometry/scroll_offset.h" 40 #include "ui/gfx/geometry/scroll_offset.h"
41 #include "ui/gfx/transform.h" 41 #include "ui/gfx/transform.h"
42 42
43 namespace base { 43 namespace base {
44 namespace debug { 44 namespace trace_event {
45 class ConvertableToTraceFormat; 45 class ConvertableToTraceFormat;
46 class TracedValue; 46 class TracedValue;
47 } 47 }
48 48
49 // TODO(ssid): remove these aliases after the tracing clients are moved to the
50 // new trace_event namespace. See crbug.com/451032. ETA: March 2015
51 namespace debug {
52 using ::base::trace_event::ConvertableToTraceFormat;
53 using ::base::trace_event::TracedValue;
54 }
49 class DictionaryValue; 55 class DictionaryValue;
50 } 56 } // namespace base
51 57
52 namespace cc { 58 namespace cc {
53 59
54 class LayerTreeHostImpl; 60 class LayerTreeHostImpl;
55 class LayerTreeImpl; 61 class LayerTreeImpl;
56 class MicroBenchmarkImpl; 62 class MicroBenchmarkImpl;
57 class Occlusion; 63 class Occlusion;
58 template <typename LayerType> 64 template <typename LayerType>
59 class OcclusionTracker; 65 class OcclusionTracker;
60 class RenderPass; 66 class RenderPass;
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 760
755 std::vector<FrameTimingRequest> frame_timing_requests_; 761 std::vector<FrameTimingRequest> frame_timing_requests_;
756 bool frame_timing_requests_dirty_; 762 bool frame_timing_requests_dirty_;
757 763
758 DISALLOW_COPY_AND_ASSIGN(LayerImpl); 764 DISALLOW_COPY_AND_ASSIGN(LayerImpl);
759 }; 765 };
760 766
761 } // namespace cc 767 } // namespace cc
762 768
763 #endif // CC_LAYERS_LAYER_IMPL_H_ 769 #endif // CC_LAYERS_LAYER_IMPL_H_
OLDNEW
« no previous file with comments | « cc/layers/layer_client.h ('k') | cc/output/begin_frame_args.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698