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

Unified Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2479663002: Move compositor InputHandler from RenderViewImpl to RenderWidget. (Closed)
Patch Set: Check for layerTreeView while setting handlers. 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
Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index e664eb27cae54417d51390f29bb50218095ea927..4dac60cb81de6e79c8a5f65bfae11128736f62f2 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -1343,14 +1343,19 @@ void FrameLoader::commitProvisionalLoad() {
if (!prepareForCommit())
return;
- if (isLoadingMainFrame()) {
+ // If we are loading the mainframe, or a frame that is a local root, it is
+ // important to explicitly set the event listenener properties to Nothing as
+ // this triggers notificatins to the client.
+ if ((isLoadingMainFrame() && m_frame->page()->mainFrame()->isLocalFrame()) ||
dcheng 2017/01/16 11:05:40 This condition can be simplified into m_frame->isL
wjmaclean 2017/01/17 18:23:27 Done.
+ m_frame->isLocalRoot()) {
m_frame->page()->chromeClient().setEventListenerProperties(
- WebEventListenerClass::TouchStartOrMove,
+ m_frame, WebEventListenerClass::TouchStartOrMove,
WebEventListenerProperties::Nothing);
m_frame->page()->chromeClient().setEventListenerProperties(
- WebEventListenerClass::MouseWheel, WebEventListenerProperties::Nothing);
+ m_frame, WebEventListenerClass::MouseWheel,
+ WebEventListenerProperties::Nothing);
m_frame->page()->chromeClient().setEventListenerProperties(
- WebEventListenerClass::TouchEndOrCancel,
+ m_frame, WebEventListenerClass::TouchEndOrCancel,
WebEventListenerProperties::Nothing);
}

Powered by Google App Engine
This is Rietveld 408576698