| Index: webkit/glue/webcursor.h
|
| diff --git a/webkit/glue/webcursor.h b/webkit/glue/webcursor.h
|
| index 0461a3ca7add3a122824ee1cd7562c52f054458b..4de3f8d4f32d03af9dce55e73ebf9b684dbc347b 100644
|
| --- a/webkit/glue/webcursor.h
|
| +++ b/webkit/glue/webcursor.h
|
| @@ -29,6 +29,10 @@ typedef UInt32 ThemeCursor;
|
| struct Cursor;
|
| #endif
|
|
|
| +#if defined(USE_AURA) && defined(USE_X11)
|
| +typedef struct _XcursorImage XcursorImage;
|
| +#endif
|
| +
|
| class Pickle;
|
|
|
| namespace WebKit {
|
| @@ -70,7 +74,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 +148,11 @@ 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)
|
| + // 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_;
|
|
|