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

ui/ozone/platform/dri/dri_surface_factory_unittest.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 <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "ui/ozone/platform/dri/dri_buffer.h"
 #include "ui/ozone/platform/dri/dri_surface.h"
 #include "ui/ozone/platform/dri/dri_surface_factory.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/hardware_display_controller.h"
 #include "ui/ozone/platform/dri/screen_manager.h"
 #include "ui/ozone/platform/dri/test/mock_dri_wrapper.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 #include "ui/ozone/public/surface_ozone_canvas.h"
 
 namespace {
 
 // Mode of size 6x4.
 const drmModeModeInfo kDefaultMode =
@@ skipping 30 matching lines @@
   DriSurfaceFactoryTest() {}
 
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
  protected:
   scoped_ptr<base::MessageLoop> message_loop_;
   scoped_ptr<ui::MockDriWrapper> dri_;
   scoped_ptr<ui::DriBufferGenerator> buffer_generator_;
   scoped_ptr<MockScreenManager> screen_manager_;
   scoped_ptr<ui::DriSurfaceFactory> factory_;
-  scoped_ptr<ui::DriWindowManager> window_manager_;
+  scoped_ptr<ui::DriWindowDelegateManager> window_delegate_manager_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DriSurfaceFactoryTest);
 };
 
 void DriSurfaceFactoryTest::SetUp() {
   message_loop_.reset(new base::MessageLoopForUI);
   dri_.reset(new ui::MockDriWrapper(3));
   buffer_generator_.reset(new ui::DriBufferGenerator(dri_.get()));
   screen_manager_.reset(new MockScreenManager(dri_.get(),
                                               buffer_generator_.get()));
-  window_manager_.reset(new ui::DriWindowManager());
+  window_delegate_manager_.reset(new ui::DriWindowDelegateManager());
   factory_.reset(new ui::DriSurfaceFactory(
-      dri_.get(), screen_manager_.get(), window_manager_.get()));
+      dri_.get(), screen_manager_.get(), window_delegate_manager_.get()));
 
   scoped_ptr<ui::DriWindowDelegate> window_delegate(
       new ui::DriWindowDelegateImpl(ui::DriSurfaceFactory::kDefaultWidgetHandle,
                                     screen_manager_.get()));
   window_delegate->Initialize();
-  window_manager_->AddWindowDelegate(
+  window_delegate_manager_->AddWindowDelegate(
       ui::DriSurfaceFactory::kDefaultWidgetHandle, window_delegate.Pass());
 }
 
 void DriSurfaceFactoryTest::TearDown() {
   scoped_ptr<ui::DriWindowDelegate> delegate =
-      window_manager_->RemoveWindowDelegate(
+      window_delegate_manager_->RemoveWindowDelegate(
           ui::DriSurfaceFactory::kDefaultWidgetHandle);
   delegate->Shutdown();
   factory_.reset();
   message_loop_.reset();
 }
 
 TEST_F(DriSurfaceFactoryTest, FailInitialization) {
   dri_->fail_init();
   EXPECT_EQ(ui::DriSurfaceFactory::FAILED, factory_->InitializeHardware());
 }
@@ skipping 41 matching lines @@
   for (int i = 0; i < cursor.height(); ++i) {
     for (int j = 0; j < cursor.width(); ++j) {
       if (j < info.width() && i < info.height())
         EXPECT_EQ(SK_ColorWHITE, cursor.getColor(j, i));
       else
         EXPECT_EQ(static_cast<SkColor>(SK_ColorTRANSPARENT),
                   cursor.getColor(j, i));
     }
   }
 }