WIP: simplified display management in ash

ui/aura/mus/window_tree_host_mus.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/mus/window_tree_host_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/env.h"
 #include "ui/aura/mus/input_method_mus.h"
 #include "ui/aura/mus/window_port_mus.h"
@@ skipping 25 matching lines @@
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMus, public:
 
 WindowTreeHostMus::WindowTreeHostMus(WindowTreeHostMusInitParams init_params)
     : WindowTreeHostPlatform(std::move(init_params.window_port)),
       display_id_(init_params.display_id),
       delegate_(init_params.window_tree_client) {
+  gfx::Rect bounds_in_pixels;
+  initial_metrics_ = init_params.viewport_metrics.Clone();
+  initial_display_ = std::move(init_params.display);
+  bounds_in_pixels = initial_metrics_->bounds_in_pixels;
   window()->SetProperty(kWindowTreeHostMusKey, this);
   // TODO(sky): find a cleaner way to set this! Better solution is to likely
   // have constructor take aura::Window.
   WindowPortMus* window_mus = WindowPortMus::Get(window());
   window_mus->window_ = window();
   // Apply the properties before initializing the window, that way the server
   // seems them at the time the window is created.
   for (auto& pair : init_params.properties)
     window_mus->SetPropertyFromServer(pair.first, &pair.second);
   // TODO(fsamuel): Once the display compositor is decoupled from the browser
@@ skipping 14 matching lines @@
         static_cast<gfx::AcceleratedWidget>(accelerated_widget_count++);
 #endif
   }
   OnAcceleratedWidgetAvailable(accelerated_widget,
                                GetDisplay().device_scale_factor());
 
   delegate_->OnWindowTreeHostCreated(this);
 
   // Do not advertise accelerated widget; already set manually.
   const bool use_default_accelerated_widget = false;
-  SetPlatformWindow(
-      base::MakeUnique<ui::StubWindow>(this, use_default_accelerated_widget));
+  SetPlatformWindow(base::MakeUnique<ui::StubWindow>(
+      this, use_default_accelerated_widget, bounds_in_pixels));
 
   input_method_ = base::MakeUnique<InputMethodMus>(this, window());
   input_method_->Init(init_params.window_tree_client->connector());
   SetSharedInputMethod(input_method_.get());
 
   compositor()->SetHostHasTransparentBackground(true);
 
   // Mus windows are assumed hidden.
   compositor()->SetVisible(false);
 
@@ skipping 65 matching lines @@
 void WindowTreeHostMus::CancelWindowMove() {
   delegate_->OnWindowTreeHostCancelWindowMove(this);
 }
 
 display::Display WindowTreeHostMus::GetDisplay() const {
   display::Display display;
   display::Screen::GetScreen()->GetDisplayWithDisplayId(display_id_, &display);
   return display;
 }
 
+ui::mojom::WmViewportMetricsPtr WindowTreeHostMus::ReleaseInitialMetrics() {
+  return std::move(initial_metrics_);
+}
+
+std::unique_ptr<display::Display> WindowTreeHostMus::ReleaseInitialDisplay() {
+  return std::move(initial_display_);
+}
+
 void WindowTreeHostMus::HideImpl() {
   WindowTreeHostPlatform::HideImpl();
   window()->Hide();
 }
 
 void WindowTreeHostMus::SetBoundsInPixels(const gfx::Rect& bounds) {
   if (!in_set_bounds_from_server_)
     delegate_->OnWindowTreeHostBoundsWillChange(this, bounds);
   WindowTreeHostPlatform::SetBoundsInPixels(bounds);
 }
@@ skipping 26 matching lines @@
 void WindowTreeHostMus::MoveCursorToScreenLocationInPixels(
     const gfx::Point& location_in_pixels) {
   // TODO: this needs to message the server http://crbug.com/693340. Setting
   // the location is really only appropriate in tests, outside of tests this
   // value is ignored.
   NOTIMPLEMENTED();
   Env::GetInstance()->set_last_mouse_location(location_in_pixels);
 }
 
 }  // namespace aura