| OLD | NEW |
| 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 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 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 #include "config.h" | 31 #include "config.h" |
| 32 #include "WebCursorInfo.h" | 32 #include "WebCursorInfo.h" |
| 33 | 33 |
| 34 #include "Cursor.h" | 34 #include "Cursor.h" |
| 35 #include <wtf/Assertions.h> | |
| 36 | 35 |
| 37 using namespace WebCore; | 36 using namespace WebCore; |
| 38 | 37 |
| 39 namespace WebKit { | 38 namespace WebKit { |
| 40 | 39 |
| 41 // Ensure that our publicly defined enum values never get out of sync with the | |
| 42 // ones declared for use within WebCore. | |
| 43 #define COMPILE_ASSERT_MATCHING_ENUM(name) \ | |
| 44 COMPILE_ASSERT(int(WebCursorInfo::name) == int(PlatformCursor::name), name) | |
| 45 | |
| 46 COMPILE_ASSERT_MATCHING_ENUM(TypePointer); | |
| 47 COMPILE_ASSERT_MATCHING_ENUM(TypeCross); | |
| 48 COMPILE_ASSERT_MATCHING_ENUM(TypeHand); | |
| 49 COMPILE_ASSERT_MATCHING_ENUM(TypeIBeam); | |
| 50 COMPILE_ASSERT_MATCHING_ENUM(TypeWait); | |
| 51 COMPILE_ASSERT_MATCHING_ENUM(TypeHelp); | |
| 52 COMPILE_ASSERT_MATCHING_ENUM(TypeEastResize); | |
| 53 COMPILE_ASSERT_MATCHING_ENUM(TypeNorthResize); | |
| 54 COMPILE_ASSERT_MATCHING_ENUM(TypeNorthEastResize); | |
| 55 COMPILE_ASSERT_MATCHING_ENUM(TypeNorthWestResize); | |
| 56 COMPILE_ASSERT_MATCHING_ENUM(TypeSouthResize); | |
| 57 COMPILE_ASSERT_MATCHING_ENUM(TypeSouthEastResize); | |
| 58 COMPILE_ASSERT_MATCHING_ENUM(TypeSouthWestResize); | |
| 59 COMPILE_ASSERT_MATCHING_ENUM(TypeWestResize); | |
| 60 COMPILE_ASSERT_MATCHING_ENUM(TypeNorthSouthResize); | |
| 61 COMPILE_ASSERT_MATCHING_ENUM(TypeEastWestResize); | |
| 62 COMPILE_ASSERT_MATCHING_ENUM(TypeNorthEastSouthWestResize); | |
| 63 COMPILE_ASSERT_MATCHING_ENUM(TypeNorthWestSouthEastResize); | |
| 64 COMPILE_ASSERT_MATCHING_ENUM(TypeColumnResize); | |
| 65 COMPILE_ASSERT_MATCHING_ENUM(TypeRowResize); | |
| 66 COMPILE_ASSERT_MATCHING_ENUM(TypeMiddlePanning); | |
| 67 COMPILE_ASSERT_MATCHING_ENUM(TypeEastPanning); | |
| 68 COMPILE_ASSERT_MATCHING_ENUM(TypeNorthPanning); | |
| 69 COMPILE_ASSERT_MATCHING_ENUM(TypeNorthEastPanning); | |
| 70 COMPILE_ASSERT_MATCHING_ENUM(TypeNorthWestPanning); | |
| 71 COMPILE_ASSERT_MATCHING_ENUM(TypeSouthPanning); | |
| 72 COMPILE_ASSERT_MATCHING_ENUM(TypeSouthEastPanning); | |
| 73 COMPILE_ASSERT_MATCHING_ENUM(TypeSouthWestPanning); | |
| 74 COMPILE_ASSERT_MATCHING_ENUM(TypeWestPanning); | |
| 75 COMPILE_ASSERT_MATCHING_ENUM(TypeMove); | |
| 76 COMPILE_ASSERT_MATCHING_ENUM(TypeVerticalText); | |
| 77 COMPILE_ASSERT_MATCHING_ENUM(TypeCell); | |
| 78 COMPILE_ASSERT_MATCHING_ENUM(TypeContextMenu); | |
| 79 COMPILE_ASSERT_MATCHING_ENUM(TypeAlias); | |
| 80 COMPILE_ASSERT_MATCHING_ENUM(TypeProgress); | |
| 81 COMPILE_ASSERT_MATCHING_ENUM(TypeNoDrop); | |
| 82 COMPILE_ASSERT_MATCHING_ENUM(TypeCopy); | |
| 83 COMPILE_ASSERT_MATCHING_ENUM(TypeNone); | |
| 84 COMPILE_ASSERT_MATCHING_ENUM(TypeNotAllowed); | |
| 85 COMPILE_ASSERT_MATCHING_ENUM(TypeZoomIn); | |
| 86 COMPILE_ASSERT_MATCHING_ENUM(TypeZoomOut); | |
| 87 COMPILE_ASSERT_MATCHING_ENUM(TypeCustom); | |
| 88 | |
| 89 WebCursorInfo::WebCursorInfo(const Cursor& cursor) | 40 WebCursorInfo::WebCursorInfo(const Cursor& cursor) |
| 90 { | 41 { |
| 91 type = static_cast<Type>(cursor.impl().type()); | 42 type = static_cast<Type>(cursor.impl().type()); |
| 92 hotSpot = cursor.impl().hotSpot(); | 43 hotSpot = cursor.impl().hotSpot(); |
| 93 customImage = cursor.impl().customImage(); | 44 customImage = cursor.impl().customImage(); |
| 94 #ifdef WIN32 | 45 #ifdef WIN32 |
| 95 externalHandle = 0; | 46 externalHandle = 0; |
| 96 #endif | 47 #endif |
| 97 } | 48 } |
| 98 | 49 |
| 99 } // namespace WebKit | 50 } // namespace WebKit |
| OLD | NEW |