ash: ozone: apply transformation to events outside the root window

ui/ozone/platform/dri/dri_window_manager.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 "ui/ozone/platform/dri/dri_window_manager.h"
 
 #include "base/logging.h"
 #include "ui/ozone/platform/dri/dri_cursor.h"
 #include "ui/ozone/platform/dri/dri_window.h"
 
 namespace ui {
 
 namespace {
 
 gfx::PointF GetDefaultCursorLocation(DriWindow* window) {
   return gfx::PointF(window->GetBounds().width() / 2,
                      window->GetBounds().height() / 2);
 }
 
 }  // namespace
 
 DriWindowManager::DriWindowManager(HardwareCursorDelegate* cursor_delegate)
-    : last_allocated_widget_(0), cursor_(new DriCursor(cursor_delegate, this)) {
+    : last_allocated_widget_(0),
+      cursor_(new DriCursor(cursor_delegate, this)),
+      mouse_events_grabber_(gfx::kNullAcceleratedWidget) {
 }
 
 DriWindowManager::~DriWindowManager() {
 }
 
 gfx::AcceleratedWidget DriWindowManager::NextAcceleratedWidget() {
   // We're not using 0 since other code assumes that a 0 AcceleratedWidget is an
   // invalid widget.
   return ++last_allocated_widget_;
 }
@@ skipping 10 matching lines @@
 
 void DriWindowManager::RemoveWindow(gfx::AcceleratedWidget widget) {
   WidgetToWindowMap::iterator it = window_map_.find(widget);
   if (it != window_map_.end())
     window_map_.erase(it);
   else
     NOTREACHED() << "Attempting to remove non-existing window " << widget;
 
   if (cursor_->GetCursorWindow() == widget)
     ResetCursorLocation();
+  if (mouse_events_grabber_ == widget)
+    mouse_events_grabber_ = gfx::kNullAcceleratedWidget;
 }
 
 DriWindow* DriWindowManager::GetWindow(gfx::AcceleratedWidget widget) {
   WidgetToWindowMap::iterator it = window_map_.find(widget);
   if (it != window_map_.end())
     return it->second;
 
   NOTREACHED() << "Attempting to get non-existing window " << widget;
   return NULL;
 }
 
 void DriWindowManager::ResetCursorLocation() {
   gfx::AcceleratedWidget cursor_widget = gfx::kNullAcceleratedWidget;
   gfx::PointF location;
   if (!window_map_.empty()) {
     WidgetToWindowMap::iterator it = window_map_.begin();
     cursor_widget = it->first;
     location = GetDefaultCursorLocation(it->second);
   }
 
   cursor_->MoveCursorTo(cursor_widget, location);
 }
 
+void DriWindowManager::GrabMouseEvents(gfx::AcceleratedWidget widget) {
+  DCHECK(mouse_events_grabber_ == gfx::kNullAcceleratedWidget);

[sadrul, 2014/11/11 14:41:14]

DCHECK_EQ

Have you tested this with nested message loops? e.g. click on the wrench menu to
bring up the menu, then click on the menu. Or click on a folder in the bookmark
bar, then start dragging a bookmark out of it, etc.

[llandwerlin-old, 2014/11/11 18:29:18]

Done.
All the cases you mentioned are working properly across/within display
boundaries.

+  mouse_events_grabber_ = widget;
+}
+
+void DriWindowManager::UngrabMouseEvents(gfx::AcceleratedWidget widget) {
+  DCHECK(mouse_events_grabber_ == widget);

[sadrul, 2014/11/11 14:41:14]

ditto

[llandwerlin-old, 2014/11/11 18:29:18]

Moving back to if()s after spang's comment.

+  mouse_events_grabber_ = gfx::kNullAcceleratedWidget;
+}
+
 }  // namespace ui