Start using WebCursorInfo from the WebKit API. WebCursorInfo is a

lightweight struct containing a description of a cursor that the
embedder should render.

WebCursor still exists.  Instead of WebCursor initializing from a
PlatformCursor, it now initializes from a WebCursorInfo.

TEST=none
BUG=10039
R=jam

Review URL: http://codereview.chromium.org/155172

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20194 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 5 deletions

diff --git a/webkit/glue/webcursor.h b/webkit/glue/webcursor.h
index 8ecc9d0..86d693f 100644
--- a/webkit/glue/webcursor.h
+++ b/webkit/glue/webcursor.h
@@ -30,9 +30,9 @@ class NSCursor;
 
 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
@@ -42,13 +42,17 @@ class PlatformCursor;
 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;
@@ -110,7 +114,8 @@ class WebCursor {
   // 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_;