Unify TouchAction classes

third_party/WebKit/public/web/WebTouchAction.h

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
index 8a65522337cca33110854bcea8ea1464b3b7810d..221a2c14af0364c6378d92b09a7c900d3c80c464 100644
--- a/third_party/WebKit/public/web/WebTouchAction.h
+++ b/third_party/WebKit/public/web/WebTouchAction.h
@@ -1,68 +1,20 @@
-/*
- * 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.
- */
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 
 #ifndef WebTouchAction_h
 #define WebTouchAction_h
 
+#if BLINK_IMPLEMENTATION
+#include "platform/graphics/TouchAction.h"

[wkorman, 2017/05/05 20:39:15]

What if we move WebTouchAction to public/platform? I see code in public/platform
referencing platform/graphics in #includes already, for example,
WebImageLayer.h.

[wkorman, 2017/05/05 20:40:52]

Well, that class actually is doing:

#if INSIDE_BLINK
#include "platform/graphics/paint/PaintImage.h"
#else
#include "cc/paint/paint_image.h"
using PaintImage = cc::PaintImage;
#endif

but perhaps we could do similar, and reference cc's TouchAction when not
INSIDE_BLINK.

[xidachen, 2017/05/05 20:41:47]

I think that should work. Let me give it a try. Thanks.

+#endif
+
 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;
-}
+#if BLINK_IMPLEMENTATION
+using WebTouchAction = blink::TouchAction;
+#endif
 
 }  // namespace blink
 
-#endif
+#endif  // WebTouchAction_h