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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutObject.cpp

Issue 1895303007: Non passive touch end or touch cancel listeners should not block scroll. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 years, 8 months 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/layout/LayoutObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
index 0c6f807ad672cb735dc2bb633c22be393993eedb..a8d5d0ac97e786501b826f6565b2c950f175126e 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
@@ -2037,9 +2037,9 @@ void LayoutObject::styleWillChange(StyleDifference diff, const ComputedStyle& ne
if (node() && !node()->isTextNode() && (oldTouchAction == TouchActionAuto) != (newStyle.getTouchAction() == TouchActionAuto)) {
EventHandlerRegistry& registry = document().frameHost()->eventHandlerRegistry();
if (newStyle.getTouchAction() != TouchActionAuto)
- registry.didAddEventHandler(*node(), EventHandlerRegistry::TouchEventBlocking);
+ registry.didAddEventHandler(*node(), EventHandlerRegistry::TouchStartOrMoveEventBlocking);
else
- registry.didRemoveEventHandler(*node(), EventHandlerRegistry::TouchEventBlocking);
+ registry.didRemoveEventHandler(*node(), EventHandlerRegistry::TouchStartOrMoveEventBlocking);
}
}
@@ -2651,8 +2651,8 @@ void LayoutObject::willBeDestroyed()
// previously may have already been removed by the Document independently.
if (node() && !node()->isTextNode() && m_style && m_style->getTouchAction() != TouchActionAuto) {
EventHandlerRegistry& registry = document().frameHost()->eventHandlerRegistry();
- if (registry.eventHandlerTargets(EventHandlerRegistry::TouchEventBlocking)->contains(node()))
- registry.didRemoveEventHandler(*node(), EventHandlerRegistry::TouchEventBlocking);
+ if (registry.eventHandlerTargets(EventHandlerRegistry::TouchStartOrMoveEventBlocking)->contains(node()))
+ registry.didRemoveEventHandler(*node(), EventHandlerRegistry::TouchStartOrMoveEventBlocking);
}
setAncestorLineBoxDirty(false);
« no previous file with comments | « third_party/WebKit/Source/core/input/EventHandler.cpp ('k') | third_party/WebKit/Source/core/loader/EmptyClients.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698