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: ui/aura/mus/window_tree_client.cc

Issue 2565583002: Revert of Ensure compositor initialized before WindowTreeHost is Shown. (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | ui/aura/mus/window_tree_client_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 std::unique_ptr<WindowTreeHostMus> WindowTreeClient::CreateWindowTreeHost( 353 std::unique_ptr<WindowTreeHostMus> WindowTreeClient::CreateWindowTreeHost(
354 WindowMusType window_mus_type, 354 WindowMusType window_mus_type,
355 const ui::mojom::WindowDataPtr& window_data, 355 const ui::mojom::WindowDataPtr& window_data,
356 int64_t display_id) { 356 int64_t display_id) {
357 std::unique_ptr<WindowPortMus> window_port = 357 std::unique_ptr<WindowPortMus> window_port =
358 CreateWindowPortMus(window_data, window_mus_type); 358 CreateWindowPortMus(window_data, window_mus_type);
359 roots_.insert(window_port.get()); 359 roots_.insert(window_port.get());
360 std::unique_ptr<WindowTreeHostMus> window_tree_host = 360 std::unique_ptr<WindowTreeHostMus> window_tree_host =
361 base::MakeUnique<WindowTreeHostMus>(std::move(window_port), this, 361 base::MakeUnique<WindowTreeHostMus>(std::move(window_port), this,
362 display_id); 362 display_id);
363 window_tree_host->InitHost();
364 if (!window_data.is_null()) { 363 if (!window_data.is_null()) {
365 SetLocalPropertiesFromServerProperties( 364 SetLocalPropertiesFromServerProperties(
366 WindowMus::Get(window_tree_host->window()), window_data); 365 WindowMus::Get(window_tree_host->window()), window_data);
367 if (window_data->visible) { 366 if (window_data->visible) {
368 SetWindowVisibleFromServer(WindowMus::Get(window_tree_host->window()), 367 SetWindowVisibleFromServer(WindowMus::Get(window_tree_host->window()),
369 true); 368 true);
370 } 369 }
371 SetWindowBoundsFromServer(WindowMus::Get(window_tree_host->window()), 370 SetWindowBoundsFromServer(WindowMus::Get(window_tree_host->window()),
372 window_data->bounds); 371 window_data->bounds);
373 } 372 }
(...skipping 1248 matching lines...) Expand 10 before | Expand all | Expand 10 after
1622 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( 1621 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
1623 this, capture_synchronizer_.get(), window)); 1622 this, capture_synchronizer_.get(), window));
1624 } 1623 }
1625 1624
1626 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { 1625 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
1627 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( 1626 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
1628 this, focus_synchronizer_.get(), window)); 1627 this, focus_synchronizer_.get(), window));
1629 } 1628 }
1630 1629
1631 } // namespace aura 1630 } // namespace aura
OLDNEW
« no previous file with comments | « no previous file | ui/aura/mus/window_tree_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698