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

webkit/glue/chromium_bridge_impl.cc

 // Copyright (c) 2008 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 "config.h"
 #include "ChromiumBridge.h"
 
 #include "BitmapImage.h"
 #include "Cursor.h"
 #include "Frame.h"
@@ skipping 13 matching lines @@
 #include "SystemTime.h"
 #include "Widget.h"
 #include <wtf/CurrentTime.h>
 
 #undef LOG
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "build/build_config.h"
 #include "googleurl/src/url_util.h"
 #include "skia/ext/skia_utils_win.h"
+#include "webkit/api/public/WebCursorInfo.h"
 #include "webkit/api/public/WebScreenInfo.h"
 #include "webkit/glue/chrome_client_impl.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/plugins/plugin_instance.h"
-#include "webkit/glue/webcursor.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webplugin_impl.h"
 #include "webkit/glue/webview_impl.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <vssym32.h>
-
 #include "base/gfx/native_theme.h"
 #endif
 
+using WebKit::WebCursorInfo;
+
 namespace {
 
 gfx::NativeViewId ToNativeId(WebCore::Widget* widget) {
   if (!widget)
     return 0;
   return widget->root()->hostWindow()->platformWindow();
 }
 
 ChromeClientImpl* ToChromeClient(WebCore::Widget* widget) {
   WebCore::FrameView* view;
@@ skipping 109 matching lines @@
   if (!view || !view->delegate())
     return IntRect();
   return ToIntRect(view->delegate()->GetScreenInfo(view).availableRect);
 }
 
 // Widget ---------------------------------------------------------------------
 
 void ChromiumBridge::widgetSetCursor(Widget* widget, const Cursor& cursor) {
   ChromeClientImpl* chrome_client = ToChromeClient(widget);
   if (chrome_client)
-    chrome_client->SetCursor(WebCursor(cursor.impl()));
+    chrome_client->SetCursor(webkit_glue::CursorToWebCursorInfo(cursor));
 }
 
 void ChromiumBridge::widgetSetFocus(Widget* widget) {
   ChromeClientImpl* chrome_client = ToChromeClient(widget);
   if (chrome_client)
     chrome_client->focus();
 }
 
 }  // namespace WebCore