|
@@ -0,0 +1,28 @@
|
|
|
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
+From: Biru Mohanathas <[email protected]>
|
|
|
+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 4779e4f07d923b5af9ba05c2765cf294e75dcc14..6112217d532251f7f6850c23be5c312a908df1e2 100644
|
|
|
+--- a/ui/views/controls/native/native_view_host.cc
|
|
|
++++ b/ui/views/controls/native/native_view_host.cc
|
|
|
+@@ -54,6 +54,9 @@ void NativeViewHost::Detach() {
|
|
|
+ }
|
|
|
+
|
|
|
+ void NativeViewHost::SetParentAccessible(gfx::NativeViewAccessible accessible) {
|
|
|
++ if (!native_wrapper_.get())
|
|
|
++ return;
|
|
|
++
|
|
|
+ native_wrapper_->SetParentAccessible(accessible);
|
|
|
+ }
|
|
|
+
|