Commit f7b69c53 authored by Peng Huang's avatar Peng Huang Committed by Commit Bot

Only create SkiaRenderer with GPU compositing.

The SkiaRenderer cannot handle SW compositing, chrome will crash if
the SkiaRenderer is created with a SW output surface. This CL fixes
the crash.

Bug: None
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel
Change-Id: I8e60c6e07a2f39cfda58af3a1ae7f190d3ed88f6
Reviewed-on: https://chromium-review.googlesource.com/1101159
Commit-Queue: Peng Huang <penghuang@chromium.org>
Reviewed-by: default avatarweiliangc <weiliangc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567426}
parent fcc47e41
...@@ -211,7 +211,9 @@ void Display::InitializeRenderer() { ...@@ -211,7 +211,9 @@ void Display::InitializeRenderer() {
resource_provider_ = std::make_unique<DisplayResourceProvider>( resource_provider_ = std::make_unique<DisplayResourceProvider>(
mode, output_surface_->context_provider(), bitmap_manager_); mode, output_surface_->context_provider(), bitmap_manager_);
if (settings_.use_skia_renderer) { if (settings_.use_skia_renderer && mode == DisplayResourceProvider::kGpu) {
// Check the compositing mode, because SkiaRenderer only works with GPU
// compositing.
DCHECK(output_surface_); DCHECK(output_surface_);
renderer_ = std::make_unique<SkiaRenderer>( renderer_ = std::make_unique<SkiaRenderer>(
&settings_, output_surface_.get(), resource_provider_.get(), &settings_, output_surface_.get(), resource_provider_.get(),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment