Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(637)

Unified Diff: third_party/WebKit/Source/core/input/TouchEventManager.cpp

Issue 2475443004: Add use counter when touch-action isn't used when preventDefault'd. (Closed)
Patch Set: Whoops missed updating a file Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/input/TouchEventManager.cpp
diff --git a/third_party/WebKit/Source/core/input/TouchEventManager.cpp b/third_party/WebKit/Source/core/input/TouchEventManager.cpp
index 8cbaab593786745703e2db82a91ca6fa5f5c0b07..c6153a059c300b7b7546322d862906bf9025fa04 100644
--- a/third_party/WebKit/Source/core/input/TouchEventManager.cpp
+++ b/third_party/WebKit/Source/core/input/TouchEventManager.cpp
@@ -97,6 +97,7 @@ void TouchEventManager::clear() {
m_touchPressed = false;
m_touchScrollStarted = false;
m_currentEvent = PlatformEvent::NoType;
+ m_currentTouchAction = TouchActionAuto;
}
DEFINE_TRACE(TouchEventManager) {
@@ -172,6 +173,7 @@ WebInputEventResult TouchEventManager::dispatchTouchEvents(
if (allTouchesReleased) {
m_touchSequenceDocument.clear();
m_touchSequenceUserGestureToken.clear();
+ m_currentTouchAction = TouchActionAuto;
}
WebInputEventResult eventResult = WebInputEventResult::NotHandled;
@@ -187,13 +189,14 @@ WebInputEventResult TouchEventManager::dispatchTouchEvents(
static_cast<PlatformTouchPoint::TouchState>(state)));
for (const auto& eventTarget : changedTouches[state].m_targets) {
EventTarget* touchEventTarget = eventTarget;
- TouchEvent* touchEvent = TouchEvent::create(
- touches, touchesByTarget.get(touchEventTarget),
- changedTouches[state].m_touches.get(), eventName,
- touchEventTarget->toNode()->document().domWindow(),
- event.getModifiers(), event.cancelable(),
- event.causesScrollingIfUncanceled(),
- event.touchStartOrFirstTouchMove(), event.timestamp());
+ TouchEvent* touchEvent =
+ TouchEvent::create(touches, touchesByTarget.get(touchEventTarget),
+ changedTouches[state].m_touches.get(), eventName,
+ touchEventTarget->toNode()->document().domWindow(),
+ event.getModifiers(), event.cancelable(),
+ event.causesScrollingIfUncanceled(),
+ event.touchStartOrFirstTouchMove(),
+ event.timestamp(), m_currentTouchAction);
DispatchEventResult domDispatchResult =
touchEventTarget->dispatchEvent(touchEvent);
@@ -343,6 +346,7 @@ void TouchEventManager::updateTargetAndRegionMapsForTouchStarts(
TouchActionUtil::computeEffectiveTouchAction(*touchInfo.touchNode);
if (effectiveTouchAction != TouchActionAuto)
m_frame->page()->chromeClient().setTouchAction(effectiveTouchAction);
+ m_currentTouchAction = effectiveTouchAction;
Rick Byers 2016/11/07 17:01:09 This isn't sufficient for multi-finger gestures.
dtapuska 2016/11/07 18:51:40 Done.
}
}
}

Powered by Google App Engine
This is Rietveld 408576698