| Index: content/browser/frame_host/render_frame_host_impl.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
|
| index cc0ad50ff53128a6702981667a49762ad371388b..d6abcbbfa10a5605dedbdb59b600fba978dad436 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.cc
|
| +++ b/content/browser/frame_host/render_frame_host_impl.cc
|
| @@ -645,12 +645,13 @@ bool RenderFrameHostImpl::CreateRenderFrame(int parent_routing_id,
|
| }
|
|
|
| bool RenderFrameHostImpl::IsRenderFrameLive() {
|
| - // RenderFrames are created for main frames at the same time as RenderViews,
|
| - // so we rely on IsRenderViewLive. For subframes, we keep track of each
|
| - // RenderFrame individually with render_frame_created_.
|
| - bool is_live = !GetParent() ?
|
| - render_view_host_->IsRenderViewLive() :
|
| - GetProcess()->HasConnection() && render_frame_created_;
|
| + bool is_live = GetProcess()->HasConnection() && render_frame_created_;
|
| +
|
| + // If the process is for an isolated guest (e.g. <webview>), rely on the
|
| + // RenderViewHost liveness check. Once https://crbug.com/492830 is fixed,
|
| + // this can be removed.
|
| + if (GetProcess()->IsIsolatedGuest())
|
| + is_live = render_view_host_->IsRenderViewLive();
|
|
|
| // Sanity check: the RenderView should always be live if the RenderFrame is.
|
| DCHECK(!is_live || render_view_host_->IsRenderViewLive());
|
|
|