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

Side by Side Diff: third_party/WebKit/Source/web/AssertMatchingEnums.cpp

Issue 2863693003: Unify TouchAction classes (Closed)
Patch Set: add cstdlib Created 3 years, 7 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 #include "public/web/WebNavigatorContentUtilsClient.h" 127 #include "public/web/WebNavigatorContentUtilsClient.h"
128 #include "public/web/WebRemoteFrameClient.h" 128 #include "public/web/WebRemoteFrameClient.h"
129 #include "public/web/WebSandboxFlags.h" 129 #include "public/web/WebSandboxFlags.h"
130 #include "public/web/WebSecurityPolicy.h" 130 #include "public/web/WebSecurityPolicy.h"
131 #include "public/web/WebSelection.h" 131 #include "public/web/WebSelection.h"
132 #include "public/web/WebSerializedScriptValueVersion.h" 132 #include "public/web/WebSerializedScriptValueVersion.h"
133 #include "public/web/WebSettings.h" 133 #include "public/web/WebSettings.h"
134 #include "public/web/WebSpeechRecognizerClient.h" 134 #include "public/web/WebSpeechRecognizerClient.h"
135 #include "public/web/WebTextCheckingResult.h" 135 #include "public/web/WebTextCheckingResult.h"
136 #include "public/web/WebTextDecorationType.h" 136 #include "public/web/WebTextDecorationType.h"
137 #include "public/web/WebTouchAction.h"
138 #include "public/web/WebView.h" 137 #include "public/web/WebView.h"
139 138
140 namespace blink { 139 namespace blink {
141 140
142 #define STATIC_ASSERT_ENUM(a, b) \ 141 #define STATIC_ASSERT_ENUM(a, b) \
143 static_assert(static_cast<int>(a) == static_cast<int>(b), \ 142 static_assert(static_cast<int>(a) == static_cast<int>(b), \
144 "mismatching enum: " #a) 143 "mismatching enum: " #a)
145 144
146 STATIC_ASSERT_ENUM(kWebAXEventActiveDescendantChanged, 145 STATIC_ASSERT_ENUM(kWebAXEventActiveDescendantChanged,
147 AXObjectCache::kAXActiveDescendantChanged); 146 AXObjectCache::kAXActiveDescendantChanged);
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 STATIC_ASSERT_ENUM(WebConsoleMessage::kLevelWarning, kWarningMessageLevel); 789 STATIC_ASSERT_ENUM(WebConsoleMessage::kLevelWarning, kWarningMessageLevel);
791 STATIC_ASSERT_ENUM(WebConsoleMessage::kLevelError, kErrorMessageLevel); 790 STATIC_ASSERT_ENUM(WebConsoleMessage::kLevelError, kErrorMessageLevel);
792 791
793 STATIC_ASSERT_ENUM(kWebCustomHandlersNew, 792 STATIC_ASSERT_ENUM(kWebCustomHandlersNew,
794 NavigatorContentUtilsClient::kCustomHandlersNew); 793 NavigatorContentUtilsClient::kCustomHandlersNew);
795 STATIC_ASSERT_ENUM(kWebCustomHandlersRegistered, 794 STATIC_ASSERT_ENUM(kWebCustomHandlersRegistered,
796 NavigatorContentUtilsClient::kCustomHandlersRegistered); 795 NavigatorContentUtilsClient::kCustomHandlersRegistered);
797 STATIC_ASSERT_ENUM(kWebCustomHandlersDeclined, 796 STATIC_ASSERT_ENUM(kWebCustomHandlersDeclined,
798 NavigatorContentUtilsClient::kCustomHandlersDeclined); 797 NavigatorContentUtilsClient::kCustomHandlersDeclined);
799 798
800 STATIC_ASSERT_ENUM(kWebTouchActionNone, kTouchActionNone);
801 STATIC_ASSERT_ENUM(kWebTouchActionPanLeft, kTouchActionPanLeft);
802 STATIC_ASSERT_ENUM(kWebTouchActionPanRight, kTouchActionPanRight);
803 STATIC_ASSERT_ENUM(kWebTouchActionPanX, kTouchActionPanX);
804 STATIC_ASSERT_ENUM(kWebTouchActionPanUp, kTouchActionPanUp);
805 STATIC_ASSERT_ENUM(kWebTouchActionPanDown, kTouchActionPanDown);
806 STATIC_ASSERT_ENUM(kWebTouchActionPanY, kTouchActionPanY);
807 STATIC_ASSERT_ENUM(kWebTouchActionPan, kTouchActionPan);
808 STATIC_ASSERT_ENUM(kWebTouchActionPinchZoom, kTouchActionPinchZoom);
809 STATIC_ASSERT_ENUM(kWebTouchActionManipulation, kTouchActionManipulation);
810 STATIC_ASSERT_ENUM(kWebTouchActionDoubleTapZoom, kTouchActionDoubleTapZoom);
811 STATIC_ASSERT_ENUM(kWebTouchActionAuto, kTouchActionAuto);
812
813 STATIC_ASSERT_ENUM(WebSelection::kNoSelection, kNoSelection); 799 STATIC_ASSERT_ENUM(WebSelection::kNoSelection, kNoSelection);
814 STATIC_ASSERT_ENUM(WebSelection::kCaretSelection, kCaretSelection); 800 STATIC_ASSERT_ENUM(WebSelection::kCaretSelection, kCaretSelection);
815 STATIC_ASSERT_ENUM(WebSelection::kRangeSelection, kRangeSelection); 801 STATIC_ASSERT_ENUM(WebSelection::kRangeSelection, kRangeSelection);
816 802
817 STATIC_ASSERT_ENUM(WebSettings::kImageAnimationPolicyAllowed, 803 STATIC_ASSERT_ENUM(WebSettings::kImageAnimationPolicyAllowed,
818 kImageAnimationPolicyAllowed); 804 kImageAnimationPolicyAllowed);
819 STATIC_ASSERT_ENUM(WebSettings::kImageAnimationPolicyAnimateOnce, 805 STATIC_ASSERT_ENUM(WebSettings::kImageAnimationPolicyAnimateOnce,
820 kImageAnimationPolicyAnimateOnce); 806 kImageAnimationPolicyAnimateOnce);
821 STATIC_ASSERT_ENUM(WebSettings::kImageAnimationPolicyNoAnimation, 807 STATIC_ASSERT_ENUM(WebSettings::kImageAnimationPolicyNoAnimation,
822 kImageAnimationPolicyNoAnimation); 808 kImageAnimationPolicyNoAnimation);
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 875
890 // This ensures that the version number published in 876 // This ensures that the version number published in
891 // WebSerializedScriptValueVersion.h matches the serializer's understanding. 877 // WebSerializedScriptValueVersion.h matches the serializer's understanding.
892 // TODO(jbroman): Fix this to also account for the V8-side version. See 878 // TODO(jbroman): Fix this to also account for the V8-side version. See
893 // https://crbug.com/704293. 879 // https://crbug.com/704293.
894 static_assert(kSerializedScriptValueVersion == 880 static_assert(kSerializedScriptValueVersion ==
895 SerializedScriptValue::kWireFormatVersion, 881 SerializedScriptValue::kWireFormatVersion,
896 "Update WebSerializedScriptValueVersion.h."); 882 "Update WebSerializedScriptValueVersion.h.");
897 883
898 } // namespace blink 884 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/graphics/TouchAction.h ('k') | third_party/WebKit/Source/web/ChromeClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698