mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: clean up devtools frontend_host on webcontents destroy (#40666)

Browse source 
* fix: clean up devtools frontend_host on destroy

* chore: use IsInPrimaryMainFrame instead of IsInMainFrame

* test: add a test for re-opening devtools
This commit is contained in:
Albert Xing 2023-12-01 11:37:52 -08:00 committed by GitHub
parent 344b7f0d06
commit 3609fc7402
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
shell/browser/ui/inspectable_web_contents.cc
View file

@ -1007,6 +1007,7 @@ void InspectableWebContents::WebContentsDestroyed() {
Observe(nullptr); Observe(nullptr);
Detach(); Detach();
embedder_message_dispatcher_.reset(); embedder_message_dispatcher_.reset();
frontend_host_.reset();
if (view_ && view_->GetDelegate()) if (view_ && view_->GetDelegate())
view_->GetDelegate()->DevToolsClosed(); view_->GetDelegate()->DevToolsClosed();
@ -1052,7 +1053,7 @@ void InspectableWebContents::OnWebContentsFocused(
void InspectableWebContents::ReadyToCommitNavigation( void InspectableWebContents::ReadyToCommitNavigation(
content::NavigationHandle* navigation_handle) { content::NavigationHandle* navigation_handle) {
if (navigation_handle->IsInMainFrame()) { if (navigation_handle->IsInPrimaryMainFrame()) {
if (navigation_handle->GetRenderFrameHost() == if (navigation_handle->GetRenderFrameHost() ==
GetDevToolsWebContents()->GetPrimaryMainFrame() && GetDevToolsWebContents()->GetPrimaryMainFrame() &&
frontend_host_) { frontend_host_) {
@ -1069,7 +1070,7 @@ void InspectableWebContents::ReadyToCommitNavigation(
void InspectableWebContents::DidFinishNavigation( void InspectableWebContents::DidFinishNavigation(
content::NavigationHandle* navigation_handle) { content::NavigationHandle* navigation_handle) {
if (navigation_handle->IsInMainFrame() || if (navigation_handle->IsInPrimaryMainFrame() ||
!navigation_handle->GetURL().SchemeIs("chrome-extension") || !navigation_handle->GetURL().SchemeIs("chrome-extension") ||
!navigation_handle->HasCommitted()) !navigation_handle->HasCommitted())
return; return;

18
spec/api-web-contents-spec.ts
View file

@ -639,6 +639,24 @@ describe('webContents module', () => {
await devtoolsOpened; await devtoolsOpened;
expect(w.webContents.getDevToolsTitle()).to.equal('myTitle'); expect(w.webContents.getDevToolsTitle()).to.equal('myTitle');
}); });
it('can re-open devtools', async () => {
const w = new BrowserWindow({ show: false });
const devtoolsOpened = once(w.webContents, 'devtools-opened');
w.webContents.openDevTools({ mode: 'detach', activate: true });
await devtoolsOpened;
expect(w.webContents.isDevToolsOpened()).to.be.true();
const devtoolsClosed = once(w.webContents, 'devtools-closed');
w.webContents.closeDevTools();
await devtoolsClosed;
expect(w.webContents.isDevToolsOpened()).to.be.false();
const devtoolsOpened2 = once(w.webContents, 'devtools-opened');
w.webContents.openDevTools({ mode: 'detach', activate: true });
await devtoolsOpened2;
expect(w.webContents.isDevToolsOpened()).to.be.true();
});
}); });
describe('setDevToolsTitle() API', () => { describe('setDevToolsTitle() API', () => {