Unify TouchAction classes

third_party/WebKit/public/platform/WebTouchAction.h

Index: third_party/WebKit/public/platform/WebTouchAction.h
diff --git a/third_party/WebKit/public/platform/WebTouchAction.h b/third_party/WebKit/public/platform/WebTouchAction.h
new file mode 100644
index 0000000000000000000000000000000000000000..ce855a0a86e0981bfc9f7b65b7b900b0f077146b
--- /dev/null
+++ b/third_party/WebKit/public/platform/WebTouchAction.h
@@ -0,0 +1,27 @@
+// 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"
+#else
+#include "cc/input/touch_action.h"
+#endif
+
+namespace blink {
+
+// The only reason of creating a WebTouchAction is that there is a virtual
+// function under WebWidgetClient that is overridden by classes under content/
+// and WebKit/.
+#if BLINK_IMPLEMENTATION

[jbroman, 2017/05/09 14:40:26]

Just unconditionally use the cc one. We already do this in a handful of other
public/platform headers. This looks very much like an ODR violation, and is
rather confusing.

An alias here is certainly OK. I might make the case that we might as well just
call it cc::TouchAction in WebWidgetClient.h, but so far we only do that in
public/platform/.

+using WebTouchAction = blink::TouchAction;
+#else
+using WebTouchAction = cc::TouchAction;
+#endif
+
+}  // namespace blink
+
+#endif  // WebTouchAction_h