Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1113)

Unified Diff: third_party/WebKit/Source/web/AssertMatchingEnums.cpp

Issue 1422513006: Simplify TouchAction enum to be a simple bit flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix computed style / layout tests and CR feedback Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/web/AssertMatchingEnums.cpp
diff --git a/third_party/WebKit/Source/web/AssertMatchingEnums.cpp b/third_party/WebKit/Source/web/AssertMatchingEnums.cpp
index 2519571c98dfa95d9b4ffc9e2573054328ee18ec..988bc1bcd5f20fe3ccd20d86dc4a927132470747 100644
--- a/third_party/WebKit/Source/web/AssertMatchingEnums.cpp
+++ b/third_party/WebKit/Source/web/AssertMatchingEnums.cpp
@@ -672,14 +672,17 @@ STATIC_ASSERT_MATCHING_ENUM(WebCustomHandlersRegistered, NavigatorContentUtilsCl
STATIC_ASSERT_MATCHING_ENUM(WebCustomHandlersDeclined, NavigatorContentUtilsClient::CustomHandlersDeclined);
STATIC_ASSERT_MATCHING_ENUM(WebTouchActionNone, TouchActionNone);
-STATIC_ASSERT_MATCHING_ENUM(WebTouchActionAuto, TouchActionAuto);
STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanLeft, TouchActionPanLeft);
STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanRight, TouchActionPanRight);
STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanX, TouchActionPanX);
STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanUp, TouchActionPanUp);
STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanDown, TouchActionPanDown);
STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPanY, TouchActionPanY);
+STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPan, TouchActionPan);
STATIC_ASSERT_MATCHING_ENUM(WebTouchActionPinchZoom, TouchActionPinchZoom);
+STATIC_ASSERT_MATCHING_ENUM(WebTouchActionManipulation, TouchActionManipulation);
+STATIC_ASSERT_MATCHING_ENUM(WebTouchActionDoubleTapZoom, TouchActionDoubleTapZoom);
+STATIC_ASSERT_MATCHING_ENUM(WebTouchActionAuto, TouchActionAuto);
STATIC_ASSERT_MATCHING_ENUM(WebSelection::NoSelection, NoSelection);
STATIC_ASSERT_MATCHING_ENUM(WebSelection::CaretSelection, CaretSelection);
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyleConstants.h ('k') | third_party/WebKit/Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698