ozone: dri: Fix excessive cursor uploads

We have a check to skip updates if the cursor is reset to the same value,
but this stopped working in a prior refactor. Fix it by using ShowCursor()
from DriCursor::SetCursor() instead of DriWindow::SetCursor().

BUG=436433
TEST=chrome on link_freon with an extra LOG() in before sending
     OzoneGpuMsg_CursorSet

Review URL: https://codereview.chromium.org/761483004

Cr-Commit-Position: refs/heads/master@{#305762}

ui/ozone/platform/dri/dri_cursor.cc

@@ -37,10 +37,14 @@ void DriCursor::SetCursor(gfx::AcceleratedWidget widget,
     return;
 
   cursor_ = cursor;
+
+  ShowCursor();
 }
 
 void DriCursor::ShowCursor() {
   DCHECK_NE(cursor_window_, gfx::kNullAcceleratedWidget);
+  if (!sender_->IsConnected())
+    return;
   if (cursor_.get())
     sender_->SetHardwareCursor(cursor_window_, cursor_->bitmaps(),
                                bitmap_location(), cursor_->frame_delay_ms());
@@ -49,6 +53,8 @@ void DriCursor::ShowCursor() {
 }
 
 void DriCursor::HideCursor() {
+  if (!sender_->IsConnected())
+    return;
   DCHECK_NE(cursor_window_, gfx::kNullAcceleratedWidget);
   sender_->SetHardwareCursor(cursor_window_, std::vector<SkBitmap>(),
                              gfx::Point(), 0);

ui/ozone/platform/dri/dri_window.cc

@@ -116,11 +116,6 @@ void DriWindow::Restore() {}
 void DriWindow::SetCursor(PlatformCursor cursor) {
   DriCursor* dri_cursor = window_manager_->cursor();
   dri_cursor->SetCursor(widget_, cursor);
-  // ShowCursor results in a IPC call to GPU. So, we make sure the channel
-  // is connected. OnChannelEstablished guarantees that ShowCursor is called
-  // eventually.
-  if (sender_->IsConnected() && dri_cursor->GetCursorWindow() == widget_)
-    dri_cursor->ShowCursor();
 }
 
 void DriWindow::MoveCursorTo(const gfx::Point& location) {