Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(515)

Unified Diff: webkit/glue/webcursor.h

Issue 9463003: aura-x11: Add custom web cursor support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/textfield/native_textfield_views.cc ('k') | webkit/glue/webcursor_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webcursor.h
diff --git a/webkit/glue/webcursor.h b/webkit/glue/webcursor.h
index 0dfddcf7e413542c20f3f7629a3ae59324ebd0da..23d55febd84fe61dba2fe331b9d67a7dfa08bf5d 100644
--- a/webkit/glue/webcursor.h
+++ b/webkit/glue/webcursor.h
@@ -71,7 +71,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 ui::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.
@@ -143,7 +145,10 @@ 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.
+ ui::PlatformCursor platform_cursor_;
+#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_;
« no previous file with comments | « ui/views/controls/textfield/native_textfield_views.cc ('k') | webkit/glue/webcursor_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698