Chromium Code Reviews| Index: Source/core/page/EventHandler.cpp |
| diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp |
| index 1a1b6d5f8102b02fcd7fdb6584124f711878e974..7bfa4813a99731415b3889c1c7e187642cde26fb 100644 |
| --- a/Source/core/page/EventHandler.cpp |
| +++ b/Source/core/page/EventHandler.cpp |
| @@ -3674,9 +3674,13 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) |
| touchTarget = node; |
| // FIXME(rbyers): Should really be doing a second hit test that ignores inline elements - crbug.com/319479. |
|
Rick Byers
2014/02/17 14:44:24
Oh, and you can remove this FIXME now of course.
gnana
2014/02/24 18:59:50
Done.
|
| - TouchAction effectiveTouchAction = computeEffectiveTouchAction(*node); |
| - if (effectiveTouchAction != TouchActionAuto) |
| - m_frame->page()->chrome().client().setTouchAction(effectiveTouchAction); |
| + HitTestResult taResult = hitTestResultAtPoint(pagePoint, hitType | HitTestRequest::TouchAction); |
|
Rick Byers
2014/02/17 14:43:52
It's probably worth moving the hit test into compu
gnana
2014/02/24 18:59:50
Done.
|
| + Node* taNode = taResult.innerNode(); |
| + if (taNode == node) { |
|
Rick Byers
2014/02/17 14:43:52
You'll need to do this even when the hit test retu
gnana
2014/02/24 18:59:50
Done.
|
| + TouchAction effectiveTouchAction = computeEffectiveTouchAction(*taNode); |
| + if (effectiveTouchAction != TouchActionAuto) |
| + m_frame->page()->chrome().client().setTouchAction(effectiveTouchAction); |
| + } |
| } else if (pointState == PlatformTouchPoint::TouchReleased || pointState == PlatformTouchPoint::TouchCancelled) { |
| // The target should be the original target for this touch, so get it from the hashmap. As it's a release or cancel |