Chromium Code Reviews| 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 317fe7815c4699c60a4d843c9504dd0132a39052..f1084629abda557837cf5a43e8e37d72f4204ae0 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 |
| @@ -36,6 +36,7 @@ |
| using blink::WebAudioDevice; |
| using blink::WebClipboard; |
| +using blink::WebFrame; |
| using blink::WebLocalFrame; |
| using blink::WebMIDIAccessor; |
| using blink::WebMIDIAccessorClient; |
| @@ -101,6 +102,12 @@ void LayoutTestContentRendererClient::RenderThreadStarted() { |
| void LayoutTestContentRendererClient::RenderFrameCreated( |
| RenderFrame* render_frame) { |
| new LayoutTestRenderFrameObserver(render_frame); |
| + |
| + test_runner::WebTestProxyBase* proxy = |
|
dcheng
2016/05/03 09:27:13
The ultimate goal here is to associate the widget
Łukasz Anforowicz
2016/05/03 16:09:55
Would it make sense to pass web_local_frame->frame
lfg
2016/05/03 21:19:43
I think that does make sense, but there's also a l
dcheng
2016/05/04 04:55:29
OK. Might be worth adding a TODO, but I leave that
dcheng
2016/05/04 04:55:29
OK. Might be worth adding a TODO, but I leave that
|
| + GetWebTestProxyBase(render_frame->GetRenderView()); |
| + WebLocalFrame* frame = render_frame->GetWebFrame(); |
| + if (!frame->parent()) |
| + proxy->set_web_widget(frame->frameWidget()); |
| } |
| void LayoutTestContentRendererClient::RenderViewCreated( |
| @@ -108,7 +115,6 @@ void LayoutTestContentRendererClient::RenderViewCreated( |
| new ShellRenderViewObserver(render_view); |
| test_runner::WebTestProxyBase* proxy = GetWebTestProxyBase(render_view); |
| - proxy->set_web_widget(render_view->GetWebView()); |
| proxy->set_web_view(render_view->GetWebView()); |
| proxy->Reset(); |
| proxy->SetSendWheelGestures(UseGestureBasedWheelScrolling()); |