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

Side by Side Diff: services/ui/ws/window_tree_host_factory.cc

Issue 2470143006: Remove dependency on SurfaceManager in FrameGenerator (Closed)
Patch Set: Remove a couple of bad std::moves Created 4 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
« no previous file with comments | « services/ui/ws/window_tree.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "services/ui/ws/window_tree_host_factory.h" 5 #include "services/ui/ws/window_tree_host_factory.h"
6 6
7 #include "services/ui/surfaces/display_compositor.h"
8 #include "services/ui/ws/display.h" 7 #include "services/ui/ws/display.h"
9 #include "services/ui/ws/display_binding.h" 8 #include "services/ui/ws/display_binding.h"
10 #include "services/ui/ws/window_server.h" 9 #include "services/ui/ws/window_server.h"
11 10
12 namespace ui { 11 namespace ui {
13 namespace ws { 12 namespace ws {
14 13
15 WindowTreeHostFactory::WindowTreeHostFactory(WindowServer* window_server, 14 WindowTreeHostFactory::WindowTreeHostFactory(WindowServer* window_server,
16 const UserId& user_id) 15 const UserId& user_id)
17 : window_server_(window_server), user_id_(user_id) { 16 : window_server_(window_server), user_id_(user_id) {
18 platform_display_init_params_.metrics.bounds.set_width(1024); 17 platform_display_init_params_.metrics.bounds.set_width(1024);
19 platform_display_init_params_.metrics.bounds.set_height(768); 18 platform_display_init_params_.metrics.bounds.set_height(768);
20 platform_display_init_params_.metrics.pixel_size.SetSize(1024, 768); 19 platform_display_init_params_.metrics.pixel_size.SetSize(1024, 768);
21 platform_display_init_params_.metrics.device_scale_factor = 1.0f; 20 platform_display_init_params_.metrics.device_scale_factor = 1.0f;
22 platform_display_init_params_.display_compositor =
23 window_server_->GetDisplayCompositor();
24 } 21 }
25 22
26 WindowTreeHostFactory::~WindowTreeHostFactory() {} 23 WindowTreeHostFactory::~WindowTreeHostFactory() {}
27 24
28 void WindowTreeHostFactory::AddBinding( 25 void WindowTreeHostFactory::AddBinding(
29 mojom::WindowTreeHostFactoryRequest request) { 26 mojom::WindowTreeHostFactoryRequest request) {
30 bindings_.AddBinding(this, std::move(request)); 27 bindings_.AddBinding(this, std::move(request));
31 } 28 }
32 29
33 void WindowTreeHostFactory::CreateWindowTreeHost( 30 void WindowTreeHostFactory::CreateWindowTreeHost(
34 mojom::WindowTreeHostRequest host, 31 mojom::WindowTreeHostRequest host,
35 mojom::WindowTreeClientPtr tree_client) { 32 mojom::WindowTreeClientPtr tree_client) {
36 Display* display = new Display(window_server_, platform_display_init_params_); 33 Display* display = new Display(window_server_, platform_display_init_params_);
37 std::unique_ptr<DisplayBindingImpl> display_binding( 34 std::unique_ptr<DisplayBindingImpl> display_binding(
38 new DisplayBindingImpl(std::move(host), display, user_id_, 35 new DisplayBindingImpl(std::move(host), display, user_id_,
39 std::move(tree_client), window_server_)); 36 std::move(tree_client), window_server_));
40 display->Init(std::move(display_binding)); 37 display->Init(std::move(display_binding));
41 } 38 }
42 39
43 } // namespace ws 40 } // namespace ws
44 } // namespace ui 41 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/window_tree.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698