Start using WebCursorInfo from the WebKit API. WebCursorInfo is a...

chrome/renderer/render_widget.cc

 // Copyright (c) 2009 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 "chrome/renderer/render_widget.h"
 
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "build/build_config.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/transport_dib.h"
 #include "chrome/renderer/render_process.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkShader.h"
+#include "webkit/api/public/WebCursorInfo.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebScreenInfo.h"
 #include "webkit/api/public/WebSize.h"
 
 #if defined(OS_POSIX)
 #include "third_party/skia/include/core/SkPixelRef.h"
 #include "third_party/skia/include/core/SkMallocPixelRef.h"
 #endif  // defined(OS_POSIX)
 
 #include "webkit/glue/webtextdirection.h"
 #include "webkit/glue/webwidget.h"
 
+using WebKit::WebCursorInfo;
 using WebKit::WebInputEvent;
 using WebKit::WebRect;
 using WebKit::WebScreenInfo;
 using WebKit::WebSize;
 
 RenderWidget::RenderWidget(RenderThreadBase* render_thread, bool activatable)
     : routing_id_(MSG_ROUTING_NONE),
       webwidget_(NULL),
       opener_id_(MSG_ROUTING_NONE),
       render_thread_(render_thread),
@@ skipping 514 matching lines @@
   scroll_delta_.SetPoint(dx, dy);
 
   if (scroll_pending)
     return;
 
   // Perform scrolling asynchronously since we need to call WebView::Paint
   MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
       this, &RenderWidget::DoDeferredScroll));
 }
 
-void RenderWidget::SetCursor(WebWidget* webwidget, const WebCursor& cursor) {
+void RenderWidget::SetCursor(WebWidget* webwidget,
+                             const WebCursorInfo& cursor_info) {
+  // TODO(darin): Eliminate this temporary.
+  WebCursor cursor(cursor_info);
+
   // Only send a SetCursor message if we need to make a change.
   if (!current_cursor_.IsEqual(cursor)) {
     current_cursor_ = cursor;
     Send(new ViewHostMsg_SetCursor(routing_id_, cursor));
   }
 }
 
 // We are supposed to get a single call to Show for a newly created RenderWidget
 // that was created via RenderWidget::CreateWebView.  So, we wait until this
 // point to dispatch the ShowWidget message.
@@ skipping 273 matching lines @@
 
   if (i == plugin_window_moves_.size())
     plugin_window_moves_.push_back(move);
 }
 
 WebScreenInfo RenderWidget::GetScreenInfo(WebWidget* webwidget) {
   WebScreenInfo results;
   Send(new ViewHostMsg_GetScreenInfo(routing_id_, host_window_, &results));
   return results;
 }