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

webkit/glue/plugins/webplugin_delegate_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 "webkit/glue/plugins/webplugin_delegate_impl.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/iat_patch.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/stats_counters.h"
 #include "base/string_util.h"
 #include "webkit/api/public/WebInputEvent.h"
 #include "webkit/default_plugin/plugin_impl.h"
 #include "webkit/glue/glue_util.h"
-#include "webkit/glue/webplugin.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/plugin_stream_url.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/webplugin.h"
 
+using WebKit::WebCursorInfo;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebInputEvent;
 using WebKit::WebMouseEvent;
 
 namespace {
 
 const wchar_t kWebPluginDelegateProperty[] = L"WebPluginDelegateProperty";
 const wchar_t kPluginNameAtomProperty[] = L"PluginNameAtom";
 const wchar_t kDummyActivationWindowName[] = L"DummyWindowForActivation";
 const wchar_t kPluginOrigProc[] = L"OriginalPtr";
@@ skipping 1062 matching lines @@
         return false;
       }
       return NPEventFromWebKeyboardEvent(
           *static_cast<const WebKeyboardEvent*>(&event), np_event);
     default:
       return false;
   }
 }
 
 bool WebPluginDelegateImpl::HandleInputEvent(const WebInputEvent& event,
-                                             WebCursor* cursor) {
+                                             WebCursorInfo* cursor_info) {
   DCHECK(windowless_) << "events should only be received in windowless mode";
-  DCHECK(cursor != NULL);
+  DCHECK(cursor_info != NULL);
 
   NPEvent np_event;
   if (!NPEventFromWebInputEvent(event, &np_event)) {
     return false;
   }
 
   if (ShouldTrackEventForModalLoops(&np_event)) {
     // A windowless plugin can enter a modal loop in a NPP_HandleEvent call.
     // For e.g. Flash puts up a context menu when we right click on the
     // windowless plugin area. We detect this by setting up a message filter
@@ skipping 24 matching lines @@
     pop_user_gesture = true;
     instance()->PushPopupsEnabledState(true);
   }
 
   bool ret = instance()->NPP_HandleEvent(&np_event) != 0;
 
   if (np_event.event == WM_MOUSEMOVE) {
     // Snag a reference to the current cursor ASAP in case the plugin modified
     // it. There is a nasty race condition here with the multiprocess browser
     // as someone might be setting the cursor in the main process as well.
-    *cursor = current_windowless_cursor_;
+    current_windowless_cursor_.GetCursorInfo(cursor_info);
   }
 
   if (pop_user_gesture) {
     instance()->PopPopupsEnabledState();
   }
 
   handle_event_depth_--;
 
   g_current_plugin_instance = last_plugin_instance;
 
@@ skipping 146 matching lines @@
 
   // It is ok to pass NULL here to GetCursor as we are not looking for cursor
   // types defined by Webkit.
   HCURSOR previous_cursor =
       g_current_plugin_instance->current_windowless_cursor_.GetCursor(NULL);
 
   g_current_plugin_instance->current_windowless_cursor_.InitFromExternalCursor(
       cursor);
   return previous_cursor;
 }