chore: wrap process restart flag in renderer process reuse check (electron#22334)

MarshallOfSound · web-flow · commit fd46bc653f97 · 2020-02-24T11:43:55.000-08:00
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
@@ -1504,17 +1504,23 @@ void WebContents::Stop() {
 }
 
 void WebContents::GoBack() {
-  electron::ElectronBrowserClient::SuppressRendererProcessRestartForOnce();
+  if (!ElectronBrowserClient::Get()->CanUseCustomSiteInstance()) {
+    electron::ElectronBrowserClient::SuppressRendererProcessRestartForOnce();
+  }
   web_contents()->GetController().GoBack();
 }
 
 void WebContents::GoForward() {
-  electron::ElectronBrowserClient::SuppressRendererProcessRestartForOnce();
+  if (!ElectronBrowserClient::Get()->CanUseCustomSiteInstance()) {
+    electron::ElectronBrowserClient::SuppressRendererProcessRestartForOnce();
+  }
   web_contents()->GetController().GoForward();
 }
 
 void WebContents::GoToOffset(int offset) {
-  electron::ElectronBrowserClient::SuppressRendererProcessRestartForOnce();
+  if (!ElectronBrowserClient::Get()->CanUseCustomSiteInstance()) {
+    electron::ElectronBrowserClient::SuppressRendererProcessRestartForOnce();
+  }
   web_contents()->GetController().GoToOffset(offset);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1504,17 +1504,23 @@ void WebContents::Stop() {`
`1504`	`1504`	`}`
`1505`	`1505`
`1506`	`1506`	`void WebContents::GoBack() {`
`1507`		`- electron::ElectronBrowserClient::SuppressRendererProcessRestartForOnce();`
	`1507`	`+ if (!ElectronBrowserClient::Get()->CanUseCustomSiteInstance()) {`
	`1508`	`+ electron::ElectronBrowserClient::SuppressRendererProcessRestartForOnce();`
	`1509`	`+ }`
`1508`	`1510`	`web_contents()->GetController().GoBack();`
`1509`	`1511`	`}`
`1510`	`1512`
`1511`	`1513`	`void WebContents::GoForward() {`
`1512`		`- electron::ElectronBrowserClient::SuppressRendererProcessRestartForOnce();`
	`1514`	`+ if (!ElectronBrowserClient::Get()->CanUseCustomSiteInstance()) {`
	`1515`	`+ electron::ElectronBrowserClient::SuppressRendererProcessRestartForOnce();`
	`1516`	`+ }`
`1513`	`1517`	`web_contents()->GetController().GoForward();`
`1514`	`1518`	`}`
`1515`	`1519`
`1516`	`1520`	`void WebContents::GoToOffset(int offset) {`
`1517`		`- electron::ElectronBrowserClient::SuppressRendererProcessRestartForOnce();`
	`1521`	`+ if (!ElectronBrowserClient::Get()->CanUseCustomSiteInstance()) {`
	`1522`	`+ electron::ElectronBrowserClient::SuppressRendererProcessRestartForOnce();`
	`1523`	`+ }`
`1518`	`1524`	`web_contents()->GetController().GoToOffset(offset);`
`1519`	`1525`	`}`
`1520`	`1526`