exo: Fix dragging edge cases

components/exo/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 "components/exo/display.h"
 
 #include <iterator>
 #include <utility>
 
 #include "ash/common/shell_window_ids.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "components/exo/notification_surface.h"
 #include "components/exo/notification_surface_manager.h"
 #include "components/exo/shared_memory.h"
 #include "components/exo/shell_surface.h"
 #include "components/exo/sub_surface.h"
 #include "components/exo/surface.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/core/coordinate_conversion.h"
 
 #if defined(USE_OZONE)
 #include <GLES2/gl2extchromium.h>
 #include "components/exo/buffer.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "ui/aura/env.h"
 #endif
 
@@ skipping 73 matching lines @@
 
 std::unique_ptr<ShellSurface> Display::CreateShellSurface(Surface* surface) {
   TRACE_EVENT1("exo", "Display::CreateShellSurface", "surface",
                surface->AsTracedValue());
 
   if (surface->HasSurfaceDelegate()) {
     DLOG(ERROR) << "Surface has already been assigned a role";
     return nullptr;
   }
 
-  return base::MakeUnique<ShellSurface>(surface, nullptr, gfx::Rect(),
+  return base::MakeUnique<ShellSurface>(*this, surface, nullptr, gfx::Rect(),
                                         true /* activatable */,
                                         ash::kShellWindowId_DefaultContainer);
 }
 
 std::unique_ptr<ShellSurface> Display::CreatePopupShellSurface(
     Surface* surface,
     ShellSurface* parent,
     const gfx::Point& position) {
   TRACE_EVENT2("exo", "Display::CreatePopupShellSurface", "surface",
                surface->AsTracedValue(), "parent", parent->AsTracedValue());
 
   if (surface->window()->Contains(parent->GetWidget()->GetNativeWindow())) {
     DLOG(ERROR) << "Parent is contained within surface's hierarchy";
     return nullptr;
   }
 
   if (surface->HasSurfaceDelegate()) {
     DLOG(ERROR) << "Surface has already been assigned a role";
     return nullptr;
   }
 
   // Determine the initial bounds for popup. |position| is relative to the
-  // parent's main surface origin and initial bounds are relative to the
-  // container origin.
-  gfx::Rect initial_bounds(position, gfx::Size(1, 1));
-  aura::Window::ConvertRectToTarget(
+  // parent's main surface origin and initial bounds are in virtual coordinates.
+  gfx::Point origin = position;
+  wm::ConvertPointToScreen(
       ShellSurface::GetMainSurface(parent->GetWidget()->GetNativeWindow())
           ->window(),
-      parent->GetWidget()->GetNativeWindow()->parent(), &initial_bounds);
+      &origin);
+  ConvertFromScreenToVirtual(&origin);
+  gfx::Rect initial_bounds(origin, gfx::Size(1, 1));
 
-  return base::MakeUnique<ShellSurface>(surface, parent, initial_bounds,
+  return base::MakeUnique<ShellSurface>(*this, surface, parent, initial_bounds,
                                         false /* activatable */,
                                         ash::kShellWindowId_DefaultContainer);
 }
 
 std::unique_ptr<ShellSurface> Display::CreateRemoteShellSurface(
     Surface* surface,
     int container) {
   TRACE_EVENT2("exo", "Display::CreateRemoteShellSurface", "surface",
                surface->AsTracedValue(), "container", container);
 
   if (surface->HasSurfaceDelegate()) {
     DLOG(ERROR) << "Surface has already been assigned a role";
     return nullptr;
   }
 
-  return base::MakeUnique<ShellSurface>(surface, nullptr, gfx::Rect(1, 1),
-                                        true /* activatable */, container);
+  return base::MakeUnique<ShellSurface>(*this, surface, nullptr,
+                                        gfx::Rect(1, 1), true /* activatable */,
+                                        container);
 }
 
 std::unique_ptr<SubSurface> Display::CreateSubSurface(Surface* surface,
                                                       Surface* parent) {
   TRACE_EVENT2("exo", "Display::CreateSubSurface", "surface",
                surface->AsTracedValue(), "parent", parent->AsTracedValue());
 
   if (surface->window()->Contains(parent->window())) {
     DLOG(ERROR) << "Parent is contained within surface's hierarchy";
     return nullptr;
@@ skipping 17 matching lines @@
       notification_surface_manager_->GetSurface(notification_id)) {
     DLOG(ERROR) << "Invalid notification id, id=" << notification_id;
     return nullptr;
   }
 
   return base::MakeUnique<NotificationSurface>(notification_surface_manager_,
                                                surface, notification_id);
 }
 
 }  // namespace exo