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

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

Issue 2479663002: Move compositor InputHandler from RenderViewImpl to RenderWidget. (Closed)
Patch Set: Rebase to master@{#445291}. 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 4672d5e89fa4ce88450d28c15cbe10f3f0673cb5..8360378cf042cdb251dca338737ee26730298cb8 100644
--- a/third_party/WebKit/Source/web/WebPagePopupImpl.cpp
+++ b/third_party/WebKit/Source/web/WebPagePopupImpl.cpp
@@ -163,44 +163,46 @@ class PagePopupChromeClient final : public EmptyChromeClient {
}
void setEventListenerProperties(
+ LocalFrame* frame,
WebEventListenerClass eventClass,
WebEventListenerProperties properties) override {
- if (m_popup->m_layerTreeView) {
- m_popup->m_layerTreeView->setEventListenerProperties(eventClass,
- properties);
+ DCHECK(frame->isMainFrame());
+ WebWidgetClient* client = m_popup->widgetClient();
+ if (WebLayerTreeView* layerTreeView = m_popup->m_layerTreeView) {
+ layerTreeView->setEventListenerProperties(eventClass, properties);
if (eventClass == WebEventListenerClass::TouchStartOrMove) {
- m_popup->widgetClient()->hasTouchEventHandlers(
+ client->hasTouchEventHandlers(
properties != WebEventListenerProperties::Nothing ||
- eventListenerProperties(WebEventListenerClass::TouchEndOrCancel) !=
+ eventListenerProperties(frame,
+ WebEventListenerClass::TouchEndOrCancel) !=
WebEventListenerProperties::Nothing);
} else if (eventClass == WebEventListenerClass::TouchEndOrCancel) {
- m_popup->widgetClient()->hasTouchEventHandlers(
+ client->hasTouchEventHandlers(
properties != WebEventListenerProperties::Nothing ||
- eventListenerProperties(WebEventListenerClass::TouchStartOrMove) !=
+ eventListenerProperties(frame,
+ WebEventListenerClass::TouchStartOrMove) !=
WebEventListenerProperties::Nothing);
}
} else {
- m_popup->widgetClient()->hasTouchEventHandlers(true);
+ client->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(bool hasEventHandlers) override {
+ void setHasScrollEventHandlers(LocalFrame* frame,
+ bool hasEventHandlers) override {
+ DCHECK(frame->isMainFrame());
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 {
DCHECK(frame);
WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(frame);
« 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