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 0610418fd1c887b2c6234a917927ef78991a3ac6..2738c8de01711bd6123fe45edd10844127b72a72 100644 |
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp |
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp |
@@ -1342,14 +1342,18 @@ 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. |
dcheng
2017/01/18 00:13:03
Nit: elaborate on what sort of notifications to th
wjmaclean
2017/01/18 14:01:23
Done.
|
+ if (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); |
} |