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

fix: detach native view when its removed from parent on macOS (#43922)

Browse source 
Right now DelayedNativeViewHost attaches its underlying native view
when it's being attached to a widget but it doesn't detach it when
it's being detached. It may lead to use-after-free and crash.

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Cezary Kulakowski <cezary@openfin.co>
This commit is contained in:
trop[bot] 2024-09-25 13:17:59 +02:00 • committed by GitHub
commit 134176a1d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,8 @@ DelayedNativeViewHost::~DelayedNativeViewHost() = default;
void DelayedNativeViewHost::ViewHierarchyChanged( void DelayedNativeViewHost::ViewHierarchyChanged(
const views::ViewHierarchyChangedDetails& details) { const views::ViewHierarchyChangedDetails& details) {
if (!details.is_add && native_view())
Detach();
NativeViewHost::ViewHierarchyChanged(details); NativeViewHost::ViewHierarchyChanged(details);
if (details.is_add && GetWidget() && !native_view()) if (details.is_add && GetWidget() && !native_view())
Attach(native_view_); Attach(native_view_);