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

Unified Diff: third_party/WebKit/public/web/WebTouchAction.h

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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/public/web/WebTouchAction.h
diff --git a/third_party/WebKit/public/web/WebTouchAction.h b/third_party/WebKit/public/web/WebTouchAction.h
deleted file mode 100644
index 8a65522337cca33110854bcea8ea1464b3b7810d..0000000000000000000000000000000000000000
--- a/third_party/WebKit/public/web/WebTouchAction.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebTouchAction_h
-#define WebTouchAction_h
-
-namespace blink {
-
-// Flags for permitted touch actions, specified in
-// http://w3c.github.io/pointerevents/#the-touch-action-css-property.
-enum WebTouchAction {
- kWebTouchActionNone = 0x0,
- kWebTouchActionPanLeft = 0x1,
- kWebTouchActionPanRight = 0x2,
- kWebTouchActionPanX = kWebTouchActionPanLeft | kWebTouchActionPanRight,
- kWebTouchActionPanUp = 0x4,
- kWebTouchActionPanDown = 0x8,
- kWebTouchActionPanY = kWebTouchActionPanUp | kWebTouchActionPanDown,
- kWebTouchActionPan = kWebTouchActionPanX | kWebTouchActionPanY,
- kWebTouchActionPinchZoom = 0x10,
- kWebTouchActionManipulation = kWebTouchActionPan | kWebTouchActionPinchZoom,
- kWebTouchActionDoubleTapZoom = 0x20,
- kWebTouchActionAuto =
- kWebTouchActionManipulation | kWebTouchActionDoubleTapZoom
-};
-inline WebTouchAction operator|(WebTouchAction a, WebTouchAction b) {
- return static_cast<WebTouchAction>(int(a) | int(b));
-}
-inline WebTouchAction& operator|=(WebTouchAction& a, WebTouchAction b) {
- return a = a | b;
-}
-inline WebTouchAction operator&(WebTouchAction a, WebTouchAction b) {
- return static_cast<WebTouchAction>(int(a) & int(b));
-}
-inline WebTouchAction& operator&=(WebTouchAction& a, WebTouchAction b) {
- return a = a & b;
-}
-
-} // namespace blink
-
-#endif
« no previous file with comments | « third_party/WebKit/public/platform/WebTouchAction.h ('k') | third_party/WebKit/public/web/WebWidgetClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698