Fix window/display bounds with multiple windows in mus.

services/ui/ws/display.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 "services/ui/ws/display.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 70 matching lines @@
 }
 
 const DisplayManager* Display::display_manager() const {
   return window_server_->display_manager();
 }
 
 mojom::WsDisplayPtr Display::ToWsDisplay() const {
   mojom::WsDisplayPtr display_ptr = mojom::WsDisplay::New();
 
   display_ptr->display = ToDisplay();
+  display_ptr->is_primary = platform_display_->IsPrimaryDisplay();
 
   // TODO(sky): make this real.
-  display_ptr->is_primary = true;
-  // TODO(sky): make this real.
   display_ptr->frame_decoration_values = mojom::FrameDecorationValues::New();
   return display_ptr;
 }
 
 display::Display Display::ToDisplay() const {
   display::Display display(GetId());
 
-  // TODO(sky): Display should know its origin.
-  display.set_bounds(gfx::Rect(0, 0, root_->bounds().size().width(),
-                               root_->bounds().size().height()));
+  display.set_bounds(platform_display_->GetBounds());
   // TODO(sky): window manager needs an API to set the work area.
   display.set_work_area(display.bounds());
   display.set_device_scale_factor(platform_display_->GetDeviceScaleFactor());
   display.set_rotation(platform_display_->GetRotation());
   display.set_touch_support(
       display::Display::TouchSupport::TOUCH_SUPPORT_UNKNOWN);
 
   return display;
 }
 
@@ skipping 12 matching lines @@
     return;
   windows_needing_frame_destruction_.insert(window);
   window->AddObserver(this);
 }
 
 display::Display::Rotation Display::GetRotation() const {
   return platform_display_->GetRotation();
 }
 
 gfx::Size Display::GetSize() const {
-  return root_->bounds().size();
+  return platform_display_->GetBounds().size();
 }
 
 ServerWindow* Display::GetRootWithId(const WindowId& id) {
   if (id == root_->id())
     return root_.get();
   for (auto& pair : window_manager_display_root_map_) {
     if (pair.second->root()->id() == id)
       return pair.second->root();
   }
   return nullptr;
@@ skipping 166 matching lines @@
     root_.reset(window_server_->CreateServerWindow(
         display_manager()->GetAndAdvanceNextRootId(),
         ServerWindow::Properties()));
     root_->SetBounds(new_metrics.bounds);
     root_->SetVisible(true);
     focus_controller_.reset(new FocusController(this, root_.get()));
     focus_controller_->AddObserver(this);
     InitWindowManagerDisplayRootsIfNecessary();
   } else {
     root_->SetBounds(new_metrics.bounds);
-    const gfx::Rect wm_bounds(root_->bounds().size());
     for (auto& pair : window_manager_display_root_map_)
-      pair.second->root()->SetBounds(wm_bounds);
+      pair.second->root()->SetBounds(new_metrics.bounds);
   }
   display_manager()->OnDisplayUpdate(this);
 }
 
 void Display::OnCompositorFrameDrawn() {
   std::set<ServerWindow*> windows;
   windows.swap(windows_needing_frame_destruction_);
   for (ServerWindow* window : windows) {
     window->RemoveObserver(this);
     window->DestroySurfacesScheduledForDestruction();
@@ skipping 86 matching lines @@
 }
 
 void Display::OnWindowManagerWindowTreeFactoryReady(
     WindowManagerWindowTreeFactory* factory) {
   if (!binding_)
     CreateWindowManagerDisplayRootFromFactory(factory);
 }
 
 }  // namespace ws
 }  // namespace ui