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

Side by Side Diff: sky/viewer/platform/weblayertreeview_impl.cc

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 "sky/viewer/platform/weblayertreeview_impl.h" 5 #include "sky/viewer/platform/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/layers/layer.h" 8 #include "cc/layers/layer.h"
9 #include "cc/output/begin_frame_args.h" 9 #include "cc/output/begin_frame_args.h"
10 #include "cc/scheduler/begin_frame_source.h"
10 #include "cc/trees/layer_tree_host.h" 11 #include "cc/trees/layer_tree_host.h"
11 #include "mojo/cc/context_provider_mojo.h" 12 #include "mojo/cc/context_provider_mojo.h"
12 #include "mojo/cc/output_surface_mojo.h" 13 #include "mojo/cc/output_surface_mojo.h"
13 #include "mojo/converters/surfaces/surfaces_type_converters.h" 14 #include "mojo/converters/surfaces/surfaces_type_converters.h"
14 #include "mojo/services/public/cpp/view_manager/view.h" 15 #include "mojo/services/public/cpp/view_manager/view.h"
15 #include "sky/engine/public/web/WebWidget.h" 16 #include "sky/engine/public/web/WebWidget.h"
16 #include "sky/viewer/cc/web_layer_impl.h" 17 #include "sky/viewer/cc/web_layer_impl.h"
17 18
18 namespace sky { 19 namespace sky {
19 20
(...skipping 20 matching lines...) Expand all
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 layer_tree_host_.reset(); 57 layer_tree_host_.reset();
56 } 58 }
57 59
58 void WebLayerTreeViewImpl::WillBeginMainFrame(int frame_id) { 60 void WebLayerTreeViewImpl::WillBeginMainFrame(int frame_id) {
59 } 61 }
60 62
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread, 211 base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread,
210 main_thread_bound_weak_ptr_, 212 main_thread_bound_weak_ptr_,
211 id)); 213 id));
212 } 214 }
213 215
214 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) { 216 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) {
215 view_->SetSurfaceId(mojo::SurfaceId::From(id)); 217 view_->SetSurfaceId(mojo::SurfaceId::From(id));
216 } 218 }
217 219
218 } // namespace sky 220 } // namespace sky
OLDNEW
« no previous file with comments | « sky/engine/platform/fonts/android/FontCacheAndroid.cpp ('k') | testing/android/java/AndroidManifest.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698