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

Side by Side Diff: ui/aura/mus/window_tree_client.cc

Issue 2552003002: Ensure compositor initialized before WindowTreeHost is Shown. (Closed)
Patch Set: Fixing WindowServerTest.EstablishConnectionViaFactory Created 4 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 "ui/aura/mus/window_tree_client.h" 5 #include "ui/aura/mus/window_tree_client.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 std::unique_ptr<WindowTreeHostMus> WindowTreeClient::CreateWindowTreeHost( 392 std::unique_ptr<WindowTreeHostMus> WindowTreeClient::CreateWindowTreeHost(
393 WindowMusType window_mus_type, 393 WindowMusType window_mus_type,
394 const ui::mojom::WindowData& window_data, 394 const ui::mojom::WindowData& window_data,
395 int64_t display_id) { 395 int64_t display_id) {
396 std::unique_ptr<WindowPortMus> window_port = 396 std::unique_ptr<WindowPortMus> window_port =
397 CreateWindowPortMus(window_data, window_mus_type); 397 CreateWindowPortMus(window_data, window_mus_type);
398 roots_.insert(window_port.get()); 398 roots_.insert(window_port.get());
399 std::unique_ptr<WindowTreeHostMus> window_tree_host = 399 std::unique_ptr<WindowTreeHostMus> window_tree_host =
400 base::MakeUnique<WindowTreeHostMus>(std::move(window_port), this, 400 base::MakeUnique<WindowTreeHostMus>(std::move(window_port), this,
401 display_id); 401 display_id);
402 window_tree_host->InitHost();
402 SetLocalPropertiesFromServerProperties( 403 SetLocalPropertiesFromServerProperties(
403 WindowMus::Get(window_tree_host->window()), window_data); 404 WindowMus::Get(window_tree_host->window()), window_data);
404 if (window_data.visible) { 405 if (window_data.visible) {
405 SetWindowVisibleFromServer(WindowMus::Get(window_tree_host->window()), 406 SetWindowVisibleFromServer(WindowMus::Get(window_tree_host->window()),
406 true); 407 true);
407 } 408 }
408 SetWindowBoundsFromServer(WindowMus::Get(window_tree_host->window()), 409 SetWindowBoundsFromServer(WindowMus::Get(window_tree_host->window()),
409 window_data.bounds); 410 window_data.bounds);
410 return window_tree_host; 411 return window_tree_host;
411 } 412 }
(...skipping 1274 matching lines...) Expand 10 before | Expand all | Expand 10 after
1686 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( 1687 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
1687 this, capture_synchronizer_.get(), window)); 1688 this, capture_synchronizer_.get(), window));
1688 } 1689 }
1689 1690
1690 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { 1691 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
1691 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( 1692 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
1692 this, focus_synchronizer_.get(), window)); 1693 this, focus_synchronizer_.get(), window));
1693 } 1694 }
1694 1695
1695 } // namespace aura 1696 } // namespace aura
OLDNEW
« no previous file with comments | « services/ui/ws/window_manager_client_unittest.cc ('k') | ui/aura/mus/window_tree_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698