Changeset 79942 in webkit

Timestamp:

Feb 28, 2011 4:51:45 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-02-28 Avi Drissman <​avi@google.com>

Reviewed by James Robinson.

WebCursorInfo needs to match enums in platform/Cursor.h
​https://bugs.webkit.org/show_bug.cgi?id=55094

• platform/chromium/CursorChromium.cpp: (WebCore::grabCursor): (WebCore::grabbingCursor):
• platform/chromium/PlatformCursor.h:

2011-02-28 Avi Drissman <​avi@google.com>

Reviewed by James Robinson.

WebCursorInfo needs to match enums in platform/Cursor.h
​https://bugs.webkit.org/show_bug.cgi?id=55094

• public/WebCursorInfo.h:
• src/AssertMatchingEnums.cpp:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/chromium/CursorChromium.cpp (modified) (2 diffs)
• WebCore/platform/chromium/PlatformCursor.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebCursorInfo.h (modified) (1 diff)
• WebKit/chromium/src/AssertMatchingEnums.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-28  Avi Drissman  <avi@google.com>
+
+        Reviewed by James Robinson.
+
+        WebCursorInfo needs to match enums in platform/Cursor.h
+        https://bugs.webkit.org/show_bug.cgi?id=55094
+
+        * platform/chromium/CursorChromium.cpp:
+        (WebCore::grabCursor):
+        (WebCore::grabbingCursor):
+        * platform/chromium/PlatformCursor.h:
+
 2011-02-28  Jia Pu  <jpu@apple.com>
 

trunk/Source/WebCore/platform/chromium/CursorChromium.cpp

@@ -32 +32 @@
 #include "Cursor.h"
 
+#include <wtf/Assertions.h>
+
 namespace WebCore {
 
@@ -307 +309 @@
 const Cursor& grabCursor()
 {
-    return pointerCursor();
+    static const Cursor c(PlatformCursor::TypeGrab);
+    return c;
 }
 
 const Cursor& grabbingCursor()
 {
-    return pointerCursor();
+    static const Cursor c(PlatformCursor::TypeGrabbing);
+    return c;
 }
 
 } // namespace WebCore
+
+#define COMPILE_ASSERT_MATCHING_ENUM(cursor_name, platform_cursor_name) \
+    COMPILE_ASSERT(int(WebCore::Cursor::cursor_name) == int(WebCore::PlatformCursor::platform_cursor_name), mismatching_enums)
+
+COMPILE_ASSERT_MATCHING_ENUM(Pointer, TypePointer);
+COMPILE_ASSERT_MATCHING_ENUM(Cross, TypeCross);
+COMPILE_ASSERT_MATCHING_ENUM(Hand, TypeHand);
+COMPILE_ASSERT_MATCHING_ENUM(IBeam, TypeIBeam);
+COMPILE_ASSERT_MATCHING_ENUM(Wait, TypeWait);
+COMPILE_ASSERT_MATCHING_ENUM(Help, TypeHelp);
+COMPILE_ASSERT_MATCHING_ENUM(EastResize, TypeEastResize);
+COMPILE_ASSERT_MATCHING_ENUM(NorthResize, TypeNorthResize);
+COMPILE_ASSERT_MATCHING_ENUM(NorthEastResize, TypeNorthEastResize);
+COMPILE_ASSERT_MATCHING_ENUM(NorthWestResize, TypeNorthWestResize);
+COMPILE_ASSERT_MATCHING_ENUM(SouthResize, TypeSouthResize);
+COMPILE_ASSERT_MATCHING_ENUM(SouthEastResize, TypeSouthEastResize);
+COMPILE_ASSERT_MATCHING_ENUM(SouthWestResize, TypeSouthWestResize);
+COMPILE_ASSERT_MATCHING_ENUM(WestResize, TypeWestResize);
+COMPILE_ASSERT_MATCHING_ENUM(NorthSouthResize, TypeNorthSouthResize);
+COMPILE_ASSERT_MATCHING_ENUM(EastWestResize, TypeEastWestResize);
+COMPILE_ASSERT_MATCHING_ENUM(NorthEastSouthWestResize, TypeNorthEastSouthWestResize);
+COMPILE_ASSERT_MATCHING_ENUM(NorthWestSouthEastResize, TypeNorthWestSouthEastResize);
+COMPILE_ASSERT_MATCHING_ENUM(ColumnResize, TypeColumnResize);
+COMPILE_ASSERT_MATCHING_ENUM(RowResize, TypeRowResize);
+COMPILE_ASSERT_MATCHING_ENUM(MiddlePanning, TypeMiddlePanning);
+COMPILE_ASSERT_MATCHING_ENUM(EastPanning, TypeEastPanning);
+COMPILE_ASSERT_MATCHING_ENUM(NorthPanning, TypeNorthPanning);
+COMPILE_ASSERT_MATCHING_ENUM(NorthEastPanning, TypeNorthEastPanning);
+COMPILE_ASSERT_MATCHING_ENUM(NorthWestPanning, TypeNorthWestPanning);
+COMPILE_ASSERT_MATCHING_ENUM(SouthPanning, TypeSouthPanning);
+COMPILE_ASSERT_MATCHING_ENUM(SouthEastPanning, TypeSouthEastPanning);
+COMPILE_ASSERT_MATCHING_ENUM(SouthWestPanning, TypeSouthWestPanning);
+COMPILE_ASSERT_MATCHING_ENUM(WestPanning, TypeWestPanning);
+COMPILE_ASSERT_MATCHING_ENUM(Move, TypeMove);
+COMPILE_ASSERT_MATCHING_ENUM(VerticalText, TypeVerticalText);
+COMPILE_ASSERT_MATCHING_ENUM(Cell, TypeCell);
+COMPILE_ASSERT_MATCHING_ENUM(ContextMenu, TypeContextMenu);
+COMPILE_ASSERT_MATCHING_ENUM(Alias, TypeAlias);
+COMPILE_ASSERT_MATCHING_ENUM(Progress, TypeProgress);
+COMPILE_ASSERT_MATCHING_ENUM(NoDrop, TypeNoDrop);
+COMPILE_ASSERT_MATCHING_ENUM(Copy, TypeCopy);
+COMPILE_ASSERT_MATCHING_ENUM(None, TypeNone);
+COMPILE_ASSERT_MATCHING_ENUM(NotAllowed, TypeNotAllowed);
+COMPILE_ASSERT_MATCHING_ENUM(ZoomIn, TypeZoomIn);
+COMPILE_ASSERT_MATCHING_ENUM(ZoomOut, TypeZoomOut);
+COMPILE_ASSERT_MATCHING_ENUM(Grab, TypeGrab);
+COMPILE_ASSERT_MATCHING_ENUM(Grabbing, TypeGrabbing);
+COMPILE_ASSERT_MATCHING_ENUM(Custom, TypeCustom);

trunk/Source/WebCore/platform/chromium/PlatformCursor.h

@@ -82 +82 @@
             TypeZoomIn,
             TypeZoomOut,
+            TypeGrab,
+            TypeGrabbing,
             TypeCustom
         };

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-02-28  Avi Drissman  <avi@google.com>
+
+        Reviewed by James Robinson.
+
+        WebCursorInfo needs to match enums in platform/Cursor.h
+        https://bugs.webkit.org/show_bug.cgi?id=55094
+
+        * public/WebCursorInfo.h:
+        * src/AssertMatchingEnums.cpp:
+
 2011-02-28  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/chromium/public/WebCursorInfo.h

@@ -89 +89 @@
         TypeZoomIn,
         TypeZoomOut,
+        TypeGrab,
+        TypeGrabbing,
         TypeCustom
     };

trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp

@@ -259 +259 @@
 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeZoomIn, PlatformCursor::TypeZoomIn);
 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeZoomOut, PlatformCursor::TypeZoomOut);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeGrab, PlatformCursor::TypeGrab);
+COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeGrabbing, PlatformCursor::TypeGrabbing);
 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCustom, PlatformCursor::TypeCustom);