[Ozone-Dri] Allocate cursor buffers on the correct DRM device

ui/ozone/platform/dri/dri_window_delegate_impl_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"
@@ skipping 14 matching lines @@
 
 // Mode of size 6x4.
 const drmModeModeInfo kDefaultMode =
     {0, 6, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, {'\0'}};
 
 const gfx::AcceleratedWidget kDefaultWidgetHandle = 1;
 const uint32_t kDefaultCrtc = 1;
 const uint32_t kDefaultConnector = 2;
 const int kDefaultCursorSize = 64;
 
+std::vector<skia::RefPtr<SkSurface>> GetCursorBuffers(
+    const scoped_refptr<ui::MockDriWrapper> drm) {
+  std::vector<skia::RefPtr<SkSurface>> cursor_buffers;
+  for (const skia::RefPtr<SkSurface>& cursor_buffer : drm->buffers()) {
+    if (cursor_buffer->width() == kDefaultCursorSize &&
+        cursor_buffer->height() == kDefaultCursorSize) {
+      cursor_buffers.push_back(cursor_buffer);
+    }
+  }
+
+  return cursor_buffers;
+}
+
 }  // namespace
 
 class DriWindowDelegateImplTest : public testing::Test {
  public:
   DriWindowDelegateImplTest() {}
 
   void SetUp() override;
   void TearDown() override;
 
  protected:
@@ skipping 18 matching lines @@
       dri_, kDefaultCrtc, kDefaultConnector, gfx::Point(), kDefaultMode);
 
   drm_device_manager_.reset(new ui::DrmDeviceManager(dri_));
   window_delegate_manager_.reset(new ui::DriWindowDelegateManager());
 
   scoped_ptr<ui::DriWindowDelegate> window_delegate(
       new ui::DriWindowDelegateImpl(kDefaultWidgetHandle,
                                     drm_device_manager_.get(),
                                     screen_manager_.get()));
   window_delegate->Initialize();
+  window_delegate->OnBoundsChanged(
+      gfx::Rect(gfx::Size(kDefaultMode.hdisplay, kDefaultMode.vdisplay)));
   window_delegate_manager_->AddWindowDelegate(kDefaultWidgetHandle,
                                               window_delegate.Pass());
 }
 
 void DriWindowDelegateImplTest::TearDown() {
   scoped_ptr<ui::DriWindowDelegate> delegate =
       window_delegate_manager_->RemoveWindowDelegate(kDefaultWidgetHandle);
   delegate->Shutdown();
   message_loop_.reset();
 }
 
 TEST_F(DriWindowDelegateImplTest, SetCursorImage) {
   SkBitmap image;
   SkImageInfo info =
       SkImageInfo::Make(6, 4, kN32_SkColorType, kPremul_SkAlphaType);
   image.allocPixels(info);
   image.eraseColor(SK_ColorWHITE);
 
   std::vector<SkBitmap> cursor_bitmaps;
   cursor_bitmaps.push_back(image);
   window_delegate_manager_->GetWindowDelegate(kDefaultWidgetHandle)
       ->SetCursor(cursor_bitmaps, gfx::Point(4, 2), 0);
 
   SkBitmap cursor;
-  std::vector<skia::RefPtr<SkSurface>> cursor_buffers;
-  for (const skia::RefPtr<SkSurface>& cursor_buffer : dri_->buffers()) {
-    if (cursor_buffer->width() == kDefaultCursorSize &&
-        cursor_buffer->height() == kDefaultCursorSize) {
-      cursor_buffers.push_back(cursor_buffer);
-    }
-  }
-
+  std::vector<skia::RefPtr<SkSurface>> cursor_buffers = GetCursorBuffers(dri_);
   EXPECT_EQ(2u, cursor_buffers.size());
 
   // Buffers 1 is the cursor backbuffer we just drew in.
   cursor.setInfo(cursor_buffers[1]->getCanvas()->imageInfo());
   EXPECT_TRUE(cursor_buffers[1]->getCanvas()->readPixels(&cursor, 0, 0));
 
   // Check that the frontbuffer is displaying the right image as set above.
   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));
     }
   }
 }
+
+TEST_F(DriWindowDelegateImplTest, CheckCursorSurfaceAfterChangingDevice) {
+  // Add another device.
+  scoped_refptr<ui::MockDriWrapper> drm = new ui::MockDriWrapper();
+  screen_manager_->AddDisplayController(drm, kDefaultCrtc, kDefaultConnector);
+  screen_manager_->ConfigureDisplayController(
+      drm, kDefaultCrtc, kDefaultConnector,
+      gfx::Point(0, kDefaultMode.vdisplay), kDefaultMode);
+
+  // Move window to the display on the new device.
+  window_delegate_manager_->GetWindowDelegate(kDefaultWidgetHandle)
+      ->OnBoundsChanged(gfx::Rect(0, kDefaultMode.vdisplay,
+                                  kDefaultMode.hdisplay,
+                                  kDefaultMode.vdisplay));
+
+  EXPECT_EQ(2u, GetCursorBuffers(drm).size());
+}