| OLD | NEW |
| 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 22 matching lines...) Expand all Loading... |
| 33 #include "third_party/skia/include/core/SkColor.h" | 33 #include "third_party/skia/include/core/SkColor.h" |
| 34 #include "third_party/skia/include/core/SkImageFilter.h" | 34 #include "third_party/skia/include/core/SkImageFilter.h" |
| 35 #include "third_party/skia/include/core/SkPicture.h" | 35 #include "third_party/skia/include/core/SkPicture.h" |
| 36 #include "ui/gfx/geometry/point3_f.h" | 36 #include "ui/gfx/geometry/point3_f.h" |
| 37 #include "ui/gfx/geometry/rect.h" | 37 #include "ui/gfx/geometry/rect.h" |
| 38 #include "ui/gfx/geometry/rect_f.h" | 38 #include "ui/gfx/geometry/rect_f.h" |
| 39 #include "ui/gfx/geometry/scroll_offset.h" | 39 #include "ui/gfx/geometry/scroll_offset.h" |
| 40 #include "ui/gfx/transform.h" | 40 #include "ui/gfx/transform.h" |
| 41 | 41 |
| 42 namespace base { | 42 namespace base { |
| 43 namespace debug { | 43 namespace trace_event { |
| 44 class ConvertableToTraceFormat; | 44 class ConvertableToTraceFormat; |
| 45 class TracedValue; | 45 class TracedValue; |
| 46 } | 46 } |
| 47 | 47 |
| 48 namespace debug { |
| 49 using ::base::trace_event::ConvertableToTraceFormat; |
| 50 using ::base::trace_event::TracedValue; |
| 51 } |
| 52 |
| 48 class DictionaryValue; | 53 class DictionaryValue; |
| 49 } | 54 } // namespace base |
| 50 | 55 |
| 51 namespace cc { | 56 namespace cc { |
| 52 | 57 |
| 53 class LayerTreeHostImpl; | 58 class LayerTreeHostImpl; |
| 54 class LayerTreeImpl; | 59 class LayerTreeImpl; |
| 55 class MicroBenchmarkImpl; | 60 class MicroBenchmarkImpl; |
| 56 class Occlusion; | 61 class Occlusion; |
| 57 template <typename LayerType> | 62 template <typename LayerType> |
| 58 class OcclusionTracker; | 63 class OcclusionTracker; |
| 59 class RenderPass; | 64 class RenderPass; |
| (...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 731 | 736 |
| 732 std::vector<FrameTimingRequest> frame_timing_requests_; | 737 std::vector<FrameTimingRequest> frame_timing_requests_; |
| 733 bool frame_timing_requests_dirty_; | 738 bool frame_timing_requests_dirty_; |
| 734 | 739 |
| 735 DISALLOW_COPY_AND_ASSIGN(LayerImpl); | 740 DISALLOW_COPY_AND_ASSIGN(LayerImpl); |
| 736 }; | 741 }; |
| 737 | 742 |
| 738 } // namespace cc | 743 } // namespace cc |
| 739 | 744 |
| 740 #endif // CC_LAYERS_LAYER_IMPL_H_ | 745 #endif // CC_LAYERS_LAYER_IMPL_H_ |
| OLD | NEW |