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

fix: crash when focusing WebView webContents (#43921)

Browse source 
fix: crash when focusing WebView
This commit is contained in:
Shelley Vohr 2024-09-25 01:19:04 +02:00 • committed by GitHub
parent 500d4f0d05
commit bcf4095ace
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
shell/browser/api/electron_api_web_contents.cc
View file

@ -3339,6 +3339,12 @@ void WebContents::Focus() {
if (owner_window())
owner_window()->Focus(true);
#endif
// WebView uses WebContentsViewChildFrame, which doesn't have a Focus impl
// and triggers a fatal NOTREACHED.
if (is_guest())
return;
web_contents()->Focus();
}
@ -3782,7 +3788,8 @@ void WebContents::SetBackgroundColor(std::optional<SkColor> maybe_color) {
content::RenderWidgetHostView* rwhv = rfh->GetView();
if (rwhv) {
// RenderWidgetHostView doesn't allow setting an alpha that's not 0 or 255.
// RenderWidgetHostView doesn't allow setting an alpha that's not 0 or
// 255.
rwhv->SetBackgroundColor(is_opaque ? color : SK_ColorTRANSPARENT);
static_cast<content::RenderWidgetHostViewBase*>(rwhv)
->SetContentBackgroundColor(color);