29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Biru Mohanathas <birunthan@mohanathas.com>
|
||
|
|
Date: Thu, 10 Dec 2020 19:02:37 +0200
|
||
|
|
Subject: fix crash in NativeViewHost::SetParentAccessible
|
||
|
|
|
||
|
|
This fixes random crashes on Windows 10. It presumably started happening
|
||
|
|
after the changes in
|
||
|
|
https://chromium.googlesource.com/chromium/src.git/+/5c6c8e994bce2bfb867279ae5068e9f9134e70c3%5E!/#F15
|
||
|
|
|
||
|
|
For context, see: https://github.com/electron/electron/issues/26905
|
||
|
|
|
||
|
|
This patch can likely be upstreamed. The crash cannot be fixed without
|
||
|
|
patching something in Chromium - this is the least invasive change.
|
||
|
|
|
||
|
|
diff --git a/ui/views/controls/native/native_view_host.cc b/ui/views/controls/native/native_view_host.cc
|
||
|
|
index f9e1aa1b455ae49b59d53a75ae0634d0c092a130..4785f0c0368e0ab22db0cc968ad85d23a9b26240 100644
|
||
|
|
--- a/ui/views/controls/native/native_view_host.cc
|
||
|
|
+++ b/ui/views/controls/native/native_view_host.cc
|
||
|
|
@@ -55,6 +55,9 @@ void NativeViewHost::Detach() {
|
||
|
|
}
|
||
|
|
|
||
|
|
void NativeViewHost::SetParentAccessible(gfx::NativeViewAccessible accessible) {
|
||
|
|
+ if (!native_wrapper_.get())
|
||
|
|
+ return;
|
||
|
|
+
|
||
|
|
native_wrapper_->SetParentAccessible(accessible);
|
||
|
|
}
|
||
|
|
|