| 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/numerics/safe_conversions.h" | 9 #include "base/numerics/safe_conversions.h" |
| 10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
| 11 #include "base/thread_task_runner_handle.h" | 11 #include "base/thread_task_runner_handle.h" |
| 12 #include "base/threading/thread.h" | 12 #include "base/threading/thread.h" |
| 13 #include "base/threading/thread_local.h" | 13 #include "base/threading/thread_local.h" |
| 14 #include "base/threading/thread_restrictions.h" | 14 #include "base/threading/thread_restrictions.h" |
| 15 #include "blimp/client/feature/compositor/blimp_context_provider.h" | 15 #include "blimp/client/feature/compositor/blimp_context_provider.h" |
| 16 #include "blimp/client/feature/compositor/blimp_output_surface.h" | 16 #include "blimp/client/feature/compositor/blimp_output_surface.h" |
| 17 #include "cc/layers/layer.h" | 17 #include "cc/layers/layer.h" |
| 18 #include "cc/layers/layer_settings.h" | |
| 19 #include "cc/output/output_surface.h" | 18 #include "cc/output/output_surface.h" |
| 20 #include "cc/proto/compositor_message.pb.h" | 19 #include "cc/proto/compositor_message.pb.h" |
| 21 #include "cc/trees/layer_tree_host.h" | 20 #include "cc/trees/layer_tree_host.h" |
| 22 #include "net/base/net_errors.h" | 21 #include "net/base/net_errors.h" |
| 23 #include "ui/gl/gl_surface.h" | 22 #include "ui/gl/gl_surface.h" |
| 24 | 23 |
| 25 namespace blimp { | 24 namespace blimp { |
| 26 namespace client { | 25 namespace client { |
| 27 | 26 |
| 28 BlimpCompositor::BlimpCompositor(int render_widget_id, | 27 BlimpCompositor::BlimpCompositor(int render_widget_id, |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 BlimpContextProvider::Create(window_, | 250 BlimpContextProvider::Create(window_, |
| 252 client_->GetGpuMemoryBufferManager()); | 251 client_->GetGpuMemoryBufferManager()); |
| 253 | 252 |
| 254 host_->SetOutputSurface( | 253 host_->SetOutputSurface( |
| 255 make_scoped_ptr(new BlimpOutputSurface(context_provider))); | 254 make_scoped_ptr(new BlimpOutputSurface(context_provider))); |
| 256 output_surface_request_pending_ = false; | 255 output_surface_request_pending_ = false; |
| 257 } | 256 } |
| 258 | 257 |
| 259 } // namespace client | 258 } // namespace client |
| 260 } // namespace blimp | 259 } // namespace blimp |
| OLD | NEW |