OLD | NEW |
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 Loading... |
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 trace_event { |
| 47 class ConvertableToTraceFormat; |
| 48 } |
| 49 |
46 namespace debug { | 50 namespace debug { |
47 class ConvertableToTraceFormat; | 51 using ::base::trace_event::ConvertableToTraceFormat; |
48 } | 52 } |
49 } | 53 } |
50 | 54 |
51 namespace cc { | 55 namespace cc { |
52 | 56 |
53 class Animation; | 57 class Animation; |
54 class AnimationDelegate; | 58 class AnimationDelegate; |
55 struct AnimationEvent; | 59 struct AnimationEvent; |
56 class CopyOutputRequest; | 60 class CopyOutputRequest; |
57 class LayerAnimationDelegate; | 61 class LayerAnimationDelegate; |
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
705 | 709 |
706 std::vector<FrameTimingRequest> frame_timing_requests_; | 710 std::vector<FrameTimingRequest> frame_timing_requests_; |
707 bool frame_timing_requests_dirty_; | 711 bool frame_timing_requests_dirty_; |
708 | 712 |
709 DISALLOW_COPY_AND_ASSIGN(Layer); | 713 DISALLOW_COPY_AND_ASSIGN(Layer); |
710 }; | 714 }; |
711 | 715 |
712 } // namespace cc | 716 } // namespace cc |
713 | 717 |
714 #endif // CC_LAYERS_LAYER_H_ | 718 #endif // CC_LAYERS_LAYER_H_ |
OLD | NEW |