Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1430)

Unified Diff: third_party/WebKit/Source/web/WebPagePopupImpl.cpp

Issue 2479663002: Move compositor InputHandler from RenderViewImpl to RenderWidget. (Closed)
Patch Set: Add early out to accommodate null frameWidget in webkit_unit_tests. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);

Powered by Google App Engine
This is Rietveld 408576698