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

ui/ozone/platform/dri/dri_surface_factory.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_surface_factory.h"
 
 #include <errno.h>
 
 #include "base/debug/trace_event.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/ozone/platform/dri/dri_buffer.h"
 #include "ui/ozone/platform/dri/dri_surface.h"
 #include "ui/ozone/platform/dri/dri_util.h"
 #include "ui/ozone/platform/dri/dri_window_delegate_impl.h"
-#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_wrapper.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
 #include "ui/ozone/platform/dri/screen_manager.h"
 #include "ui/ozone/public/surface_ozone_canvas.h"
 
 namespace ui {
 
 namespace {
 
 // TODO(dnicoara) Read the cursor plane size from the hardware.
@@ skipping 14 matching lines @@
   canvas->drawBitmapRectToRect(image, &damage, damage);
 }
 
 }  // namespace
 
 // static
 const gfx::AcceleratedWidget DriSurfaceFactory::kDefaultWidgetHandle = 1;
 
 DriSurfaceFactory::DriSurfaceFactory(DriWrapper* drm,
                                      ScreenManager* screen_manager,
-                                     DriWindowManager* window_manager)
+                                     DriWindowDelegateManager* window_manager)
     : drm_(drm),
       screen_manager_(screen_manager),
       window_manager_(window_manager),
       state_(UNINITIALIZED),
       cursor_frontbuffer_(0),
       cursor_widget_(0),
       cursor_frame_(0),
       cursor_frame_delay_ms_(0) {
 }
 
@@ skipping 111 matching lines @@
 }
 
 void DriSurfaceFactory::OnCursorAnimationTimeout() {
   cursor_frame_++;
   cursor_frame_ %= cursor_bitmaps_.size();
 
   ResetCursor();
 }
 
 }  // namespace ui