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

webkit/glue/webplugin_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 "Cursor.h"
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "Event.h"
 #include "EventNames.h"
 #include "FloatPoint.h"
 #include "FormData.h"
 #include "FormState.h"
 #include "FocusController.h"
 #include "Frame.h"
 #include "FrameLoader.h"
@@ skipping 23 matching lines @@
 #include "ScrollView.h"
 #include "Widget.h"
 
 #undef LOG
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "net/base/escape.h"
+#include "webkit/api/public/WebCursorInfo.h"
 #include "webkit/api/public/WebData.h"
 #include "webkit/api/public/WebHTTPBody.h"
 #include "webkit/api/public/WebInputEvent.h"
 #include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebKitClient.h"
 #include "webkit/api/public/WebString.h"
 #include "webkit/api/public/WebURL.h"
 #include "webkit/api/public/WebURLLoader.h"
 #include "webkit/api/public/WebURLLoaderClient.h"
 #include "webkit/api/public/WebURLResponse.h"
 #include "webkit/glue/chrome_client_impl.h"
 #include "webkit/glue/event_conversion.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/multipart_response_delegate.h"
-#include "webkit/glue/webcursor.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webplugin_impl.h"
 #include "webkit/glue/plugins/plugin_host.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/stacking_order_iterator.h"
 #include "webkit/glue/webplugin_delegate.h"
 #include "webkit/glue/webview_impl.h"
 #include "googleurl/src/gurl.h"
 
+using WebKit::WebCursorInfo;
 using WebKit::WebData;
 using WebKit::WebHTTPBody;
 using WebKit::WebInputEvent;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebString;
 using WebKit::WebURLError;
 using WebKit::WebURLLoader;
 using WebKit::WebURLLoaderClient;
 using WebKit::WebURLRequest;
@@ skipping 786 matching lines @@
     if (WebCore::Page* current_page = containing_frame->page()) {
       current_page->focusController()->setFocusedFrame(containing_frame);
     }
     // Give focus to our containing HTMLPluginElement.
     containing_frame->document()->setFocusedNode(element_);
   }
 
   // TODO(pkasting): http://b/1119691 This conditional seems exactly backwards,
   // but it matches Safari's code, and if I reverse it, giving focus to a
   // transparent (windowless) plugin fails.
-  WebCursor cursor;
-  if (!delegate_->HandleInputEvent(web_event, &cursor))
+  WebCursorInfo cursor_info;
+  if (!delegate_->HandleInputEvent(web_event, &cursor_info))
     event->setDefaultHandled();
 
   WebCore::Page* page = parent_view->frame()->page();
   if (!page)
     return;
 
   ChromeClientImpl* chrome_client =
       static_cast<ChromeClientImpl*>(page->chrome()->client());
 
   // A windowless plugin can change the cursor in response to the WM_MOUSEMOVE
   // event. We need to reflect the changed cursor in the frame view as the
   // mouse is moved in the boundaries of the windowless plugin.
-  chrome_client->SetCursorForPlugin(cursor);
+  chrome_client->SetCursorForPlugin(cursor_info);
 }
 
 void WebPluginImpl::handleKeyboardEvent(WebCore::KeyboardEvent* event) {
   WebKeyboardEvent web_event;
   if (!ToWebKeyboardEvent(*event, &web_event))
     return;
   // TODO(pkasting): http://b/1119691 See above.
-  WebCursor current_web_cursor;
-  if (!delegate_->HandleInputEvent(web_event, &current_web_cursor))
+  WebCursorInfo cursor_info;
+  if (!delegate_->HandleInputEvent(web_event, &cursor_info))
     event->setDefaultHandled();
 }
 
 NPObject* WebPluginImpl::GetPluginScriptableObject() {
   return delegate_->GetPluginScriptableObject();
 }
 
 WebPluginResourceClient* WebPluginImpl::GetClientFromLoader(
     WebURLLoader* loader) {
   for (size_t i = 0; i < clients_.size(); ++i) {
@@ skipping 515 matching lines @@
 
   WebPluginGeometry move;
   move.window = window_;
   move.window_rect = gfx::Rect();
   move.clip_rect = gfx::Rect();
   move.rects_valid = false;
   move.visible = widget_->isVisible();
 
   webview->delegate()->DidMove(webview, move);
 }