Remove conditional check to avoid crash when main frame is detached
This was handling the case where the main frame was detached without
freezing the RenderWidget. Now that that should no longer happen, as
the FrameMsg_Delete call was removed from ~RenderFrameHostImpl, we
should not need this branch anymore, and a RenderWidget should always
be frozen when there is no frame (and no WebFrameWidget, currently)
around.
If something is strange then we'll see crashes start happening in
WebViewImpl::GetURLForDebugTrace() again, but we expect to not.
[email protected]
Change-Id: I4212622dbb8cbe5a6855d2d345490a5dbbf87683
Bug: 906340
Reviewed-on: https://chromium-review.googlesource.com/c/1377103
Commit-Queue: danakj <[email protected]>
Reviewed-by: Albert J. Wong <[email protected]>
Cr-Commit-Position: refs/heads/master@{#616479}diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 42b4b04..693fbe6 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1006,11 +1006,7 @@
std::move(client_info));
layer_tree_view_->SetRenderFrameObserver(
std::move(render_frame_metadata_observer));
- GURL url;
- // TODO(crbug.com/896836): Sometimes there's no valid widget, for main frame
- // widgets.
- if (!owner_delegate_ || GetFrameWidget())
- url = GetWebWidget()->GetURLForDebugTrace();
+ GURL url = GetWebWidget()->GetURLForDebugTrace();
// The |url| is not always available, fallback to a fixed string.
if (url.is_empty())
url = GURL("chrome://gpu/RenderWidget::RequestNewLayerTreeFrameSink");
