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 2af844ee0717fcfb7e676f32add5cf3ea26bfc18..029bbfbef4e6e1d0f293a2d6b817fb12ee264cdd 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
@@ -2048,9 +2048,9 @@ void LayoutObject::styleWillChange(StyleDifference diff, const ComputedStyle& ne |
if (node() && !node()->isTextNode() && (oldTouchAction == TouchActionAuto) != (newStyle.touchAction() == TouchActionAuto)) { |
EventHandlerRegistry& registry = document().frameHost()->eventHandlerRegistry(); |
if (newStyle.touchAction() != TouchActionAuto) |
- registry.didAddEventHandler(*node(), EventHandlerRegistry::TouchEvent); |
+ registry.didAddEventHandler(*node(), EventHandlerRegistry::TouchEventBlocking); |
else |
- registry.didRemoveEventHandler(*node(), EventHandlerRegistry::TouchEvent); |
+ registry.didRemoveEventHandler(*node(), EventHandlerRegistry::TouchEventBlocking); |
} |
} |
@@ -2572,8 +2572,8 @@ void LayoutObject::willBeDestroyed() |
// previously may have already been removed by the Document independently. |
if (node() && !node()->isTextNode() && m_style && m_style->touchAction() != TouchActionAuto) { |
EventHandlerRegistry& registry = document().frameHost()->eventHandlerRegistry(); |
- if (registry.eventHandlerTargets(EventHandlerRegistry::TouchEvent)->contains(node())) |
- registry.didRemoveEventHandler(*node(), EventHandlerRegistry::TouchEvent); |
+ if (registry.eventHandlerTargets(EventHandlerRegistry::TouchEventBlocking)->contains(node())) |
+ registry.didRemoveEventHandler(*node(), EventHandlerRegistry::TouchEventBlocking); |
} |
setAncestorLineBoxDirty(false); |