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 f2faa0aee070455d0f371908653bb024c93cead8..f1c24aad7d72c78f55b873c50e29b9f6e0b405c4 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
@@ -2036,9 +2036,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); |
} |
} |
@@ -2650,8 +2650,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); |