Unify TouchAction classes

third_party/WebKit/public/web/WebWidgetClient.h

 /*
  * Copyright (C) 2009 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
@@ skipping 14 matching lines @@
  * 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 WebWidgetClient_h
 #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"
 #include "public/platform/WebPoint.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebReferrerPolicy.h"
 #include "public/platform/WebScreenInfo.h"
 #include "public/web/WebMeaningfulLayout.h"
 #include "public/web/WebTextDirection.h"
-#include "public/web/WebTouchAction.h"
 
 namespace blink {
 
 class WebDragData;
 class WebGestureEvent;
 class WebImage;
 class WebNode;
 class WebString;
 class WebWidget;
 struct WebCursorInfo;
@@ skipping 77 matching lines @@
   virtual void DidOverscroll(const WebFloatSize& overscroll_delta,
                              const WebFloatSize& accumulated_overscroll,
                              const WebFloatPoint& position_in_viewport,
                              const WebFloatSize& velocity_in_viewport) {}
 
   // Called to update if touch events should be sent.
   virtual void HasTouchEventHandlers(bool) {}
 
   // 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() {}
 
   // Request that the browser show a UI for an unhandled tap, if needed.
   // Invoked during the handling of a GestureTap input event whenever the
   // event is not consumed.
   // |tappedPosition| is the point where the mouseDown occurred in client
   // coordinates.
   // |tappedNode| is the node that the mouseDown event hit, provided so the
@@ skipping 26 matching lines @@
   virtual void StartDragging(WebReferrerPolicy,
                              const WebDragData&,
                              WebDragOperationsMask,
                              const WebImage& drag_image,
                              const WebPoint& drag_image_offset) {}
 };
 
 }  // namespace blink
 
 #endif