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 "mojo/services/html_viewer/weblayertreeview_impl.h" | 5 #include "mojo/services/html_viewer/weblayertreeview_impl.h" |
6 | 6 |
7 #include "base/message_loop/message_loop_proxy.h" | 7 #include "base/message_loop/message_loop_proxy.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" |
| 11 #include "cc/scheduler/begin_frame_source.h" |
11 #include "cc/trees/layer_tree_host.h" | 12 #include "cc/trees/layer_tree_host.h" |
12 #include "mojo/cc/context_provider_mojo.h" | 13 #include "mojo/cc/context_provider_mojo.h" |
13 #include "mojo/cc/output_surface_mojo.h" | 14 #include "mojo/cc/output_surface_mojo.h" |
14 #include "mojo/converters/surfaces/surfaces_type_converters.h" | 15 #include "mojo/converters/surfaces/surfaces_type_converters.h" |
15 #include "mojo/services/public/cpp/view_manager/view.h" | 16 #include "mojo/services/public/cpp/view_manager/view.h" |
16 #include "third_party/WebKit/public/web/WebWidget.h" | 17 #include "third_party/WebKit/public/web/WebWidget.h" |
17 | 18 |
18 namespace mojo { | 19 namespace mojo { |
19 | 20 |
20 WebLayerTreeViewImpl::WebLayerTreeViewImpl( | 21 WebLayerTreeViewImpl::WebLayerTreeViewImpl( |
(...skipping 19 matching lines...) Expand all Loading... |
40 | 41 |
41 cc::SharedBitmapManager* shared_bitmap_manager = NULL; | 42 cc::SharedBitmapManager* shared_bitmap_manager = NULL; |
42 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager = NULL; | 43 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager = NULL; |
43 | 44 |
44 layer_tree_host_ = | 45 layer_tree_host_ = |
45 cc::LayerTreeHost::CreateThreaded(this, | 46 cc::LayerTreeHost::CreateThreaded(this, |
46 shared_bitmap_manager, | 47 shared_bitmap_manager, |
47 gpu_memory_buffer_manager, | 48 gpu_memory_buffer_manager, |
48 settings, | 49 settings, |
49 base::MessageLoopProxy::current(), | 50 base::MessageLoopProxy::current(), |
50 compositor_message_loop_proxy); | 51 compositor_message_loop_proxy, |
| 52 nullptr); |
51 DCHECK(layer_tree_host_); | 53 DCHECK(layer_tree_host_); |
52 } | 54 } |
53 | 55 |
54 WebLayerTreeViewImpl::~WebLayerTreeViewImpl() { | 56 WebLayerTreeViewImpl::~WebLayerTreeViewImpl() { |
55 } | 57 } |
56 | 58 |
57 void WebLayerTreeViewImpl::WillBeginMainFrame(int frame_id) { | 59 void WebLayerTreeViewImpl::WillBeginMainFrame(int frame_id) { |
58 } | 60 } |
59 | 61 |
60 void WebLayerTreeViewImpl::DidBeginMainFrame() { | 62 void WebLayerTreeViewImpl::DidBeginMainFrame() { |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
236 base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread, | 238 base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread, |
237 main_thread_bound_weak_ptr_, | 239 main_thread_bound_weak_ptr_, |
238 id)); | 240 id)); |
239 } | 241 } |
240 | 242 |
241 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) { | 243 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) { |
242 view_->SetSurfaceId(SurfaceId::From(id)); | 244 view_->SetSurfaceId(SurfaceId::From(id)); |
243 } | 245 } |
244 | 246 |
245 } // namespace mojo | 247 } // namespace mojo |
OLD | NEW |