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

webkit/glue/webcursor.h

 // 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.
 
 #ifndef WEBKIT_GLUE_WEBCURSOR_H_
 #define WEBKIT_GLUE_WEBCURSOR_H_
 
 #include "base/basictypes.h"
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
@@ skipping 12 matching lines @@
 #elif defined(OS_MACOSX)
 #ifdef __OBJC__
 @class NSCursor;
 #else
 class NSCursor;
 #endif
 #endif
 
 class Pickle;
 
-namespace WebCore {
-class Image;
-class PlatformCursor;
+namespace WebKit {
+class WebImage;
+struct WebCursorInfo;
 }
 
 // This class encapsulates a cross-platform description of a cursor.  Platform
 // specific methods are provided to translate the cross-platform cursor into a
 // platform specific cursor.  It is also possible to serialize / de-serialize a
 // WebCursor.
 class WebCursor {
  public:
   WebCursor();
-  explicit WebCursor(const WebCore::PlatformCursor& platform_cursor);
+  explicit WebCursor(const WebKit::WebCursorInfo& cursor_info);
   ~WebCursor();
 
   // Copy constructor/assignment operator combine.
   WebCursor(const WebCursor& other);
   const WebCursor& operator=(const WebCursor& other);
 
+  // Conversion from/to WebCursorInfo.
+  void InitFromCursorInfo(const WebKit::WebCursorInfo& cursor_info);
+  void GetCursorInfo(WebKit::WebCursorInfo* cursor_info) const;
+
   // Serialization / De-serialization
   bool Deserialize(const Pickle* pickle, void** iter);
   bool Serialize(Pickle* pickle) const;
 
   // Returns true if GetCustomCursor should be used to allocate a platform
   // specific cursor object.  Otherwise GetCursor should be used.
   bool IsCustom() const;
 
   // Returns true if the current cursor object contains the same cursor as the
   // cursor object passed in. If the current cursor is a custom cursor, we also
@@ skipping 41 matching lines @@
   // Returns true if the platform data in the current cursor object
   // matches that of the cursor passed in.
   bool IsPlatformDataEqual(const WebCursor& other) const ;
 
   // Copies platform specific data from the WebCursor instance passed in.
   void CopyPlatformData(const WebCursor& other);
 
   // Platform specific cleanup.
   void CleanupPlatformData();
 
-  void SetCustomData(WebCore::Image* image);
+  void SetCustomData(const WebKit::WebImage& image);
+  void ImageFromCustomData(WebKit::WebImage* image) const;
 
   // WebCore::PlatformCursor type.
   int type_;
 
   gfx::Point hotspot_;
 
   // Custom cursor data, as 32-bit RGBA.
   // Platform-inspecific because it can be serialized.
   gfx::Size custom_size_;
   std::vector<char> custom_data_;
 
 #if defined(OS_WIN)
   // An externally generated HCURSOR. We assume that it remains valid, i.e we
   // don't attempt to copy the HCURSOR.
   HCURSOR external_cursor_;
   // A custom cursor created from custom bitmap data by Webkit.
   HCURSOR custom_cursor_;
 #endif  // OS_WIN
 };
 
 #endif  // WEBKIT_GLUE_WEBCURSOR_H_