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

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

Issue 2417783005: [Master/Overview CL] Make PageScaleFactor work for oopif subframe.
Patch Set: Rebase to master@{#429656}. 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..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,
+ 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);
« no previous file with comments | « third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp ('k') | third_party/WebKit/Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698