aura-x11: Add custom web cursor support.

webkit/glue/webcursor.h

Index: webkit/glue/webcursor.h
diff --git a/webkit/glue/webcursor.h b/webkit/glue/webcursor.h
index 0461a3ca7add3a122824ee1cd7562c52f054458b..6ce614f0b280cb0a45d1567d8183388f5bd884aa 100644
--- a/webkit/glue/webcursor.h
+++ b/webkit/glue/webcursor.h
@@ -70,7 +70,9 @@ class WEBKIT_GLUE_EXPORT WebCursor {
   // Returns a native cursor representing the current WebCursor instance.
   gfx::NativeCursor GetNativeCursor();
 
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(USE_AURA)
+  const gfx::PlatformCursor& GetPlatformCursor();
+#elif defined(OS_WIN)
   // Returns a HCURSOR representing the current WebCursor instance.
   // The ownership of the HCURSOR (does not apply to external cursors) remains
   // with the WebCursor instance.
@@ -142,7 +144,13 @@ class WEBKIT_GLUE_EXPORT WebCursor {
   gfx::Size custom_size_;
   std::vector<char> custom_data_;
 
-#if defined(OS_WIN)
+#if defined(USE_AURA) && defined(USE_X11)
+typedef struct _XcursorImage XcursorImage;

[darin (slow to review), 2012/02/24 06:32:35]

nit: indentation

nit: usually forward declarations go at the top of the header.  Or, did you mean
to define a class-scoped typedef?

[sadrul, 2012/02/24 17:38:19]

Moved the typedef at the top.

+
+  // Only used for custom cursors.
+  gfx::PlatformCursor platform_cursor_;
+  XcursorImage* image_;
+#elif 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_;