| 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 23c0121c422682de09655ce209a4a58600b7aa4c..34922199cabdb527ad8fd6108156a2dd9d779e2c 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| @@ -1325,13 +1325,18 @@ void FrameLoader::commitProvisionalLoad() {
|
| return;
|
|
|
| if (isLoadingMainFrame()) {
|
| + // TODO(wjmaclean): Instead of passing |m_frame| here we pass nullptr
|
| + // instead so the properties will be set on the WebView. We do this since,
|
| + // while we are loading, the WebFrameWidget for m_frame may not yet
|
| + // be available.
|
| 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);
|
| }
|
|
|
|
|