ozone: dri: Do initial cursor set

ui/gfx/ozone/dri/dri_surface_factory.cc

 // Copyright 2013 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/gfx/ozone/dri/dri_surface_factory.h"
 
 #include <drm.h>
 #include <errno.h>
 #include <xf86drm.h>
 
@@ skipping 193 matching lines @@
   }
 
   // Bind the surface to the controller. This will register the backing buffers
   // with the hardware CRTC such that we can show the buffers. The controller
   // takes ownership of the surface.
   if (!controller_->BindSurfaceToController(surface.Pass())) {
     LOG(ERROR) << "Failed to bind surface to controller";
     return gfx::kNullAcceleratedWidget;
   }
 
+  // Initial cursor set.
+  ResetCursor();
+
   return reinterpret_cast<gfx::AcceleratedWidget>(controller_->get_surface());
 }
 
 bool DriSurfaceFactory::LoadEGLGLES2Bindings(
       AddGLLibraryCallback add_gl_library,
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
   return false;
 }
 
 bool DriSurfaceFactory::AttemptToResizeAcceleratedWidget(
@@ skipping 42 matching lines @@
 
 scoped_ptr<gfx::VSyncProvider> DriSurfaceFactory::CreateVSyncProvider(
     gfx::AcceleratedWidget w) {
   CHECK(state_ == INITIALIZED);
   return scoped_ptr<VSyncProvider>(new DriVSyncProvider(controller_.get()));
 }
 
 void DriSurfaceFactory::SetHardwareCursor(gfx::AcceleratedWidget window,
                                           const SkBitmap& image,
                                           const gfx::Point& location) {
+  cursor_bitmap_ = image;
+  cursor_location_ = location;
+
   if (state_ != INITIALIZED)
     return;
 
-  UpdateCursorImage(cursor_surface_.get(), image);
-  controller_->MoveCursor(location);
-  controller_->SetCursor(*cursor_surface_.get());
-  cursor_surface_->SwapBuffers();
+  ResetCursor();
 }
 
 void DriSurfaceFactory::MoveHardwareCursor(gfx::AcceleratedWidget window,
                                            const gfx::Point& location) {
+  cursor_location_ = location;
+
   if (state_ != INITIALIZED)
     return;
 
   controller_->MoveCursor(location);
 }
 
 void DriSurfaceFactory::UnsetHardwareCursor(gfx::AcceleratedWidget window) {
+  cursor_bitmap_.reset();
+
   if (state_ != INITIALIZED)
     return;
 
-  controller_->UnsetCursor();
+  ResetCursor();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DriSurfaceFactory private
 
 DriSurface* DriSurfaceFactory::CreateSurface(const gfx::Size& size) {
   return new DriSurface(drm_.get(), size);
 }
 
 DriWrapper* DriSurfaceFactory::CreateWrapper() {
@@ skipping 52 matching lines @@
 void DriSurfaceFactory::WaitForPageFlipEvent(int fd) {
   drmEventContext drm_event;
   drm_event.version = DRM_EVENT_CONTEXT_VERSION;
   drm_event.page_flip_handler = HandlePageFlipEvent;
   drm_event.vblank_handler = NULL;
 
   // Wait for the page-flip to complete.
   drmHandleEvent(fd, &drm_event);
 }
 
+void DriSurfaceFactory::ResetCursor() {
+  if (!cursor_bitmap_.empty()) {
+    // Draw new cursor into backbuffer.
+    UpdateCursorImage(cursor_surface_.get(), cursor_bitmap_);
+    cursor_surface_->SwapBuffers();

[dnicoara, 2014/03/21 21:38:35]

Could we move this inside HardwareDisplayController::SetCursor? My bad for not
following the same model as PageFlip.

And could we keep it after the DRM call such that the changes to DriSurface
aren't needed anymore. This is more to keep a consistent way of referring to the
buffer we're about to scan out of.

[spang, 2014/03/26 22:26:35]

Done.

+
+    // Reset location & buffer.
+    controller_->MoveCursor(cursor_location_);
+    controller_->SetCursor(*cursor_surface_.get());
+  } else {
+    // No cursor set.
+    controller_->UnsetCursor();
+  }
+}
+
+
 }  // namespace gfx