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

Side by Side Diff: cc/layers/layer.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/debug/traced_value.h ('k') | cc/layers/layer_client.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 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 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_H_ 5 #ifndef CC_LAYERS_LAYER_H_
6 #define CC_LAYERS_LAYER_H_ 6 #define CC_LAYERS_LAYER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 25 matching lines...) Expand all
36 #include "ui/gfx/geometry/rect.h" 36 #include "ui/gfx/geometry/rect.h"
37 #include "ui/gfx/geometry/rect_f.h" 37 #include "ui/gfx/geometry/rect_f.h"
38 #include "ui/gfx/geometry/scroll_offset.h" 38 #include "ui/gfx/geometry/scroll_offset.h"
39 #include "ui/gfx/transform.h" 39 #include "ui/gfx/transform.h"
40 40
41 namespace gfx { 41 namespace gfx {
42 class BoxF; 42 class BoxF;
43 } 43 }
44 44
45 namespace base { 45 namespace base {
46 namespace debug { 46 namespace trace_event {
47 class ConvertableToTraceFormat; 47 class ConvertableToTraceFormat;
48 } 48 }
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;
49 } 54 }
55 } // namespace base
50 56
51 namespace cc { 57 namespace cc {
52 58
53 class Animation; 59 class Animation;
54 class AnimationDelegate; 60 class AnimationDelegate;
55 struct AnimationEvent; 61 struct AnimationEvent;
56 class CopyOutputRequest; 62 class CopyOutputRequest;
57 class LayerAnimationDelegate; 63 class LayerAnimationDelegate;
58 class LayerAnimationEventObserver; 64 class LayerAnimationEventObserver;
59 class LayerClient; 65 class LayerClient;
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 714
709 std::vector<FrameTimingRequest> frame_timing_requests_; 715 std::vector<FrameTimingRequest> frame_timing_requests_;
710 bool frame_timing_requests_dirty_; 716 bool frame_timing_requests_dirty_;
711 717
712 DISALLOW_COPY_AND_ASSIGN(Layer); 718 DISALLOW_COPY_AND_ASSIGN(Layer);
713 }; 719 };
714 720
715 } // namespace cc 721 } // namespace cc
716 722
717 #endif // CC_LAYERS_LAYER_H_ 723 #endif // CC_LAYERS_LAYER_H_
OLDNEW
« no previous file with comments | « cc/debug/traced_value.h ('k') | cc/layers/layer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698