| Index: webkit/api/src/WebCursorInfo.cpp
|
| ===================================================================
|
| --- webkit/api/src/WebCursorInfo.cpp (revision 25491)
|
| +++ webkit/api/src/WebCursorInfo.cpp (working copy)
|
| @@ -32,60 +32,11 @@
|
| #include "WebCursorInfo.h"
|
|
|
| #include "Cursor.h"
|
| -#include <wtf/Assertions.h>
|
|
|
| using namespace WebCore;
|
|
|
| namespace WebKit {
|
|
|
| -// Ensure that our publicly defined enum values never get out of sync with the
|
| -// ones declared for use within WebCore.
|
| -#define COMPILE_ASSERT_MATCHING_ENUM(name) \
|
| - COMPILE_ASSERT(int(WebCursorInfo::name) == int(PlatformCursor::name), name)
|
| -
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypePointer);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeCross);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeHand);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeIBeam);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeWait);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeHelp);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeEastResize);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeNorthResize);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeNorthEastResize);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeNorthWestResize);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeSouthResize);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeSouthEastResize);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeSouthWestResize);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeWestResize);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeNorthSouthResize);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeEastWestResize);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeNorthEastSouthWestResize);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeNorthWestSouthEastResize);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeColumnResize);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeRowResize);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeMiddlePanning);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeEastPanning);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeNorthPanning);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeNorthEastPanning);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeNorthWestPanning);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeSouthPanning);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeSouthEastPanning);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeSouthWestPanning);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeWestPanning);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeMove);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeVerticalText);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeCell);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeContextMenu);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeAlias);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeProgress);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeNoDrop);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeCopy);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeNone);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeNotAllowed);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeZoomIn);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeZoomOut);
|
| -COMPILE_ASSERT_MATCHING_ENUM(TypeCustom);
|
| -
|
| WebCursorInfo::WebCursorInfo(const Cursor& cursor)
|
| {
|
| type = static_cast<Type>(cursor.impl().type());
|
|
|