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 #include "blimp/client/feature/compositor/blimp_compositor.h" | 5 #include "blimp/client/feature/compositor/blimp_compositor.h" |
6 | 6 |
7 #include "base/bind_helpers.h" | 7 #include "base/bind_helpers.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "base/numerics/safe_conversions.h" | 10 #include "base/numerics/safe_conversions.h" |
11 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
12 #include "base/thread_task_runner_handle.h" | |
13 #include "base/threading/thread.h" | 12 #include "base/threading/thread.h" |
14 #include "base/threading/thread_local.h" | 13 #include "base/threading/thread_local.h" |
15 #include "base/threading/thread_restrictions.h" | 14 #include "base/threading/thread_restrictions.h" |
| 15 #include "base/threading/thread_task_runner_handle.h" |
16 #include "blimp/client/feature/compositor/blimp_context_provider.h" | 16 #include "blimp/client/feature/compositor/blimp_context_provider.h" |
17 #include "blimp/client/feature/compositor/blimp_output_surface.h" | 17 #include "blimp/client/feature/compositor/blimp_output_surface.h" |
18 #include "cc/layers/layer.h" | 18 #include "cc/layers/layer.h" |
19 #include "cc/output/output_surface.h" | 19 #include "cc/output/output_surface.h" |
20 #include "cc/proto/compositor_message.pb.h" | 20 #include "cc/proto/compositor_message.pb.h" |
21 #include "cc/trees/layer_tree_host.h" | 21 #include "cc/trees/layer_tree_host.h" |
22 #include "net/base/net_errors.h" | 22 #include "net/base/net_errors.h" |
23 #include "ui/gl/gl_surface.h" | 23 #include "ui/gl/gl_surface.h" |
24 | 24 |
25 namespace blimp { | 25 namespace blimp { |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 BlimpContextProvider::Create(window_, | 255 BlimpContextProvider::Create(window_, |
256 client_->GetGpuMemoryBufferManager()); | 256 client_->GetGpuMemoryBufferManager()); |
257 | 257 |
258 host_->SetOutputSurface( | 258 host_->SetOutputSurface( |
259 base::WrapUnique(new BlimpOutputSurface(context_provider))); | 259 base::WrapUnique(new BlimpOutputSurface(context_provider))); |
260 output_surface_request_pending_ = false; | 260 output_surface_request_pending_ = false; |
261 } | 261 } |
262 | 262 |
263 } // namespace client | 263 } // namespace client |
264 } // namespace blimp | 264 } // namespace blimp |
OLD | NEW |