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

Side by Side Diff: webkit/api/public/WebCursorInfo.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/renderer/webplugin_delegate_proxy.cc ('k') | webkit/api/public/WebImage.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Name: svn:eol-style
+ LF
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
11 * copyright notice, this list of conditions and the following disclaimer 11 * copyright notice, this list of conditions and the following disclaimer
12 * in the documentation and/or other materials provided with the 12 * in the documentation and/or other materials provided with the
13 * distribution. 13 * distribution.
14 * * Neither the name of Google Inc. nor the names of its 14 * * Neither the name of Google Inc. nor the names of its
15 * contributors may be used to endorse or promote products derived from 15 * contributors may be used to endorse or promote products derived from
16 * this software without specific prior written permission. 16 * this software without specific prior written permission.
17 * 17 *
18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef WebCursorInfo_h 31 #ifndef WebCursorInfo_h
32 #define WebCursorInfo_h 32 #define WebCursorInfo_h
33 33
34 #error "This header file is still a work in progress; do not include!"
35
36 #include "WebImage.h" 34 #include "WebImage.h"
37 #include "WebPoint.h" 35 #include "WebPoint.h"
38 36
37 #if WEBKIT_IMPLEMENTATION
38 namespace WebCore { class Cursor; }
39 #endif
40
39 #ifdef WIN32 41 #ifdef WIN32
40 typedef struct HICON__* HICON; 42 typedef struct HICON__* HICON;
41 typedef HICON HCURSOR; 43 typedef HICON HCURSOR;
42 #endif 44 #endif
43 45
44 namespace WebKit { 46 namespace WebKit {
45 47
46 struct WebCursorInfo { 48 struct WebCursorInfo {
47 enum Type { 49 enum Type {
48 TypePointer, 50 TypePointer,
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 TypeCopy, 86 TypeCopy,
85 TypeNone, 87 TypeNone,
86 TypeNotAllowed, 88 TypeNotAllowed,
87 TypeZoomIn, 89 TypeZoomIn,
88 TypeZoomOut, 90 TypeZoomOut,
89 TypeCustom 91 TypeCustom
90 }; 92 };
91 93
92 Type type; 94 Type type;
93 WebPoint hotSpot; 95 WebPoint hotSpot;
94 WebImage customData; 96 WebImage customImage;
95 97
96 #ifdef WIN32 98 #ifdef WIN32
97 // On Windows, TypeCustom may alternatively reference an externally 99 // On Windows, TypeCustom may alternatively reference an externally
98 // defined HCURSOR. If type is TypeCustom and externalHandle is non- 100 // defined HCURSOR. If type is TypeCustom and externalHandle is non-
99 // null, then customData should be ignored. The WebCursorInfo is not 101 // null, then customData should be ignored. The WebCursorInfo is not
100 // responsible for managing the lifetime of this cursor handle. 102 // responsible for managing the lifetime of this cursor handle.
101 HCURSOR externalHandle; 103 HCURSOR externalHandle;
102 #endif 104 #endif
105
106 explicit WebCursorInfo(Type type = TypePointer)
107 : type(type)
108 {
109 #ifdef WIN32
110 externalHandle = 0;
111 #endif
112 }
113
114 #if WEBKIT_IMPLEMENTATION
115 explicit WebCursorInfo(const WebCore::Cursor&);
116 #endif
103 }; 117 };
104 118
105 } // namespace WebKit 119 } // namespace WebKit
106 120
107 #endif 121 #endif
OLDNEW
« no previous file with comments | « chrome/renderer/webplugin_delegate_proxy.cc ('k') | webkit/api/public/WebImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698