OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef WEBKIT_GLUE_WEBCURSOR_H_ | 5 #ifndef WEBKIT_GLUE_WEBCURSOR_H_ |
6 #define WEBKIT_GLUE_WEBCURSOR_H_ | 6 #define WEBKIT_GLUE_WEBCURSOR_H_ |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "ui/gfx/native_widget_types.h" | 9 #include "ui/gfx/native_widget_types.h" |
10 #include "ui/gfx/point.h" | 10 #include "ui/gfx/point.h" |
11 #include "ui/gfx/size.h" | 11 #include "ui/gfx/size.h" |
12 #include "webkit/glue/webkit_glue_export.h" | 12 #include "webkit/glue/webkit_glue_export.h" |
13 | 13 |
14 #include <vector> | 14 #include <vector> |
15 | 15 |
16 #if defined(OS_WIN) | 16 #if defined(OS_WIN) |
17 typedef struct HINSTANCE__* HINSTANCE; | 17 typedef struct HINSTANCE__* HINSTANCE; |
18 typedef struct HICON__* HICON; | 18 typedef struct HICON__* HICON; |
19 typedef HICON HCURSOR; | 19 typedef HICON HCURSOR; |
20 #elif defined(TOOLKIT_GTK) | 20 #elif defined(TOOLKIT_GTK) |
21 typedef struct _GdkCursor GdkCursor; | 21 typedef struct _GdkCursor GdkCursor; |
22 #elif defined(OS_MACOSX) | 22 #elif defined(OS_MACOSX) |
23 #ifdef __OBJC__ | 23 #ifdef __OBJC__ |
24 @class NSCursor; | 24 @class NSCursor; |
25 #else | 25 #else |
26 class NSCursor; | 26 class NSCursor; |
27 #endif | 27 #endif |
28 typedef UInt32 ThemeCursor; | 28 typedef UInt32 ThemeCursor; |
29 struct Cursor; | 29 typedef struct Cursor Cursor; |
Mark Mentovai
2012/07/26 22:41:10
Weird, is someone using this header in a .c (not .
Nico
2012/07/26 22:45:12
No. This change isn't really necessary, I just tho
| |
30 #endif | 30 #endif |
31 | 31 |
32 class Pickle; | 32 class Pickle; |
33 class PickleIterator; | 33 class PickleIterator; |
34 | 34 |
35 namespace WebKit { | 35 namespace WebKit { |
36 class WebImage; | 36 class WebImage; |
37 struct WebCursorInfo; | 37 struct WebCursorInfo; |
38 } | 38 } |
39 | 39 |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
157 HCURSOR external_cursor_; | 157 HCURSOR external_cursor_; |
158 // A custom cursor created from custom bitmap data by Webkit. | 158 // A custom cursor created from custom bitmap data by Webkit. |
159 HCURSOR custom_cursor_; | 159 HCURSOR custom_cursor_; |
160 #elif defined(TOOLKIT_GTK) | 160 #elif defined(TOOLKIT_GTK) |
161 // A custom cursor created that should be unref'ed from the destructor. | 161 // A custom cursor created that should be unref'ed from the destructor. |
162 GdkCursor* unref_; | 162 GdkCursor* unref_; |
163 #endif | 163 #endif |
164 }; | 164 }; |
165 | 165 |
166 #endif // WEBKIT_GLUE_WEBCURSOR_H_ | 166 #endif // WEBKIT_GLUE_WEBCURSOR_H_ |
OLD | NEW |