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

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: Rebase 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 69c41900dd144f1bccbfb8dbdfb1d082999218e7..6880e9f0182af133bf53c42bcfb2e49bd2efe24d 100644
--- a/third_party/WebKit/Source/core/input/TouchEventManager.cpp
+++ b/third_party/WebKit/Source/core/input/TouchEventManager.cpp
@@ -94,6 +94,7 @@ void TouchEventManager::clear() {
m_regionForTouchID.clear();
m_touchPressed = false;
m_currentEvent = PlatformEvent::NoType;
+ m_currentTouchAction = TouchActionAuto;
}
DEFINE_TRACE(TouchEventManager) {
@@ -167,6 +168,7 @@ WebInputEventResult TouchEventManager::dispatchTouchEvents(
if (allTouchesReleased) {
m_touchSequenceDocument.clear();
+ m_currentTouchAction = TouchActionAuto;
}
WebInputEventResult eventResult = WebInputEventResult::NotHandled;
@@ -182,13 +184,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);
@@ -333,8 +336,13 @@ void TouchEventManager::updateTargetAndRegionMapsForTouchStarts(
TouchAction effectiveTouchAction =
TouchActionUtil::computeEffectiveTouchAction(*touchInfo.touchNode);
- if (effectiveTouchAction != TouchActionAuto)
+ if (effectiveTouchAction != TouchActionAuto) {
m_frame->page()->chromeClient().setTouchAction(effectiveTouchAction);
+
+ // Combine the current touch action sequence with the touch action
+ // for the current finger press.
+ m_currentTouchAction &= effectiveTouchAction;
+ }
}
}
}

Powered by Google App Engine
This is Rietveld 408576698