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

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

Issue 2649573003: Revert of Move compositor InputHandler from RenderViewImpl to RenderWidget. (Closed)
Patch Set: Created 3 years, 11 months 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
« no previous file with comments | « third_party/WebKit/Source/web/ChromeClientImpl.cpp ('k') | third_party/WebKit/Source/web/WebViewImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6d2a7907f1a71135e4728fc3ea114dfac3a6532b..ef30de3ab41f025199562a739f7fde2de55bd984 100644
--- a/third_party/WebKit/Source/web/WebPagePopupImpl.cpp
+++ b/third_party/WebKit/Source/web/WebPagePopupImpl.cpp
@@ -163,44 +163,42 @@
}
void setEventListenerProperties(
- LocalFrame* frame,
WebEventListenerClass eventClass,
WebEventListenerProperties properties) override {
- DCHECK(frame->isMainFrame());
- WebWidgetClient* client = m_popup->widgetClient();
- if (WebLayerTreeView* layerTreeView = m_popup->m_layerTreeView) {
- layerTreeView->setEventListenerProperties(eventClass, properties);
+ if (m_popup->m_layerTreeView) {
+ m_popup->m_layerTreeView->setEventListenerProperties(eventClass,
+ properties);
if (eventClass == WebEventListenerClass::TouchStartOrMove) {
- client->hasTouchEventHandlers(
+ m_popup->widgetClient()->hasTouchEventHandlers(
properties != WebEventListenerProperties::Nothing ||
- eventListenerProperties(frame,
- WebEventListenerClass::TouchEndOrCancel) !=
+ eventListenerProperties(WebEventListenerClass::TouchEndOrCancel) !=
WebEventListenerProperties::Nothing);
} else if (eventClass == WebEventListenerClass::TouchEndOrCancel) {
- client->hasTouchEventHandlers(
+ m_popup->widgetClient()->hasTouchEventHandlers(
properties != WebEventListenerProperties::Nothing ||
- eventListenerProperties(frame,
- WebEventListenerClass::TouchStartOrMove) !=
+ eventListenerProperties(WebEventListenerClass::TouchStartOrMove) !=
WebEventListenerProperties::Nothing);
}
} else {
- client->hasTouchEventHandlers(true);
+ m_popup->widgetClient()->hasTouchEventHandlers(true);
}
}
WebEventListenerProperties eventListenerProperties(
- LocalFrame*,
WebEventListenerClass eventClass) const override {
- if (m_popup->m_layerTreeView) {
+ if (m_popup->m_layerTreeView)
return m_popup->m_layerTreeView->eventListenerProperties(eventClass);
- }
return WebEventListenerProperties::Nothing;
}
- void setHasScrollEventHandlers(LocalFrame* frame,
- bool hasEventHandlers) override {
- DCHECK(frame->isMainFrame());
+ void setHasScrollEventHandlers(bool hasEventHandlers) override {
if (m_popup->m_layerTreeView)
m_popup->m_layerTreeView->setHaveScrollEventHandlers(hasEventHandlers);
+ }
+
+ bool hasScrollEventHandlers() const override {
+ if (m_popup->m_layerTreeView)
+ return m_popup->m_layerTreeView->haveScrollEventHandlers();
+ return false;
}
void setTouchAction(LocalFrame* frame, TouchAction touchAction) override {
« no previous file with comments | « third_party/WebKit/Source/web/ChromeClientImpl.cpp ('k') | third_party/WebKit/Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698