Unify TouchAction classes

third_party/WebKit/public/web/WebWidgetClient.h

Index: third_party/WebKit/public/web/WebWidgetClient.h
diff --git a/third_party/WebKit/public/web/WebWidgetClient.h b/third_party/WebKit/public/web/WebWidgetClient.h
index 28e941f779010dffac88bed10d1ee6acfe6e69e6..e490631eccc098d6aa467bed90fdf55b2f80c404 100644
--- a/third_party/WebKit/public/web/WebWidgetClient.h
+++ b/third_party/WebKit/public/web/WebWidgetClient.h
@@ -32,6 +32,9 @@
 #define WebWidgetClient_h
 
 #include "WebNavigationPolicy.h"
+#if BLINK_IMPLEMENTATION
+#include "platform/graphics/TouchAction.h"
+#endif
 #include "public/platform/WebCommon.h"
 #include "public/platform/WebDragOperation.h"
 #include "public/platform/WebLayerTreeView.h"
@@ -41,7 +44,6 @@
 #include "public/platform/WebScreenInfo.h"
 #include "public/web/WebMeaningfulLayout.h"
 #include "public/web/WebTextDirection.h"
-#include "public/web/WebTouchAction.h"
 
 namespace blink {
 
@@ -139,7 +141,9 @@ class WebWidgetClient {
 
   // Called during WebWidget::HandleInputEvent for a TouchStart event to inform
   // the embedder of the touch actions that are permitted for this touch.
-  virtual void SetTouchAction(WebTouchAction touch_action) {}
+#if BLINK_IMPLEMENTATION
+  virtual void SetTouchAction(blink::TouchAction touch_action) {}

[xidachen, 2017/05/05 15:17:52]

wkorman@, pdr@: I am getting close. Just one last bit here. Right now this patch
has a blink::TouchAction directly using the cc::TouchAction. This particular
function is over-written in content/, and content/ is only allowed to use cc/,
or "third_party/WebKit/public". So to make it work, it looks like we need to
create a WebTouchAction under public/web/ and make WebTouchAction directly using
blink::TouchAction. Does that make sense?

[wkorman, 2017/05/05 20:25:47]

I think I agree with you, with my (our?) newfound insight from email thread with
haraken@ on the current and future purpose of public/web and your exploration
here.

Let's make sure we add a comment to the WebTouchAction class noting this info.
Also, from rereading haraken@ email, it sounds like in short term public/web is
going away and in that situation WebTouchAction would instead be in public/core
or public/platform. I am not sure whether we can actually just place it there
now, perhaps you could try and see.

+#endif
 
   // Request the browser to show virtual keyboard for current input type.
   virtual void ShowVirtualKeyboardOnElementFocus() {}