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

Unified Diff: content/shell/renderer/layout_test/layout_test_content_renderer_client.cc

Issue 2036873002: Making EventSender talk to the right WebWidget (for OOPIF support). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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: content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
diff --git a/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc b/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
index 0befdccb17014cbdbb5d3050fe6153590f48ca80..404b5cdd6c52a1a932e8865d7ac7e7b2d509850a 100644
--- a/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
+++ b/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
@@ -83,6 +83,7 @@ void WebFrameTestProxyCreated(RenderFrame* render_frame,
test_runner::WebFrameTestProxyBase* proxy) {
test_runner::WebTestProxyBase* web_test_proxy_base =
GetWebTestProxyBase(render_frame->GetRenderView());
+ proxy->set_web_test_proxy_base(web_test_proxy_base);
proxy->set_test_client(
LayoutTestRenderThreadObserver::GetInstance()
->test_interfaces()
@@ -109,6 +110,7 @@ void LayoutTestContentRendererClient::RenderFrameCreated(
test_runner::WebFrameTestProxyBase* frame_proxy =
GetWebFrameTestProxyBase(render_frame);
frame_proxy->set_web_frame(render_frame->GetWebFrame());
+ frame_proxy->SetSendWheelGestures(UseGestureBasedWheelScrolling());
new LayoutTestRenderFrameObserver(render_frame);
}
@@ -123,7 +125,6 @@ void LayoutTestContentRendererClient::RenderViewCreated(
// the main frame in WebTestProxy.
proxy->set_web_widget(render_view->GetWebView()->widget());
proxy->Reset();
- proxy->SetSendWheelGestures(UseGestureBasedWheelScrolling());
BlinkTestRunner* test_runner = BlinkTestRunner::Get(render_view);
test_runner->Reset(false /* for_new_test */);

Powered by Google App Engine
This is Rietveld 408576698