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

Side by Side Diff: cc/layers/layer_impl.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/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 24 matching lines...) Expand all
35 #include "third_party/skia/include/core/SkColor.h" 35 #include "third_party/skia/include/core/SkColor.h"
36 #include "third_party/skia/include/core/SkImageFilter.h" 36 #include "third_party/skia/include/core/SkImageFilter.h"
37 #include "third_party/skia/include/core/SkPicture.h" 37 #include "third_party/skia/include/core/SkPicture.h"
38 #include "ui/gfx/geometry/point3_f.h" 38 #include "ui/gfx/geometry/point3_f.h"
39 #include "ui/gfx/geometry/rect.h" 39 #include "ui/gfx/geometry/rect.h"
40 #include "ui/gfx/geometry/rect_f.h" 40 #include "ui/gfx/geometry/rect_f.h"
41 #include "ui/gfx/geometry/scroll_offset.h" 41 #include "ui/gfx/geometry/scroll_offset.h"
42 #include "ui/gfx/transform.h" 42 #include "ui/gfx/transform.h"
43 43
44 namespace base { 44 namespace base {
45 namespace debug { 45 namespace trace_event {
46 class ConvertableToTraceFormat; 46 class ConvertableToTraceFormat;
47 class TracedValue; 47 class TracedValue;
48 } 48 }
49 49
50 // TODO(ssid): remove these aliases after the tracing clients are moved to the
51 // new trace_event namespace. See crbug.com/451032. ETA: March 2015
52 namespace debug {
53 using ::base::trace_event::ConvertableToTraceFormat;
54 using ::base::trace_event::TracedValue;
55 }
50 class DictionaryValue; 56 class DictionaryValue;
51 } 57 } // namespace base
52 58
53 namespace cc { 59 namespace cc {
54 60
55 class LayerTreeHostImpl; 61 class LayerTreeHostImpl;
56 class LayerTreeImpl; 62 class LayerTreeImpl;
57 class MicroBenchmarkImpl; 63 class MicroBenchmarkImpl;
58 class Occlusion; 64 class Occlusion;
59 template <typename LayerType> 65 template <typename LayerType>
60 class OcclusionTracker; 66 class OcclusionTracker;
61 class RenderPass; 67 class RenderPass;
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 770
765 std::vector<FrameTimingRequest> frame_timing_requests_; 771 std::vector<FrameTimingRequest> frame_timing_requests_;
766 bool frame_timing_requests_dirty_; 772 bool frame_timing_requests_dirty_;
767 773
768 DISALLOW_COPY_AND_ASSIGN(LayerImpl); 774 DISALLOW_COPY_AND_ASSIGN(LayerImpl);
769 }; 775 };
770 776
771 } // namespace cc 777 } // namespace cc
772 778
773 #endif // CC_LAYERS_LAYER_IMPL_H_ 779 #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