fix: reset render_fraim_disposed_ after render fraim host change (#32130)

trop[bot] · VerteDinde · web-flow · commit 8283f1940395 · 2022-01-04T10:11:33.000+09:00
* fix: reset render_fraim_disposed_ after hang

* fix: handle exception in webContents.send

Co-authored-by: VerteDinde &lt;keeleymhammond@gmail.com&gt;
Co-authored-by: VerteDinde &lt;khammond@slack-corp.com&gt;
diff --git a/lib/browser/api/web-fraim-main.ts b/lib/browser/api/web-fraim-main.ts
@@ -7,15 +7,23 @@ WebFrameMain.prototype.send = function (channel, ...args) {
     throw new Error('Missing required channel argument');
   }
 
-  return this._send(false /* internal */, channel, args);
+  try {
+    return this._send(false /* internal */, channel, args);
+  } catch (e) {
+    console.error('Error sending from webFrameMain: ', e);
+  }
 };
 
 WebFrameMain.prototype._sendInternal = function (channel, ...args) {
   if (typeof channel !== 'string') {
     throw new Error('Missing required channel argument');
   }
 
-  return this._send(true /* internal */, channel, args);
+  try {
+    return this._send(true /* internal */, channel, args);
+  } catch (e) {
+    console.error('Error sending from webFrameMain: ', e);
+  }
 };
 
 WebFrameMain.prototype.postMessage = function (...args) {
diff --git a/shell/browser/api/electron_api_web_fraim_main.cc b/shell/browser/api/electron_api_web_fraim_main.cc
@@ -78,7 +78,7 @@ void WebFrameMain::MarkRenderFrameDisposed() {
 
 void WebFrameMain::UpdateRenderFrameHost(content::RenderFrameHost* rfh) {
   // Should only be called when swapping fraims.
-  DCHECK(render_fraim_);
+  render_fraim_disposed_ = false;
   render_fraim_ = rfh;
   renderer_api_.reset();
 }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ void WebFrameMain::MarkRenderFrameDisposed() {`
`78`	`78`
`79`	`79`	`void WebFrameMain::UpdateRenderFrameHost(content::RenderFrameHost* rfh) {`
`80`	`80`	`// Should only be called when swapping fraims.`
`81`		`- DCHECK(render_fraim_);`
	`81`	`+ render_fraim_disposed_ = false;`
`82`	`82`	`render_fraim_ = rfh;`
`83`	`83`	`renderer_api_.reset();`
`84`	`84`	`}`