Add hittest mode for Touch-action which ignore inline elements and svg elements

Intoducing new HitTestRequest::TouchAction hit test type, which will be used
in Special hit testing for computing effective touch-action in eventhandler.

BUG=247396, 319479

Review URL: https://codereview.chromium.org/137123009

git-svn-id: svn://svn.chromium.org/blink/trunk@168443 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/page/EventHandler.cpp

@@ -3678,8 +3678,7 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
             m_originatingTouchPointTargets.set(touchPointTargetKey, node);
             touchTarget = node;
 
-            // FIXME(rbyers): Should really be doing a second hit test that ignores inline elements - crbug.com/319479.
-            TouchAction effectiveTouchAction = computeEffectiveTouchAction(*node);
+            TouchAction effectiveTouchAction = computeEffectiveTouchAction(pagePoint);
             if (effectiveTouchAction != TouchActionAuto)
                 m_frame->page()->chrome().client().setTouchAction(effectiveTouchAction);
 
@@ -3912,19 +3911,24 @@ TouchAction EventHandler::intersectTouchAction(TouchAction action1, TouchAction
     return action1 & action2;
 }
 
-TouchAction EventHandler::computeEffectiveTouchAction(const Node& node)
+TouchAction EventHandler::computeEffectiveTouchAction(const LayoutPoint& point)
 {
     // Optimization to minimize risk of this new feature (behavior should be identical
     // since there's no way to get non-default touch-action values).
     if (!RuntimeEnabledFeatures::cssTouchActionEnabled())
         return TouchActionAuto;
 
+    HitTestResult taResult = hitTestResultAtPoint(point, HitTestRequest::TouchEvent | HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::TouchAction);
+    Node* node = taResult.innerNode();
+    if (!node)
+        return TouchActionAuto;
+
     // Start by permitting all actions, then walk the block level elements from
     // the target node up to the nearest scrollable ancestor and exclude any
     // prohibited actions. For now this is trivial, but when we add more types
     // of actions it'll get a little more complex.
     TouchAction effectiveTouchAction = TouchActionAuto;
-    for (const Node* curNode = &node; curNode; curNode = NodeRenderingTraversal::parent(curNode)) {
+    for (const Node* curNode = node; curNode; curNode = NodeRenderingTraversal::parent(curNode)) {
         // The spec says only block and SVG elements get touch-action.
         // FIXME(rbyers): Add correct support for SVG, crbug.com/247396.
         if (RenderObject* renderer = curNode->renderer()) {

third_party/WebKit/Source/core/page/EventHandler.h

@@ -245,7 +245,7 @@ private:
     bool dispatchSyntheticTouchEventIfEnabled(const PlatformMouseEvent&);
 
     TouchAction intersectTouchAction(const TouchAction, const TouchAction);
-    TouchAction computeEffectiveTouchAction(const Node&);
+    TouchAction computeEffectiveTouchAction(const LayoutPoint&);
 
     bool handleMouseEventAsEmulatedGesture(const PlatformMouseEvent&);
     bool handleWheelEventAsEmulatedGesture(const PlatformWheelEvent&);

third_party/WebKit/Source/core/rendering/HitTestRequest.h

@@ -40,7 +40,8 @@ public:
         AllowFrameScrollbars = 1 << 9,
         AllowChildFrameContent = 1 << 10,
         ChildFrameHitTest = 1 << 11,
-        IgnorePointerEventsNone = 1 << 12
+        IgnorePointerEventsNone = 1 << 12,
+        TouchAction = 1 << 13, // Hit testing for touch-action considers only block-level elements
     };
 
     typedef unsigned HitTestRequestType;
@@ -63,6 +64,7 @@ public:
     bool allowsChildFrameContent() const { return m_requestType & AllowChildFrameContent; }
     bool isChildFrameHitTest() const { return m_requestType & ChildFrameHitTest; }
     bool ignorePointerEventsNone() const { return m_requestType & IgnorePointerEventsNone; }
+    bool touchAction() const { return m_requestType & TouchAction; }
 
     // Convenience functions
     bool touchMove() const { return move() && touchEvent(); }

third_party/WebKit/Source/core/rendering/InlineBox.h

@@ -271,7 +271,13 @@ public:
 
     int expansion() const { return m_bitfields.expansion(); }
 
-    bool visibleToHitTestRequest(const HitTestRequest& request) const { return renderer().visibleToHitTestRequest(request); }
+    bool visibleForTouchAction() const { return false; }
+    bool visibleToHitTestRequest(const HitTestRequest& request) const
+    {
+        if (request.touchAction() && !visibleForTouchAction())
+            return false;
+        return renderer().visibleToHitTestRequest(request);
+    }
 
     EVerticalAlign verticalAlign() const { return renderer().style(m_bitfields.firstLine())->verticalAlign(); }
 

third_party/WebKit/Source/core/rendering/RenderBlock.h

@@ -116,6 +116,8 @@ public:
         return objects && !objects->isEmpty();
     }
 
+    virtual bool visibleForTouchAction() const OVERRIDE FINAL { return true; }
+
     void addPercentHeightDescendant(RenderBox*);
     static void removePercentHeightDescendant(RenderBox*);
     TrackedRendererListHashSet* percentHeightDescendants() const;

third_party/WebKit/Source/core/rendering/RenderObject.h

@@ -929,7 +929,14 @@ public:
     void remove() { if (parent()) parent()->removeChild(this); }
 
     bool isInert() const;
-    bool visibleToHitTestRequest(const HitTestRequest& request) const { return style()->visibility() == VISIBLE && (request.ignorePointerEventsNone() || style()->pointerEvents() != PE_NONE) && !isInert(); }
+    virtual bool visibleForTouchAction() const { return false; }
+    bool visibleToHitTestRequest(const HitTestRequest& request) const
+    {
+        if (request.touchAction() && !visibleForTouchAction())
+            return false;
+        return style()->visibility() == VISIBLE && (request.ignorePointerEventsNone() || style()->pointerEvents() != PE_NONE) && !isInert();
+    }
+
     bool visibleToHitTesting() const { return style()->visibility() == VISIBLE && style()->pointerEvents() != PE_NONE && !isInert(); }
 
     // Map points and quads through elements, potentially via 3d transforms. You should never need to call these directly; use

third_party/WebKit/Source/core/rendering/svg/RenderSVGRoot.h

@@ -57,6 +57,7 @@ public:
 
     virtual bool hasRelativeIntrinsicLogicalWidth() const OVERRIDE;
     virtual bool hasRelativeLogicalHeight() const OVERRIDE;
+    virtual bool visibleForTouchAction() const OVERRIDE { return true; }
 
     // localToBorderBoxTransform maps local SVG viewport coordinates to local CSS box coordinates.
     const AffineTransform& localToBorderBoxTransform() const { return m_localToBorderBoxTransform; }

third_party/WebKit/Source/web/tests/TouchActionTest.cpp

@@ -169,7 +169,7 @@ WebView* TouchActionTest::setupTest(std::string file, TouchActionTrackingWebView
     WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + file, true, 0, &client);
 
     // Set size to enable hit testing, and avoid line wrapping for consistency with browser.
-    webView->resize(WebSize(700, 1000));
+    webView->resize(WebSize(800, 1200));
 
     // Scroll to verify the code properly transforms windows to client co-ords.
     const int kScrollOffset = 100;

third_party/WebKit/Source/web/tests/data/touch-action-simple.html

@@ -21,15 +21,38 @@
   </div>
 </div>
 
+<div class='ta-none' style='height: 0; margin-bottom: 50px'>
+  <span expected-action='none' style='display:inline-block'>
+    touch-action should be inherited by inline-block elements
+  </span>
+</div>
+
+<div class='ta-none' style='height: 0; margin-bottom: 50px'>
+  <span expected-action='none' style='display:table-cell'>
+    touch-action should be inherited by table-cell elements
+  </span>
+</div>
+
 <div style='padding: 20px 0'>
   <span class='ta-none' expected-action='auto'>Touch-action should be ignored on inline elements
     <div expected-action='auto'>And not propagated to any block children</div>
   </span>
 </div>
-<p>Below case is broken, should be AUTO - <a href='http://crbug.com/319479'>Bug 319479</a></p>
-<div class='ta-none' style='height: 0; margin-bottom: 100px'>
-  <span expected-action='none'>
+
+<div class='ta-none' style='height: 0; margin-bottom: 50px'>
+  <span expected-action='auto'>
     touch-action should not be inherited by inline elements
-    <div expected-action='none'>But is inherited by any block descendants of them</div>
   </span>
 </div>
+
+<div class='ta-none' style='height: 0; margin-bottom: 100px'>
+  <span>
+    <div expected-action='none'>touch-action should be inherited by any block descendants of inline elements</div>
+  </span>
+</div>
+
+<div class='ta-none' style='height: 0; margin-bottom: 50px'>
+  <svg expected-action='none' xmlns="http://www.w3.org/2000/svg">
+  touch-action should be inherited by svg root element
+  </svg>
+</div>
\ No newline at end of file