Index: Source/core/page/EventHandler.cpp |
diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp |
index 0c406ddee3166c9a5d611f06c026ebc34d32ec4e..c94c053803e3616122665b700c4e104f79c7a8c1 100644 |
--- a/Source/core/page/EventHandler.cpp |
+++ b/Source/core/page/EventHandler.cpp |
@@ -3940,16 +3940,14 @@ TouchAction EventHandler::computeEffectiveTouchAction(const LayoutPoint& point) |
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 |
+ // Start by permitting all actions, then walk the box 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)) { |
- // 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()) { |
- if (renderer->isRenderBlockFlow()) { |
+ if (renderer->isBox()) { |
Rick Byers
2014/04/02 20:25:20
this should again look only at nodes to which touc
Zeeshan Qureshi
2014/04/04 01:12:31
Done, the row / column case test this and I verifi
|
TouchAction action = renderer->style()->touchAction(); |
effectiveTouchAction = intersectTouchAction(action, effectiveTouchAction); |
if (effectiveTouchAction == TouchActionNone) |