| Index: third_party/WebKit/Source/web/ChromeClientImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/ChromeClientImpl.cpp b/third_party/WebKit/Source/web/ChromeClientImpl.cpp
|
| index 02bb02e23e9a9236e966b80896335740fd802589..c5af44a941394f3e3e788d87bb857bf25772ea9d 100644
|
| --- a/third_party/WebKit/Source/web/ChromeClientImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/ChromeClientImpl.cpp
|
| @@ -876,22 +876,20 @@ bool ChromeClientImpl::shouldOpenModalDialogDuringPageDismissal(const DialogType
|
| return false;
|
| }
|
|
|
| -void ChromeClientImpl::needTouchEvents(bool needsTouchEvents)
|
| +void ChromeClientImpl::setEventListenerProperties(WebEventListenerClass eventClass, WebEventListenerProperties properties)
|
| {
|
| - m_webView->hasTouchEventHandlers(needsTouchEvents);
|
| -}
|
| + if (eventClass == WebEventListenerClass::Touch)
|
| + m_webView->hasTouchEventHandlers(properties != WebEventListenerProperties::Nothing);
|
|
|
| -void ChromeClientImpl::setHaveWheelEventHandlers(bool hasEventHandlers)
|
| -{
|
| if (WebLayerTreeView* treeView = m_webView->layerTreeView())
|
| - treeView->setHaveWheelEventHandlers(hasEventHandlers);
|
| + treeView->setEventListenerProperties(eventClass, properties);
|
| }
|
|
|
| -bool ChromeClientImpl::haveWheelEventHandlers() const
|
| +WebEventListenerProperties ChromeClientImpl::eventListenerProperties(WebEventListenerClass eventClass) const
|
| {
|
| if (WebLayerTreeView* treeView = m_webView->layerTreeView())
|
| - return treeView->haveWheelEventHandlers();
|
| - return false;
|
| + return treeView->eventListenerProperties(eventClass);
|
| + return WebEventListenerProperties::Nothing;
|
| }
|
|
|
| void ChromeClientImpl::setHaveScrollEventHandlers(bool hasEventHandlers)
|
|
|