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 e41a86be8aa332207b6cdbbe12332332e7578a89..e7e8cafc4be40f7e1e309f862c98ee80819280be 100644 |
--- a/third_party/WebKit/Source/web/WebPagePopupImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebPagePopupImpl.cpp |
@@ -157,6 +157,7 @@ class PagePopupChromeClient final : public EmptyChromeClient { |
} |
void setEventListenerProperties( |
+ LocalFrame*, |
WebEventListenerClass eventClass, |
WebEventListenerProperties properties) override { |
if (m_popup->m_layerTreeView) { |
@@ -165,12 +166,14 @@ class PagePopupChromeClient final : public EmptyChromeClient { |
if (eventClass == WebEventListenerClass::TouchStartOrMove) { |
m_popup->widgetClient()->hasTouchEventHandlers( |
properties != WebEventListenerProperties::Nothing || |
- eventListenerProperties(WebEventListenerClass::TouchEndOrCancel) != |
+ eventListenerProperties(nullptr, |
dcheng
2016/11/04 21:00:02
Why nullptr instead of passing through the LocalFr
wjmaclean
2016/11/07 15:57:27
It forces setting the properties on the RenderView
dcheng
2016/11/08 18:11:00
Right, but shouldn't the LocalFrame argument here
wjmaclean
2016/11/09 18:09:38
Ok. I've added a DCHECK to alert us if it *isn't*
|
+ WebEventListenerClass::TouchEndOrCancel) != |
WebEventListenerProperties::Nothing); |
} else if (eventClass == WebEventListenerClass::TouchEndOrCancel) { |
m_popup->widgetClient()->hasTouchEventHandlers( |
properties != WebEventListenerProperties::Nothing || |
- eventListenerProperties(WebEventListenerClass::TouchStartOrMove) != |
+ eventListenerProperties(nullptr, |
+ WebEventListenerClass::TouchStartOrMove) != |
WebEventListenerProperties::Nothing); |
} |
} else { |
@@ -178,6 +181,7 @@ class PagePopupChromeClient final : public EmptyChromeClient { |
} |
} |
WebEventListenerProperties eventListenerProperties( |
+ LocalFrame*, |
WebEventListenerClass eventClass) const override { |
if (m_popup->m_layerTreeView) |
return m_popup->m_layerTreeView->eventListenerProperties(eventClass); |