[Ozone] Constrain the cursor when overscan insets are set

ui/ozone/platform/dri/dri_window.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.h"
 
 #include "base/bind.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/events/event.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
@@ skipping 32 matching lines @@
   window_manager_->RemoveWindow(widget_);
   cursor_->OnWindowRemoved(widget_);
 
   sender_->RemoveChannelObserver(this);
   sender_->Send(new OzoneGpuMsg_DestroyWindowDelegate(widget_));
 }
 
 void DriWindow::Initialize() {
   sender_->AddChannelObserver(this);
   PlatformEventSource::GetInstance()->AddPlatformEventDispatcher(this);
-  cursor_->OnWindowAdded(widget_, bounds_);
+  cursor_->OnWindowAdded(widget_, bounds_, GetCursorConfinedBounds());
   delegate_->OnAcceleratedWidgetAvailable(widget_);
 }
 
 gfx::AcceleratedWidget DriWindow::GetAcceleratedWidget() {
   return widget_;
 }
 
+gfx::Rect DriWindow::GetCursorConfinedBounds() const {
+  return cursor_confined_bounds_.IsEmpty() ? gfx::Rect(bounds_.size())
+                                           : cursor_confined_bounds_;
+}
+
 void DriWindow::Show() {}
 
 void DriWindow::Hide() {}
 
 void DriWindow::Close() {}
 
 void DriWindow::SetBounds(const gfx::Rect& bounds) {
   bounds_ = bounds;
   delegate_->OnBoundsChanged(bounds);
   SendBoundsChange();
@@ skipping 20 matching lines @@
 void DriWindow::Restore() {}
 
 void DriWindow::SetCursor(PlatformCursor cursor) {
   cursor_->SetCursor(widget_, cursor);
 }
 
 void DriWindow::MoveCursorTo(const gfx::Point& location) {
   event_factory_->WarpCursorTo(widget_, location);
 }
 
+void DriWindow::ConfineCursorToBounds(const gfx::Rect& bounds) {
+  cursor_confined_bounds_ = bounds;

[sadrul, 2015/01/26 18:13:29]

Check for equality?

+  cursor_->ConfineCursorToBounds(widget_, bounds);
+}
+
 bool DriWindow::CanDispatchEvent(const PlatformEvent& ne) {
   DCHECK(ne);
   Event* event = static_cast<Event*>(ne);
 
   // If there is a grab, capture events here.
   gfx::AcceleratedWidget grabber = window_manager_->event_grabber();
   if (grabber != gfx::kNullAcceleratedWidget)
     return grabber == widget_;
 
   if (event->IsTouchEvent()) {
@@ skipping 38 matching lines @@
   }
   DispatchEventFromNativeUiEvent(
       native_event, base::Bind(&PlatformWindowDelegate::DispatchEvent,
                                base::Unretained(delegate_)));
   return POST_DISPATCH_STOP_PROPAGATION;
 }
 
 void DriWindow::OnChannelEstablished() {
   sender_->Send(new OzoneGpuMsg_CreateWindowDelegate(widget_));
   SendBoundsChange();
+  cursor_->ConfineCursorToBounds(widget_, GetCursorConfinedBounds());
 }
 
 void DriWindow::OnChannelDestroyed() {
 }
 
 void DriWindow::SendBoundsChange() {
   cursor_->PrepareForBoundsChange(widget_);
   sender_->Send(new OzoneGpuMsg_WindowBoundsChanged(widget_, bounds_));
-  cursor_->CommitBoundsChange(widget_, bounds_);
 }
 
 }  // namespace ui