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

webkit/glue/chrome_client_impl.cc

 // Copyright (c) 2006-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 "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "AccessibilityObject.h"
@@ skipping 18 matching lines @@
 #endif
 MSVC_POP_WARNING();
 
 #undef LOG
 
 #include "webkit/glue/chrome_client_impl.h"
 
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "googleurl/src/gurl.h"
+#include "webkit/api/public/WebCursorInfo.h"
 #include "webkit/api/public/WebInputEvent.h"
 #include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebURLRequest.h"
 #include "webkit/api/src/WrappedResourceRequest.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webview_delegate.h"
 #include "webkit/glue/webview_impl.h"
 #include "webkit/glue/webwidget_impl.h"
 
+using WebKit::WebCursorInfo;
 using WebKit::WebInputEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebRect;
 using WebKit::WebURLRequest;
 using WebKit::WrappedResourceRequest;
 
 // Callback class that's given to the WebViewDelegate during a file choose
 // operation.
 class WebFileChooserCallbackImpl : public WebFileChooserCallback {
  public:
@@ skipping 535 matching lines @@
     popup_items.push_back(menu_item);
   }
 
   webwidget->InitWithItems(popup_container,
                            webkit_glue::IntRectToWebRect(bounds),
                            popup_container->menuItemHeight(),
                            popup_container->selectedIndex(),
                            popup_items);
 }
 
-void ChromeClientImpl::SetCursor(const WebCursor& cursor) {
+void ChromeClientImpl::SetCursor(const WebCursorInfo& cursor) {
   if (ignore_next_set_cursor_) {
     ignore_next_set_cursor_ = false;
     return;
   }
 
   WebViewDelegate* delegate = webview_->delegate();
   if (delegate)
     delegate->SetCursor(webview_, cursor);
 }
 
-void ChromeClientImpl::SetCursorForPlugin(const WebCursor& cursor) {
+void ChromeClientImpl::SetCursorForPlugin(const WebCursorInfo& cursor) {
   SetCursor(cursor);
   // Currently, Widget::setCursor is always called after this function in
   // EventHandler.cpp and since we don't want that we set a flag indicating
   // that the next SetCursor call is to be ignored.
   ignore_next_set_cursor_ = true;
 }
 
 void ChromeClientImpl::formStateDidChange(const WebCore::Node*) {
   WebViewDelegate* delegate = webview_->delegate();
   if (delegate)
     delegate->OnNavStateChanged(webview_);
 }