[Ozone-DRI] Do proper bounds checks when moving the cursor

ui/ozone/platform/dri/dri_window.cc

Index: ui/ozone/platform/dri/dri_window.cc
diff --git a/ui/ozone/platform/dri/dri_window.cc b/ui/ozone/platform/dri/dri_window.cc
index c33e78db104d1f21a1ab0da7ec9b282598fd5062..884e8b890068c8aabcccfcfddafc954603559f5b 100644
--- a/ui/ozone/platform/dri/dri_window.cc
+++ b/ui/ozone/platform/dri/dri_window.cc
@@ -9,6 +9,7 @@
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/ozone/platform/dri/dri_cursor.h"
 #include "ui/ozone/platform/dri/dri_window_delegate.h"
+#include "ui/ozone/platform/dri/dri_window_delegate_manager.h"
 #include "ui/ozone/platform/dri/dri_window_manager.h"
 #include "ui/ozone/public/cursor_factory_ozone.h"
 #include "ui/platform_window/platform_window_delegate.h"
@@ -19,6 +20,7 @@ DriWindow::DriWindow(PlatformWindowDelegate* delegate,
                      const gfx::Rect& bounds,
                      scoped_ptr<DriWindowDelegate> dri_window_delegate,
                      EventFactoryEvdev* event_factory,
+                     DriWindowDelegateManager* window_delegate_manager,
                      DriWindowManager* window_manager,
                      DriCursor* cursor)
     : delegate_(delegate),
@@ -26,15 +28,19 @@ DriWindow::DriWindow(PlatformWindowDelegate* delegate,
       widget_(dri_window_delegate->GetAcceleratedWidget()),
       dri_window_delegate_(dri_window_delegate.get()),
       event_factory_(event_factory),
+      window_delegate_manager_(window_delegate_manager),
       window_manager_(window_manager),
       cursor_(cursor) {
-  window_manager_->AddWindowDelegate(widget_, dri_window_delegate.Pass());
+  window_delegate_manager_->AddWindowDelegate(widget_,
+                                              dri_window_delegate.Pass());
+  window_manager_->AddWindow(widget_, this);
 }
 
 DriWindow::~DriWindow() {
   PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
   dri_window_delegate_->Shutdown();
-  window_manager_->RemoveWindowDelegate(widget_);
+  window_manager_->RemoveWindow(widget_);
+  window_delegate_manager_->RemoveWindowDelegate(widget_);
 }
 
 void DriWindow::Initialize() {