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

Side by Side Diff: components/html_viewer/web_layer_tree_view_impl.cc

Issue 1144153004: components: Remove use of MessageLoopProxy and deprecated MessageLoop APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 5 years, 6 months 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 "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"
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 "components/view_manager/public/cpp/view.h" 13 #include "components/view_manager/public/cpp/view.h"
14 #include "mojo/cc/context_provider_mojo.h" 14 #include "mojo/cc/context_provider_mojo.h"
15 #include "mojo/cc/output_surface_mojo.h" 15 #include "mojo/cc/output_surface_mojo.h"
16 #include "mojo/converters/surfaces/surfaces_type_converters.h" 16 #include "mojo/converters/surfaces/surfaces_type_converters.h"
17 #include "third_party/WebKit/public/web/WebWidget.h" 17 #include "third_party/WebKit/public/web/WebWidget.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::SingleThreadTaskRunner> compositor_task_runner,
23 mojo::SurfacePtr surface, 23 mojo::SurfacePtr surface,
24 mojo::GpuPtr gpu_service) 24 mojo::GpuPtr gpu_service)
25 : widget_(NULL), 25 : widget_(NULL),
26 view_(NULL), 26 view_(NULL),
27 main_thread_compositor_task_runner_(base::ThreadTaskRunnerHandle::Get()), 27 main_thread_compositor_task_runner_(base::ThreadTaskRunnerHandle::Get()),
28 weak_factory_(this) { 28 weak_factory_(this) {
29 main_thread_bound_weak_ptr_ = weak_factory_.GetWeakPtr(); 29 main_thread_bound_weak_ptr_ = weak_factory_.GetWeakPtr();
30 30
31 cc::LayerTreeSettings settings; 31 cc::LayerTreeSettings settings;
32 32
33 // For web contents, layer transforms should scale up the contents of layers 33 // For web contents, layer transforms should scale up the contents of layers
34 // to keep content always crisp when possible. 34 // to keep content always crisp when possible.
35 settings.layer_transforms_should_scale_layer_contents = true; 35 settings.layer_transforms_should_scale_layer_contents = true;
36 36
37 cc::SharedBitmapManager* shared_bitmap_manager = nullptr; 37 cc::SharedBitmapManager* shared_bitmap_manager = nullptr;
38 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager = nullptr; 38 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager = nullptr;
39 cc::TaskGraphRunner* task_graph_runner = nullptr; 39 cc::TaskGraphRunner* task_graph_runner = nullptr;
40 40
41 cc::LayerTreeHost::InitParams params; 41 cc::LayerTreeHost::InitParams params;
42 params.client = this; 42 params.client = this;
43 params.shared_bitmap_manager = shared_bitmap_manager; 43 params.shared_bitmap_manager = shared_bitmap_manager;
44 params.gpu_memory_buffer_manager = gpu_memory_buffer_manager; 44 params.gpu_memory_buffer_manager = gpu_memory_buffer_manager;
45 params.settings = &settings; 45 params.settings = &settings;
46 params.task_graph_runner = task_graph_runner; 46 params.task_graph_runner = task_graph_runner;
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, &params); 50 cc::LayerTreeHost::CreateThreaded(compositor_task_runner, &params);
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.PassInterface().PassHandle())); 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 }
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread, 238 base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread,
239 main_thread_bound_weak_ptr_, 239 main_thread_bound_weak_ptr_,
240 id)); 240 id));
241 } 241 }
242 242
243 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) { 243 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) {
244 view_->SetSurfaceId(mojo::SurfaceId::From(id)); 244 view_->SetSurfaceId(mojo::SurfaceId::From(id));
245 } 245 }
246 246
247 } // namespace html_viewer 247 } // namespace html_viewer
OLDNEW
« no previous file with comments | « components/html_viewer/web_layer_tree_view_impl.h ('k') | components/invalidation/gcm_network_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698