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..5efff57dc0191b82294661755a55d29235bc6250 100644 |
--- a/third_party/WebKit/Source/web/WebPagePopupImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebPagePopupImpl.cpp |
@@ -157,20 +157,24 @@ class PagePopupChromeClient final : public EmptyChromeClient { |
} |
void setEventListenerProperties( |
+ LocalFrame* frame, |
WebEventListenerClass eventClass, |
WebEventListenerProperties properties) override { |
+ DCHECK(frame->isMainFrame()); |
if (m_popup->m_layerTreeView) { |
m_popup->m_layerTreeView->setEventListenerProperties(eventClass, |
properties); |
if (eventClass == WebEventListenerClass::TouchStartOrMove) { |
m_popup->widgetClient()->hasTouchEventHandlers( |
properties != WebEventListenerProperties::Nothing || |
- eventListenerProperties(WebEventListenerClass::TouchEndOrCancel) != |
+ eventListenerProperties(frame, |
+ WebEventListenerClass::TouchEndOrCancel) != |
WebEventListenerProperties::Nothing); |
} else if (eventClass == WebEventListenerClass::TouchEndOrCancel) { |
m_popup->widgetClient()->hasTouchEventHandlers( |
properties != WebEventListenerProperties::Nothing || |
- eventListenerProperties(WebEventListenerClass::TouchStartOrMove) != |
+ eventListenerProperties(frame, |
+ WebEventListenerClass::TouchStartOrMove) != |
WebEventListenerProperties::Nothing); |
} |
} else { |
@@ -178,6 +182,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); |