Remove RenderViewImpl::frame_widget_.
This pointer holds the same value as the RenderWidget's WebWidget now
so we don't need both.
We stop passing a WebFrameWidget to InitForMainFrame() since it is
sometimes null and thus we always have to pass it the RenderWidget
through RenderViewImpl anyways. This way the presence of WebFrameWidget
is consistent for main frames.
[email protected]
Bug: 419087
Change-Id: I3b5a419619c9089c09ae1d46c01bd111dde9e3df
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1825582
Commit-Queue: danakj <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Cr-Commit-Position: refs/heads/master@{#704395}
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 5ec4b21f..fecc16f 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -516,9 +516,8 @@
Init(std::move(show_callback), web_widget);
}
-void RenderWidget::InitForMainFrame(ShowCallback show_callback,
- blink::WebFrameWidget* web_frame_widget) {
- Init(std::move(show_callback), web_frame_widget);
+void RenderWidget::InitForMainFrame(ShowCallback show_callback) {
+ Init(std::move(show_callback), /*web_frame_widget=*/nullptr);
}
void RenderWidget::InitForChildLocalRoot(
