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

ui/ozone/platform/dri/dri_window_delegate_manager.cc

Index: ui/ozone/platform/dri/dri_window_delegate_manager.cc
diff --git a/ui/ozone/platform/dri/dri_window_manager.cc b/ui/ozone/platform/dri/dri_window_delegate_manager.cc
similarity index 61%
copy from ui/ozone/platform/dri/dri_window_manager.cc
copy to ui/ozone/platform/dri/dri_window_delegate_manager.cc
index d6c436bec4ff0076a3a5309c274246108a1bcaed..ffbc4ba6ab2dc47edc95c632b6f111ca78f1e8c8 100644
--- a/ui/ozone/platform/dri/dri_window_manager.cc
+++ b/ui/ozone/platform/dri/dri_window_delegate_manager.cc
@@ -2,26 +2,20 @@
 // 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 "ui/ozone/platform/dri/dri_window_delegate_manager.h"
 
 #include "ui/ozone/platform/dri/dri_window_delegate.h"
 
 namespace ui {
 
-DriWindowManager::DriWindowManager() : last_allocated_widget_(0) {
+DriWindowDelegateManager::DriWindowDelegateManager() {
 }
 
-DriWindowManager::~DriWindowManager() {
+DriWindowDelegateManager::~DriWindowDelegateManager() {
   DCHECK(delegate_map_.empty());
 }
 
-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_;
-}
-
-void DriWindowManager::AddWindowDelegate(
+void DriWindowDelegateManager::AddWindowDelegate(
     gfx::AcceleratedWidget widget,
     scoped_ptr<DriWindowDelegate> delegate) {
   std::pair<WidgetToDelegateMap::iterator, bool> result =
@@ -29,24 +23,26 @@ void DriWindowManager::AddWindowDelegate(
   DCHECK(result.second) << "Delegate already added.";
 }
 
-scoped_ptr<DriWindowDelegate> DriWindowManager::RemoveWindowDelegate(
+scoped_ptr<DriWindowDelegate> DriWindowDelegateManager::RemoveWindowDelegate(
     gfx::AcceleratedWidget widget) {
   scoped_ptr<DriWindowDelegate> delegate = delegate_map_.take_and_erase(widget);
-  DCHECK(delegate) << "Attempting to remove non-existing delegate.";
+  DCHECK(delegate) << "Attempting to remove non-existing delegate for "
+                   << widget;
   return delegate.Pass();
 }
 
-DriWindowDelegate* DriWindowManager::GetWindowDelegate(
+DriWindowDelegate* DriWindowDelegateManager::GetWindowDelegate(
     gfx::AcceleratedWidget widget) {
   WidgetToDelegateMap::iterator it = delegate_map_.find(widget);
   if (it != delegate_map_.end())
     return it->second;
 
-  NOTREACHED();
+  NOTREACHED() << "Attempting to get non-existing delegate for " << widget;
   return NULL;
 }
 
-bool DriWindowManager::HasWindowDelegate(gfx::AcceleratedWidget widget) {
+bool DriWindowDelegateManager::HasWindowDelegate(
+    gfx::AcceleratedWidget widget) {
   return delegate_map_.find(widget) != delegate_map_.end();
 }