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/scheduler/begin_frame_source.h" |
12 #include "cc/trees/layer_tree_host.h" | 12 #include "cc/trees/layer_tree_host.h" |
13 #include "mojo/cc/context_provider_mojo.h" | 13 #include "mojo/cc/context_provider_mojo.h" |
14 #include "mojo/cc/output_surface_mojo.h" | 14 #include "mojo/cc/output_surface_mojo.h" |
15 #include "mojo/converters/surfaces/surfaces_type_converters.h" | 15 #include "mojo/converters/surfaces/surfaces_type_converters.h" |
16 #include "mojo/services/view_manager/public/cpp/view.h" | |
17 #include "third_party/WebKit/public/web/WebWidget.h" | 16 #include "third_party/WebKit/public/web/WebWidget.h" |
| 17 #include "third_party/mojo_services/src/view_manager/public/cpp/view.h" |
18 | 18 |
19 namespace html_viewer { | 19 namespace html_viewer { |
20 | 20 |
21 WebLayerTreeViewImpl::WebLayerTreeViewImpl( | 21 WebLayerTreeViewImpl::WebLayerTreeViewImpl( |
22 scoped_refptr<base::MessageLoopProxy> compositor_message_loop_proxy, | 22 scoped_refptr<base::MessageLoopProxy> compositor_message_loop_proxy, |
23 mojo::SurfacesServicePtr surfaces_service, | 23 mojo::SurfacesServicePtr surfaces_service, |
24 mojo::GpuPtr gpu_service) | 24 mojo::GpuPtr gpu_service) |
25 : widget_(NULL), | 25 : widget_(NULL), |
26 view_(NULL), | 26 view_(NULL), |
27 surfaces_service_(surfaces_service.Pass()), | 27 surfaces_service_(surfaces_service.Pass()), |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
245 base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread, | 245 base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread, |
246 main_thread_bound_weak_ptr_, | 246 main_thread_bound_weak_ptr_, |
247 id)); | 247 id)); |
248 } | 248 } |
249 | 249 |
250 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) { | 250 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) { |
251 view_->SetSurfaceId(mojo::SurfaceId::From(id)); | 251 view_->SetSurfaceId(mojo::SurfaceId::From(id)); |
252 } | 252 } |
253 | 253 |
254 } // namespace html_viewer | 254 } // namespace html_viewer |
OLD | NEW |