| Index: third_party/WebKit/Source/web/WebViewImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
|
| index 2f0f1ee5977609d27bd958be8c212cb2fcec4fb9..83e5cac1368ef601fb8d5dc21e39ac60ba7377dd 100644
|
| --- a/third_party/WebKit/Source/web/WebViewImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
|
| @@ -232,16 +232,17 @@ static Vector<OwnPtr<ScopedPageLoadDeferrer>>& pageLoadDeferrerStack()
|
|
|
| // Ensure that the WebDragOperation enum values stay in sync with the original
|
| // DragOperation constants.
|
| -#define STATIC_ASSERT_MATCHING_ENUM(coreName) \
|
| - static_assert(int(coreName) == int(Web##coreName), "DragOperation and WebDragOperation enum mismatch: " #coreName)
|
| -STATIC_ASSERT_MATCHING_ENUM(DragOperationNone);
|
| -STATIC_ASSERT_MATCHING_ENUM(DragOperationCopy);
|
| -STATIC_ASSERT_MATCHING_ENUM(DragOperationLink);
|
| -STATIC_ASSERT_MATCHING_ENUM(DragOperationGeneric);
|
| -STATIC_ASSERT_MATCHING_ENUM(DragOperationPrivate);
|
| -STATIC_ASSERT_MATCHING_ENUM(DragOperationMove);
|
| -STATIC_ASSERT_MATCHING_ENUM(DragOperationDelete);
|
| -STATIC_ASSERT_MATCHING_ENUM(DragOperationEvery);
|
| +#define STATIC_ASSERT_ENUM(a, b) \
|
| + static_assert(static_cast<int>(a) == static_cast<int>(b), \
|
| + "mismatching enum : " #a)
|
| +STATIC_ASSERT_ENUM(DragOperationNone, WebDragOperationNone);
|
| +STATIC_ASSERT_ENUM(DragOperationCopy, WebDragOperationCopy);
|
| +STATIC_ASSERT_ENUM(DragOperationLink, WebDragOperationLink);
|
| +STATIC_ASSERT_ENUM(DragOperationGeneric, WebDragOperationGeneric);
|
| +STATIC_ASSERT_ENUM(DragOperationPrivate, WebDragOperationPrivate);
|
| +STATIC_ASSERT_ENUM(DragOperationMove, WebDragOperationMove);
|
| +STATIC_ASSERT_ENUM(DragOperationDelete, WebDragOperationDelete);
|
| +STATIC_ASSERT_ENUM(DragOperationEvery, WebDragOperationEvery);
|
|
|
| static bool shouldUseExternalPopupMenus = false;
|
|
|
|
|