Commit74b5427

authored

fix: nativeView wrapper crash missing when adding child view (electron#43638)

fix: native View wrapper crash missing when adding child view

1 parentdea6a4e commit74b5427Copy full SHA for 74b5427

File tree

+29

-7

lines changed

+29

-7

lines changed

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,9 @@`
`15`	`15`
`16`	`16`	`voidDelayedNativeViewHost::ViewHierarchyChanged(`
`17`	`17`	`const views::ViewHierarchyChangedDetails& details) {`
`18`		`-// NativeViewHost doesn't expect to have children, so filter the`
`19`		`-// ViewHierarchyChanged events before passing them on.`
`20`		`-if (details.child ==this) {`
`21`		`-NativeViewHost::ViewHierarchyChanged(details);`
`22`		`-if (details.is_add &&GetWidget() && !native_view())`
`23`		`-Attach(native_view_);`
`24`		`- }`
	`18`	`+NativeViewHost::ViewHierarchyChanged(details);`
	`19`	`+if (details.is_add &&GetWidget() && !native_view())`
	`20`	`+Attach(native_view_);`
`25`	`21`	`}`
`26`	`22`
`27`	`23`	`boolDelayedNativeViewHost::OnMousePressed(const ui::MouseEvent& ui_event) {`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,18 @@ describe('View', () => {`
`36`	`36`	`expect(w.contentView.children).to.have.lengthOf(1);`
`37`	`37`	`});`
`38`	`38`
	`39`	`+it('can be added as a child of another View',async()=>{`
	`40`	`+constw=newBaseWindow();`
	`41`	`+constv1=newView();`
	`42`	`+constv2=newView();`
	`43`	`+`
	`44`	`+v1.addChildView(v2);`
	`45`	`+w.contentView.addChildView(v1);`
	`46`	`+`
	`47`	`+expect(w.contentView.children).to.deep.equal([v1]);`
	`48`	`+expect(v1.children).to.deep.equal([v2]);`
	`49`	`+});`
	`50`	`+`
`39`	`51`	`it('correctly reorders children',()=>{`
`40`	`52`	`w=newBaseWindow({show:false});`
`41`	`53`	`constcv=newView();`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,20 @@ describe('WebContentsView', () => {`
`135`	`135`	`expect(w.isFullScreen()).to.be.true('isFullScreen');`
`136`	`136`	`});`
`137`	`137`
	`138`	`+it('can be added as a child of another View',async()=>{`
	`139`	`+constw=newBaseWindow();`
	`140`	`+constv=newView();`
	`141`	`+constwcv=newWebContentsView();`
	`142`	`+`
	`143`	`+awaitwcv.webContents.loadURL('data:text/html,<div id="div">This is a simple div.</div>');`
	`144`	`+`
	`145`	`+v.addChildView(wcv);`
	`146`	`+w.contentView.addChildView(v);`
	`147`	`+`
	`148`	`+expect(w.contentView.children).to.deep.equal([v]);`
	`149`	`+expect(v.children).to.deep.equal([wcv]);`
	`150`	`+});`
	`151`	`+`
`138`	`152`	`describe('visibilityState',()=>{`
`139`	`153`	`asyncfunctionhaveVisibilityState(view:WebContentsView,state:string){`
`140`	`154`	`constdocVisState=awaitview.webContents.executeJavaScript('document.visibilityState');`

Comments

(0)