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

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

Issue 2479663002: Move compositor InputHandler from RenderViewImpl to RenderWidget. (Closed)
Patch Set: Add early out to accommodate null frameWidget in webkit_unit_tests. 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/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);
}

Powered by Google App Engine
This is Rietveld 408576698