| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_ | 5 #ifndef BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_ |
| 6 #define BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_ | 6 #define BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_ |
| 7 | 7 |
| 8 #include <content/public/renderer/remote_proto_channel.h> |
| 8 #include <memory> | 9 #include <memory> |
| 9 #include <vector> | 10 #include <vector> |
| 10 | 11 |
| 11 #include "base/macros.h" | 12 #include "base/macros.h" |
| 12 #include "base/memory/ref_counted.h" | 13 #include "base/memory/ref_counted.h" |
| 13 #include "base/threading/thread_checker.h" | 14 #include "base/threading/thread_checker.h" |
| 14 #include "blimp/client/core/compositor/blimp_compositor_frame_sink_proxy.h" | 15 #include "blimp/client/core/compositor/blimp_compositor_frame_sink_proxy.h" |
| 15 #include "blimp/client/public/compositor/compositor_dependencies.h" | 16 #include "blimp/client/public/compositor/compositor_dependencies.h" |
| 16 #include "cc/blimp/compositor_state_deserializer.h" | 17 #include "cc/blimp/compositor_state_deserializer.h" |
| 17 #include "cc/surfaces/surface_factory_client.h" | 18 #include "cc/surfaces/surface_factory_client.h" |
| 18 #include "cc/trees/layer_tree_host.h" | 19 #include "cc/trees/layer_tree_host.h" |
| 19 #include "cc/trees/layer_tree_host_client.h" | 20 #include "cc/trees/layer_tree_host_client.h" |
| 20 #include "cc/trees/layer_tree_settings.h" | 21 #include "cc/trees/layer_tree_settings.h" |
| 21 #include "cc/trees/remote_proto_channel.h" | |
| 22 #include "ui/gfx/geometry/size.h" | 22 #include "ui/gfx/geometry/size.h" |
| 23 #include "ui/gfx/native_widget_types.h" | 23 #include "ui/gfx/native_widget_types.h" |
| 24 | 24 |
| 25 namespace base { | 25 namespace base { |
| 26 class SingleThreadTaskRunner; | 26 class SingleThreadTaskRunner; |
| 27 class Thread; | 27 class Thread; |
| 28 } // namespace base | 28 } // namespace base |
| 29 | 29 |
| 30 namespace cc { | 30 namespace cc { |
| 31 class AnimationHost; | 31 class AnimationHost; |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 | 242 |
| 243 base::WeakPtrFactory<BlimpCompositor> weak_ptr_factory_; | 243 base::WeakPtrFactory<BlimpCompositor> weak_ptr_factory_; |
| 244 | 244 |
| 245 DISALLOW_COPY_AND_ASSIGN(BlimpCompositor); | 245 DISALLOW_COPY_AND_ASSIGN(BlimpCompositor); |
| 246 }; | 246 }; |
| 247 | 247 |
| 248 } // namespace client | 248 } // namespace client |
| 249 } // namespace blimp | 249 } // namespace blimp |
| 250 | 250 |
| 251 #endif // BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_ | 251 #endif // BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_ |
| OLD | NEW |