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

fix: use RenderViewReady to call InstallTransparency (#24390)

Browse source 
this fixes a crash with transparent OSR when GPU acceleration is
disabled
This commit is contained in:
Andy Dill 2020-07-06 11:57:14 -07:00 committed by GitHub
parent 99079c3bc7
commit cf74ee3d83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
shell/browser/osr/osr_render_widget_host_view.cc
View file

@ -222,7 +222,6 @@ OffScreenRenderWidgetHostView::OffScreenRenderWidgetHostView(
ResizeRootLayer(false); ResizeRootLayer(false);
render_widget_host_->SetView(this); render_widget_host_->SetView(this);
InstallTransparency();
if (content::GpuDataManager::GetInstance()->HardwareAccelerationEnabled()) { if (content::GpuDataManager::GetInstance()->HardwareAccelerationEnabled()) {
video_consumer_ = std::make_unique<OffScreenVideoConsumer>( video_consumer_ = std::make_unique<OffScreenVideoConsumer>(

5
shell/browser/osr/osr_web_contents_view.cc
View file

@ -143,7 +143,10 @@ OffScreenWebContentsView::CreateViewForChildWidget(
void OffScreenWebContentsView::SetPageTitle(const base::string16& title) {} void OffScreenWebContentsView::SetPageTitle(const base::string16& title) {}
void OffScreenWebContentsView::RenderViewReady() {} void OffScreenWebContentsView::RenderViewReady() {
if (GetView())
GetView()->InstallTransparency();
}
void OffScreenWebContentsView::RenderViewHostChanged( void OffScreenWebContentsView::RenderViewHostChanged(
content::RenderViewHost* old_host, content::RenderViewHost* old_host,