Fix end2end intermittent crash on macOS if custom OSWindow is used.

In MultisammpleTest, a custom OSWindow object is created. Sometimes this window's internal Objective-C window object is not released after the test finishes, thus input events such as mouse/keyboard are still forwarded to this window. However its content view is already released causing the crash. call [mWindow setContentView:nil] inside OSXWindow::destroy() seems to fix this bug. Bug: angleproject:4815 Change-Id: If00398ff0082624ade5e8be8ad3b0f91d17c23ed Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2281782 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Fix end2end intermittent crash on macOS if custom OSWindow is used.
10ef43ce · Le Hoang Quyen · Commit Bot · b8583bcc · 10ef43ce
Commit 10ef43ce authored Jul 06, 2020 by Le Hoang Quyen Committed by Commit Bot Jul 06, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

OSXWindow.mm util/osx/OSXWindow.mm +2 -0

No files found.
--- a/util/osx/OSXWindow.mm
+++ b/util/osx/OSXWindow.mm
@@ -685,6 +685,8 @@ void OSXWindow::destroy()
    [mDelegate onOSXWindowDeleted];
    [mDelegate release];
    mDelegate = nil;
+    // NSWindow won't be completely released unless its content view is set to nil:
+    [mWindow setContentView:nil];
    [mWindow release];
    mWindow = nil;
 }