Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: prevent potential modal window close segfault #22540

Merged
merged 1 commit into from Mar 5, 2020
Merged

fix: prevent potential modal window close segfault #22540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion shell/browser/native_window_mac.mm
View file
Open in desktop
Expand Up @@ -529,7 +529,14 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
void NativeWindowMac::Close() {
// When this is a sheet showing, performClose won't work.
if (is_modal() && parent() && IsVisible()) {
[parent()->GetNativeWindow().GetNativeNSWindow() endSheet:window_];
NSWindow* window = parent()->GetNativeWindow().GetNativeNSWindow();
if (NSWindow* sheetParent = [window sheetParent]) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(base::RetainBlock(^{
[sheetParent endSheet:window];
})));
}

// Manually emit close event (not triggered from close fn)
NotifyWindowCloseButtonClicked();
CloseImmediately();
Expand Down
50 changes: 45 additions & 5 deletions spec-main/api-browser-window-spec.ts
View file
Open in desktop
Expand Up @@ -3008,15 +3008,53 @@ describe('BrowserWindow module', () => {
})

// The isEnabled API is not reliable on macOS.
ifdescribe(process.platform !== 'darwin')('modal option', () => {
it('disables parent window', () => {
describe('modal option', () => {
it('does not crash', async () => {
const parentWindow = new BrowserWindow()

const createTwo = async () => {
const two = new BrowserWindow({
width: 300,
height: 200,
parent: parentWindow,
modal: true,
show: false
})

const twoShown = emittedOnce(two, 'show')
two.show()
await twoShown
setTimeout(() => two.close(), 500)

await emittedOnce(two, 'closed')
}

const one = new BrowserWindow({
width: 600,
height: 400,
parent: parentWindow,
modal: true,
show: false
})

const oneShown = emittedOnce(one, 'show')
one.show()
await oneShown
setTimeout(() => one.destroy(), 500)

await emittedOnce(one, 'closed')
await createTwo()
})

ifit(process.platform !== 'darwin')('disables parent window', () => {
const w = new BrowserWindow({show: false})
const c = new BrowserWindow({ show: false, parent: w, modal: true })
expect(w.isEnabled()).to.be.true('w.isEnabled')
c.show()
expect(w.isEnabled()).to.be.false('w.isEnabled')
})
it('re-enables an enabled parent window when closed', (done) => {

ifit(process.platform !== 'darwin')('re-enables an enabled parent window when closed', (done) => {
const w = new BrowserWindow({show: false})
const c = new BrowserWindow({ show: false, parent: w, modal: true })
c.once('closed', () => {
Expand All @@ -3026,7 +3064,8 @@ describe('BrowserWindow module', () => {
c.show()
c.close()
})
it('does not re-enable a disabled parent window when closed', (done) => {

ifit(process.platform !== 'darwin')('does not re-enable a disabled parent window when closed', (done) => {
const w = new BrowserWindow({show: false})
const c = new BrowserWindow({ show: false, parent: w, modal: true })
c.once('closed', () => {
Expand All @@ -3037,7 +3076,8 @@ describe('BrowserWindow module', () => {
c.show()
c.close()
})
it('disables parent window recursively', () => {

ifit(process.platform !== 'darwin')('disables parent window recursively', () => {
const w = new BrowserWindow({show: false})
const c = new BrowserWindow({ show: false, parent: w, modal: true })
const c2 = new BrowserWindow({ show: false, parent: w, modal: true })
Expand Down