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

Unified Diff: public/web/WebTouchAction.h

Issue 87973002: add pan-x and pan-y support to CSS touch-action parsing. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: incorporated review comments and merge to trunk Created 7 years 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
« no previous file with comments | « Source/web/AssertMatchingEnums.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: public/web/WebTouchAction.h
diff --git a/public/web/WebTouchAction.h b/public/web/WebTouchAction.h
old mode 100644
new mode 100755
index 4a07de2e747d3323ec7d980658523c37ef407814..0c793d0916bfe4a38137d2980324078831b5d53a
--- a/public/web/WebTouchAction.h
+++ b/public/web/WebTouchAction.h
@@ -35,9 +35,16 @@ namespace blink {
// Flags for permitted touch actions, specified in http://www.w3.org/TR/pointerevents/#the-touch-action-css-property.
enum WebTouchAction {
- WebTouchActionNone = 0,
- WebTouchActionAuto
+ WebTouchActionAuto = 0x0,
+ WebTouchActionNone = 0x1,
+ WebTouchActionPanX = 0x2,
+ WebTouchActionPanY = 0x4
};
+inline WebTouchAction operator| (WebTouchAction a, WebTouchAction b) { return WebTouchAction(int(a) | int(b)); }
+inline WebTouchAction& operator|= (WebTouchAction& a, WebTouchAction b) { return a = a | b; }
+inline WebTouchAction operator& (WebTouchAction a, WebTouchAction b) { return WebTouchAction(int(a) & int(b)); }
+inline WebTouchAction& operator&= (WebTouchAction& a, WebTouchAction b) { return a = a & b; }
+
} // namespace blink
« no previous file with comments | « Source/web/AssertMatchingEnums.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698