Fix window/display bounds with multiple windows in mus.

services/ui/ws/platform_display.cc

 // Copyright 2014 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/platform_display.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "build/build_config.h"
 #include "cc/ipc/quads.mojom.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 37 matching lines @@
     const PlatformDisplayInitParams& init_params) {
   if (factory_)
     return factory_->CreatePlatformDisplay();
 
   return new DefaultPlatformDisplay(init_params);
 }
 
 DefaultPlatformDisplay::DefaultPlatformDisplay(
     const PlatformDisplayInitParams& init_params)
     : id_(init_params.display_id),
+      platform_screen_(init_params.platform_screen),
 #if !defined(OS_ANDROID)
       cursor_loader_(ui::CursorLoader::Create()),
 #endif
       frame_generator_(new FrameGenerator(this, init_params.surfaces_state)) {
   metrics_.bounds = init_params.display_bounds;
-  // TODO(rjkroege): Preserve the display_id when Ozone platform can use it.
 }
 
 void DefaultPlatformDisplay::Init(PlatformDisplayDelegate* delegate) {
   delegate_ = delegate;
 
 #if defined(OS_WIN)
   platform_window_.reset(new ui::WinWindow(this, metrics_.bounds));
 #elif defined(USE_X11)
   platform_window_.reset(new ui::X11Window(this));
 #elif defined(OS_ANDROID)
@@ skipping 87 matching lines @@
 }
 
 bool DefaultPlatformDisplay::IsFramePending() const {
   return frame_generator_->is_frame_pending();
 }
 
 gfx::Rect DefaultPlatformDisplay::GetBounds() const {
   return metrics_.bounds;
 }
 
+bool DefaultPlatformDisplay::IsPrimaryDisplay() const {
+  return platform_screen_->GetPrimaryDisplayId() == GetId();

[sky, 2016/08/10 22:15:59]

GetId() -> id_

[kylechar, 2016/08/11 15:00:37]

Done.

+}
+
 void DefaultPlatformDisplay::UpdateMetrics(const gfx::Rect& bounds,
                                            float device_scale_factor) {
   if (display::Display::HasForceDeviceScaleFactor())
     device_scale_factor = display::Display::GetForcedDeviceScaleFactor();
-  if (metrics_.bounds == bounds &&
+
+  // We don't care about the origin of the platform window, as that may not be
+  // related to the origin of the display in our screen space.
+  if (metrics_.bounds.size() == bounds.size() &&
       metrics_.device_scale_factor == device_scale_factor)
     return;
 
+  // TODO(kylechar): If the window size is updated then we may need to update
+  // the origin for any other windows.
   ViewportMetrics old_metrics = metrics_;
-  metrics_.bounds = bounds;
+  metrics_.bounds.set_size(bounds.size());
   metrics_.device_scale_factor = device_scale_factor;
   delegate_->OnViewportMetricsChanged(old_metrics, metrics_);
 }
 
+void DefaultPlatformDisplay::UpdateEventRootLocation(ui::LocatedEvent* event) {
+  gfx::Point location = event->location();
+  location.Offset(metrics_.bounds.x(), metrics_.bounds.y());
+  event->set_root_location(location);
+}
+
 void DefaultPlatformDisplay::OnBoundsChanged(const gfx::Rect& new_bounds) {
-  // TODO(kylechar): We should keep track of the actual top left of the window
-  // and also the internal top left of the window (eg. first window is at 0,0).
   UpdateMetrics(new_bounds, metrics_.device_scale_factor);
 }
 
 void DefaultPlatformDisplay::OnDamageRect(const gfx::Rect& damaged_region) {
   frame_generator_->RequestRedraw(damaged_region);
 }
 
 void DefaultPlatformDisplay::DispatchEvent(ui::Event* event) {
   if (event->IsScrollEvent()) {
     // TODO(moshayedi): crbug.com/602859. Dispatch scroll events as
     // they are once we have proper support for scroll events.
     delegate_->OnEvent(ui::MouseWheelEvent(*event->AsScrollEvent()));
   } else if (event->IsMouseEvent() && !event->IsMouseWheelEvent()) {
-    delegate_->OnEvent(ui::PointerEvent(*event->AsMouseEvent()));
+    ui::PointerEvent pointer_event(*event->AsMouseEvent());
+    UpdateEventRootLocation(&pointer_event);

[sky, 2016/08/10 22:15:59]

Can you update root location of event directly? (same comment on 219).

[kylechar, 2016/08/11 15:00:37]

Good idea. Done.

+    delegate_->OnEvent(pointer_event);
   } else if (event->IsTouchEvent()) {
-    delegate_->OnEvent(ui::PointerEvent(*event->AsTouchEvent()));
+    ui::PointerEvent pointer_event(*event->AsTouchEvent());
+    UpdateEventRootLocation(&pointer_event);
+    delegate_->OnEvent(pointer_event);
   } else {
     delegate_->OnEvent(*event);
   }
 
 #if defined(USE_X11) || defined(USE_OZONE)
   // We want to emulate the WM_CHAR generation behaviour of Windows.
   //
   // On Linux, we've previously inserted characters by having
   // InputMethodAuraLinux take all key down events and send a character event
   // to the TextInputClient. This causes a mismatch in code that has to be
@@ skipping 65 matching lines @@
   return delegate_ ? delegate_->IsInHighContrastMode() : false;
 }
 
 const ViewportMetrics& DefaultPlatformDisplay::GetViewportMetrics() {
   return metrics_;
 }
 
 }  // namespace ws
 
 }  // namespace ui