diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-23 21:57:51 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-23 21:57:51 +0000 |
| commit | 67b2505a94d723c7f6fb7814aefc677540d4fc7e (patch) | |
| tree | efb20ec239ad1f7686e06866931bb5436b5faf81 /webkit/glue/webkit_glue.h | |
| parent | 0c3abea91971ae0e2289da9c43ad359b716dd3aa (diff) | |
| download | chromium_src-67b2505a94d723c7f6fb7814aefc677540d4fc7e.zip chromium_src-67b2505a94d723c7f6fb7814aefc677540d4fc7e.tar.gz chromium_src-67b2505a94d723c7f6fb7814aefc677540d4fc7e.tar.bz2 | |
Let cursors be based on CGImage instead of SkBitmap on the Mac
Review URL: http://codereview.chromium.org/8111
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3869 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.h')
| -rw-r--r-- | webkit/glue/webkit_glue.h | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index f44649b..71b1c68 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -5,11 +5,15 @@ #ifndef WEBKIT_GLUE_H__ #define WEBKIT_GLUE_H__ -#include <string> -#include <vector> -#ifdef _WIN32 +#include "base/basictypes.h" + +#if defined(OS_WIN) #include <windows.h> #endif + +#include <string> +#include <vector> + #include "base/string16.h" #include "webkit/glue/webplugin.h" @@ -38,6 +42,13 @@ class Frame; class SkBitmap; +#if defined(OS_MACOSX) +typedef struct CGImage* CGImageRef; +typedef CGImageRef GlueBitmap; +#else +typedef SkBitmap* GlueBitmap; +#endif + namespace webkit_glue { //----------------------------------------------------------------------------- @@ -171,9 +182,9 @@ std::wstring GetLocalizedString(int message_id); // specified as BINDATA in the relevant .rc file. std::string GetDataResource(int resource_id); -// Returns an SkBitmap for a resource. This resource must have been +// Returns a GlueBitmap for a resource. This resource must have been // specified as BINDATA in the relevant .rc file. -SkBitmap* GetBitmapResource(int resource_id); +GlueBitmap GetBitmapResource(int resource_id); #ifdef _WIN32 // Loads and returns a cursor. |