Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: mojo/services/html_viewer/weblayertreeview_impl.cc

Issue 799113004: Update mojo sdk to rev 59145288bae55b0fce4276b017df6a1117bcf00f (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add mojo's ply to checklicenses whitelist Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/public/cpp/view_manager/view.h" 16 #include "mojo/services/view_manager/public/cpp/view.h"
17 #include "third_party/WebKit/public/web/WebWidget.h" 17 #include "third_party/WebKit/public/web/WebWidget.h"
18 18
19 namespace mojo { 19 namespace mojo {
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 SurfacesServicePtr surfaces_service, 23 SurfacesServicePtr surfaces_service,
24 GpuPtr gpu_service) 24 GpuPtr gpu_service)
25 : widget_(NULL), 25 : widget_(NULL),
26 view_(NULL), 26 view_(NULL),
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread, 252 base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread,
253 main_thread_bound_weak_ptr_, 253 main_thread_bound_weak_ptr_,
254 id)); 254 id));
255 } 255 }
256 256
257 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) { 257 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) {
258 view_->SetSurfaceId(SurfaceId::From(id)); 258 view_->SetSurfaceId(SurfaceId::From(id));
259 } 259 }
260 260
261 } // namespace mojo 261 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/services/html_viewer/weblayertreeview_impl.h ('k') | mojo/services/html_viewer/websockethandle_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698