Index: third_party/WebKit/Source/web/WebPagePopupImpl.cpp |
diff --git a/third_party/WebKit/Source/web/WebPagePopupImpl.cpp b/third_party/WebKit/Source/web/WebPagePopupImpl.cpp |
index 61cb67200873d646be107de6cf3e629ed5263d6c..379526bc37522c9740537f4c4adcac61810b09f7 100644 |
--- a/third_party/WebKit/Source/web/WebPagePopupImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebPagePopupImpl.cpp |
@@ -163,22 +163,18 @@ private: |
m_popup->m_webView->client()->didChangeCursor(WebCursorInfo(cursor)); |
} |
- void needTouchEvents(bool needsTouchEvents) override |
- { |
- m_popup->widgetClient()->hasTouchEventHandlers(needsTouchEvents); |
- } |
- |
- void setHaveWheelEventHandlers(bool haveEventHandlers) override |
+ void setEventListenerProperties(WebEventListenerClass eventClass, WebEventListenerProperties properties) override |
{ |
+ if (eventClass == WebEventListenerClass::Touch) |
+ m_popup->widgetClient()->hasTouchEventHandlers(properties != WebEventListenerProperties::Nothing); |
if (m_popup->m_layerTreeView) |
- return m_popup->m_layerTreeView->setHaveWheelEventHandlers(haveEventHandlers); |
+ m_popup->m_layerTreeView->setEventListenerProperties(eventClass, properties); |
} |
- |
- bool haveWheelEventHandlers() const override |
+ WebEventListenerProperties eventListenerProperties(WebEventListenerClass eventClass) const override |
{ |
if (m_popup->m_layerTreeView) |
- return m_popup->m_layerTreeView->haveWheelEventHandlers(); |
- return false; |
+ return m_popup->m_layerTreeView->eventListenerProperties(eventClass); |
+ return WebEventListenerProperties::Nothing; |
} |
void setHaveScrollEventHandlers(bool hasEventHandlers) override |