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 CONTENT_COMMON_CURSORS_WEBCURSOR_H_ | 5 #ifndef CONTENT_COMMON_CURSORS_WEBCURSOR_H_ |
6 #define CONTENT_COMMON_CURSORS_WEBCURSOR_H_ | 6 #define CONTENT_COMMON_CURSORS_WEBCURSOR_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 #if defined(OS_WIN) | 165 #if defined(OS_WIN) |
166 // An externally generated HCURSOR. We assume that it remains valid, i.e we | 166 // An externally generated HCURSOR. We assume that it remains valid, i.e we |
167 // don't attempt to copy the HCURSOR. | 167 // don't attempt to copy the HCURSOR. |
168 HCURSOR external_cursor_; | 168 HCURSOR external_cursor_; |
169 #endif | 169 #endif |
170 | 170 |
171 #if defined(USE_AURA) && (defined(USE_X11) || defined(USE_OZONE)) | 171 #if defined(USE_AURA) && (defined(USE_X11) || defined(USE_OZONE)) |
172 // Only used for custom cursors. | 172 // Only used for custom cursors. |
173 ui::PlatformCursor platform_cursor_; | 173 ui::PlatformCursor platform_cursor_; |
174 float device_scale_factor_; | 174 float device_scale_factor_; |
175 gfx::Display::Rotation rotation_; | |
176 #elif defined(OS_WIN) | 175 #elif defined(OS_WIN) |
177 // A custom cursor created from custom bitmap data by Webkit. | 176 // A custom cursor created from custom bitmap data by Webkit. |
178 HCURSOR custom_cursor_; | 177 HCURSOR custom_cursor_; |
179 #endif | 178 #endif |
| 179 |
| 180 #if defined(USE_OZONE) |
| 181 gfx::Display::Rotation rotation_; |
| 182 #endif |
180 }; | 183 }; |
181 | 184 |
182 } // namespace content | 185 } // namespace content |
183 | 186 |
184 #endif // CONTENT_COMMON_CURSORS_WEBCURSOR_H_ | 187 #endif // CONTENT_COMMON_CURSORS_WEBCURSOR_H_ |
OLD | NEW |