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

Unified Diff: webkit/glue/webcursor.h

Issue 155172: Start using WebCursorInfo from the WebKit API. WebCursorInfo is a... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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 | « webkit/glue/plugins/webplugin_delegate_impl_mac.mm ('k') | webkit/glue/webcursor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webcursor.h
===================================================================
--- webkit/glue/webcursor.h (revision 20148)
+++ webkit/glue/webcursor.h (working copy)
@@ -30,9 +30,9 @@
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 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 @@
// 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_;
« no previous file with comments | « webkit/glue/plugins/webplugin_delegate_impl_mac.mm ('k') | webkit/glue/webcursor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698