OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/html_viewer/web_layer_tree_view_impl.h" | 5 #include "components/html_viewer/web_layer_tree_view_impl.h" |
6 | 6 |
7 #include "base/thread_task_runner_handle.h" | 7 #include "base/thread_task_runner_handle.h" |
8 #include "cc/blink/web_layer_impl.h" | 8 #include "cc/blink/web_layer_impl.h" |
9 #include "cc/layers/layer.h" | 9 #include "cc/layers/layer.h" |
10 #include "cc/output/begin_frame_args.h" | 10 #include "cc/output/begin_frame_args.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 params.main_task_runner = main_thread_compositor_task_runner_; | 47 params.main_task_runner = main_thread_compositor_task_runner_; |
48 | 48 |
49 layer_tree_host_ = | 49 layer_tree_host_ = |
50 cc::LayerTreeHost::CreateThreaded(compositor_message_loop_proxy, ¶ms); | 50 cc::LayerTreeHost::CreateThreaded(compositor_message_loop_proxy, ¶ms); |
51 DCHECK(layer_tree_host_); | 51 DCHECK(layer_tree_host_); |
52 | 52 |
53 if (surface && gpu_service) { | 53 if (surface && gpu_service) { |
54 mojo::CommandBufferPtr cb; | 54 mojo::CommandBufferPtr cb; |
55 gpu_service->CreateOffscreenGLES2Context(GetProxy(&cb)); | 55 gpu_service->CreateOffscreenGLES2Context(GetProxy(&cb)); |
56 scoped_refptr<cc::ContextProvider> context_provider( | 56 scoped_refptr<cc::ContextProvider> context_provider( |
57 new mojo::ContextProviderMojo(cb.PassMessagePipe())); | 57 new mojo::ContextProviderMojo(cb.PassInterface().PassHandle())); |
58 output_surface_.reset( | 58 output_surface_.reset( |
59 new mojo::OutputSurfaceMojo(this, context_provider, surface.Pass())); | 59 new mojo::OutputSurfaceMojo(this, context_provider, surface.Pass())); |
60 } | 60 } |
61 layer_tree_host_->SetLayerTreeHostClientReady(); | 61 layer_tree_host_->SetLayerTreeHostClientReady(); |
62 } | 62 } |
63 | 63 |
64 WebLayerTreeViewImpl::~WebLayerTreeViewImpl() { | 64 WebLayerTreeViewImpl::~WebLayerTreeViewImpl() { |
65 } | 65 } |
66 | 66 |
67 void WebLayerTreeViewImpl::WillBeginMainFrame() { | 67 void WebLayerTreeViewImpl::WillBeginMainFrame() { |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
246 base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread, | 246 base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread, |
247 main_thread_bound_weak_ptr_, | 247 main_thread_bound_weak_ptr_, |
248 id)); | 248 id)); |
249 } | 249 } |
250 | 250 |
251 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) { | 251 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) { |
252 view_->SetSurfaceId(mojo::SurfaceId::From(id)); | 252 view_->SetSurfaceId(mojo::SurfaceId::From(id)); |
253 } | 253 } |
254 | 254 |
255 } // namespace html_viewer | 255 } // namespace html_viewer |
OLD | NEW |