Chromium Code Reviews| 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); |
| } |