fix: reset render_frame_disposed_ after hang

electron · Oct 12, 2021 · f99fbc2 · f99fbc2
1 parent 31e295a
commit f99fbc2
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/shell/browser/api/electron_api_web_frame_main.cc b/shell/browser/api/electron_api_web_frame_main.cc
@@ -100,7 +100,11 @@ void WebFrameMain::MarkRenderFrameDisposed() {
 
 void WebFrameMain::UpdateRenderFrameHost(content::RenderFrameHost* rfh) {
   // Should only be called when swapping frames.
-  DCHECK(render_frame_);
+  if (!render_frame_disposed_) {
+    DCHECK(render_frame_);
+  } else {
+    render_frame_disposed_ = false;
+  }
   render_frame_ = rfh;
   renderer_api_.reset();
 }
@@ -158,7 +162,7 @@ v8::Local<v8::Promise> WebFrameMain::ExecuteJavaScript(
 }
 
 bool WebFrameMain::Reload() {
-  if (!CheckRenderFrame())
+  if (render_frame_disposed_)
     return false;
   return render_frame_->Reload();
 }
@@ -174,7 +178,7 @@ void WebFrameMain::Send(v8::Isolate* isolate,
     return;
   }
 
-  if (!CheckRenderFrame())
+  if (render_frame_disposed_)
     return;
 
   GetRendererApi()->Message(internal, channel, std::move(message),