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

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

Issue 1918183004: Switch the inheritance of WebView from WebWidget to protected. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressing comments Created 4 years, 8 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 350372547833790b5212963f806454ccec8eb19f..554c9c3d0c23597ec7d0199caab92324a4501e25 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;
@@ -104,6 +105,12 @@ void LayoutTestContentRendererClient::RenderThreadStarted() {
void LayoutTestContentRendererClient::RenderFrameCreated(
RenderFrame* render_frame) {
new LayoutTestRenderFrameObserver(render_frame);
+
+ test_runner::WebTestProxyBase* proxy =
+ GetWebTestProxyBase(render_frame->GetRenderView());
+ WebLocalFrame* frame = render_frame->GetWebFrame();
+ if (!frame->parent())
+ proxy->set_web_widget(frame->frameWidget());
}
void LayoutTestContentRendererClient::RenderViewCreated(
@@ -111,7 +118,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());

Powered by Google App Engine
This is Rietveld 408576698