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

fix: native View wrapper crash missing when adding child view (#43638)

Browse source 
fix: native View wrapper crash missing when adding child view
This commit is contained in:
Shelley Vohr 2024-09-12 10:01:05 +02:00 committed by GitHub
parent dea6a4e5fb
commit 74b54278bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
shell/browser/ui/cocoa/delayed_native_view_host.mm
View file

@ -15,13 +15,9 @@ DelayedNativeViewHost::~DelayedNativeViewHost() = default;
void DelayedNativeViewHost::ViewHierarchyChanged(
const views::ViewHierarchyChangedDetails& details) {
// NativeViewHost doesn't expect to have children, so filter the
// ViewHierarchyChanged events before passing them on.
if (details.child == this) {
NativeViewHost::ViewHierarchyChanged(details);
if (details.is_add && GetWidget() && !native_view())
Attach(native_view_);
}
NativeViewHost::ViewHierarchyChanged(details);
if (details.is_add && GetWidget() && !native_view())
Attach(native_view_);
}
bool DelayedNativeViewHost::OnMousePressed(const ui::MouseEvent& ui_event) {

12
spec/api-view-spec.ts
View file

@ -36,6 +36,18 @@ describe('View', () => {
expect(w.contentView.children).to.have.lengthOf(1);
});
it('can be added as a child of another View', async () => {
const w = new BaseWindow();
const v1 = new View();
const v2 = new View();
v1.addChildView(v2);
w.contentView.addChildView(v1);
expect(w.contentView.children).to.deep.equal([v1]);
expect(v1.children).to.deep.equal([v2]);
});
it('correctly reorders children', () => {
w = new BaseWindow({ show: false });
const cv = new View();

14
spec/api-web-contents-view-spec.ts
View file

@ -135,6 +135,20 @@ describe('WebContentsView', () => {
expect(w.isFullScreen()).to.be.true('isFullScreen');
});
it('can be added as a child of another View', async () => {
const w = new BaseWindow();
const v = new View();
const wcv = new WebContentsView();
await wcv.webContents.loadURL('data:text/html,<div id="div">This is a simple div.</div>');
v.addChildView(wcv);
w.contentView.addChildView(v);
expect(w.contentView.children).to.deep.equal([v]);
expect(v.children).to.deep.equal([wcv]);
});
describe('visibilityState', () => {
async function haveVisibilityState (view: WebContentsView, state: string) {
const docVisState = await view.webContents.executeJavaScript('document.visibilityState');