aura-x11: Add custom web cursor support.

webkit/glue/webcursor.h

 // Copyright (c) 2012 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 "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
@@ skipping 52 matching lines @@
   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
   // compare the bitmaps to verify whether they are equal.
   bool IsEqual(const WebCursor& other) const;
 
   // 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.
   HCURSOR GetCursor(HINSTANCE module_handle);
 
   // Initialize this from the given Windows cursor. The caller must ensure that
   // the HCURSOR remains valid by not invoking the DestroyCursor/DestroyIcon
   // APIs on it.
   void InitFromExternalCursor(HCURSOR handle);
 
@@ skipping 51 matching lines @@
   // 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)
+#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_;
   // A custom cursor created from custom bitmap data by Webkit.
   HCURSOR custom_cursor_;
 #elif defined(TOOLKIT_USES_GTK)
   // A custom cursor created that should be unref'ed from the destructor.
   GdkCursor* unref_;
 #endif
 };
 
 #endif  // WEBKIT_GLUE_WEBCURSOR_H_