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

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: 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 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 // This is added temporarily. Once the renaming of namespace usages
51 // accross all folders are done, this will be removed.
52 // TODO(ssid): crrev.com/837303004
53 namespace debug {
54 using ::base::trace_event::ConvertableToTraceFormat;
49 } 55 }
56 } // namespace base
50 57
51 namespace cc { 58 namespace cc {
52 59
53 class Animation; 60 class Animation;
54 class AnimationDelegate; 61 class AnimationDelegate;
55 struct AnimationEvent; 62 struct AnimationEvent;
56 class CopyOutputRequest; 63 class CopyOutputRequest;
57 class LayerAnimationDelegate; 64 class LayerAnimationDelegate;
58 class LayerAnimationEventObserver; 65 class LayerAnimationEventObserver;
59 class LayerClient; 66 class LayerClient;
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 712
706 std::vector<FrameTimingRequest> frame_timing_requests_; 713 std::vector<FrameTimingRequest> frame_timing_requests_;
707 bool frame_timing_requests_dirty_; 714 bool frame_timing_requests_dirty_;
708 715
709 DISALLOW_COPY_AND_ASSIGN(Layer); 716 DISALLOW_COPY_AND_ASSIGN(Layer);
710 }; 717 };
711 718
712 } // namespace cc 719 } // namespace cc
713 720
714 #endif // CC_LAYERS_LAYER_H_ 721 #endif // CC_LAYERS_LAYER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698