Removed use_skia_renderer_non_ddl from RenderSettings

This is follow-up CL to 1695991

Bug: 981934
Change-Id: I9db3fed87596d5da5b96fae8d3db72be44bac938
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1697762Reviewed-by: Eric Karl <ericrk@chromium.org>
Reviewed-by: Jonathan Backer <backer@chromium.org>
Reviewed-by: Ken Buchanan <kenrb@chromium.org>
Commit-Queue: Vasiliy Telezhnikov <vasilyt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#678383}

android_webview/browser/gfx/surfaces_instance.cc

@@ -207,7 +207,6 @@ SurfacesInstance::SurfacesInstance()
   settings.should_clear_root_render_pass = false;
 
   settings.use_skia_renderer = features::IsUsingSkiaRenderer();
-  settings.use_skia_renderer_non_ddl = features::IsUsingSkiaRendererNonDDL();
 
   // The SharedBitmapManager is null as we do not support or use software
   // compositing on Android.
@@ -222,8 +221,6 @@ SurfacesInstance::SurfacesInstance()
       this, frame_sink_manager_.get(), frame_sink_id_, is_root,
       needs_sync_points);
 
-  const bool use_skia_renderer =
-      settings.use_skia_renderer || settings.use_skia_renderer_non_ddl;
   auto* command_line = base::CommandLine::ForCurrentProcess();
   const bool enable_vulkan =
       command_line->HasSwitch(switches::kWebViewEnableVulkan);
@@ -232,7 +229,7 @@ SurfacesInstance::SurfacesInstance()
   LOG_IF(FATAL, enable_vulkan && !enable_shared_image)
       << "--webview-enable-vulkan only works with shared image "
          "(--webview-enable-shared-image).";
-  LOG_IF(FATAL, enable_vulkan && !use_skia_renderer)
+  LOG_IF(FATAL, enable_vulkan && !settings.use_skia_renderer)
       << "--webview-enable-vulkan only works with skia renderer "
          "(--enable-features=UseSkiaRenderer or UseSkiaRendererNonDDL).";
 
@@ -240,7 +237,7 @@ SurfacesInstance::SurfacesInstance()
       enable_vulkan ? AwVulkanContextProvider::GetOrCreateInstance() : nullptr;
   std::unique_ptr<viz::OutputSurface> output_surface;
   gl_surface_ = base::MakeRefCounted<AwGLSurface>();
-  if (settings.use_skia_renderer || settings.use_skia_renderer_non_ddl) {
+  if (settings.use_skia_renderer) {
     auto* task_executor = DeferredGpuCommandService::GetInstance();
     gpu::GpuDriverBugWorkarounds workarounds(
         task_executor->gpu_feature_info().enabled_gpu_driver_bug_workarounds);
@@ -256,14 +253,10 @@ SurfacesInstance::SurfacesInstance()
       shared_context_state_->InitializeGrContext(workarounds,
                                                  nullptr /* gr_shader_cache */);
     }
-    if (settings.use_skia_renderer_non_ddl) {
-      NOTIMPLEMENTED();
-    } else {
     output_surface = std::make_unique<viz::SkiaOutputSurfaceImpl>(
         std::make_unique<SkiaOutputSurfaceDependencyWebView>(
             task_executor, workarounds, shared_context_state_, gl_surface_),
         settings);
-    }
   } else {
     auto context_provider = AwRenderThreadContextProvider::Create(
         gl_surface_, DeferredGpuCommandService::GetInstance());

components/viz/common/display/renderer_settings.h

@@ -32,7 +32,6 @@ class VIZ_COMMON_EXPORT RendererSettings {
   bool tint_gl_composited_content = false;
   bool show_overdraw_feedback = false;
   bool use_skia_renderer = false;
-  bool use_skia_renderer_non_ddl = false;
   bool allow_overlays = true;
   bool dont_round_texture_sizes_for_pixel_tests = false;
   int highp_threshold_min = 0;

components/viz/common/features.cc

@@ -41,10 +41,6 @@ const base::Feature kUseSkiaForGLReadback{"UseSkiaForGLReadback",
 const base::Feature kUseSkiaRenderer{"UseSkiaRenderer",
                                      base::FEATURE_DISABLED_BY_DEFAULT};
 
-// Use the SkiaRenderer without DDL.
-const base::Feature kUseSkiaRendererNonDDL{"UseSkiaRendererNonDDL",
-                                           base::FEATURE_DISABLED_BY_DEFAULT};
-
 // Use the SkiaRenderer to record SkPicture.
 const base::Feature kRecordSkPicture{"RecordSkPicture",
                                      base::FEATURE_DISABLED_BY_DEFAULT};
@@ -101,18 +97,6 @@ bool IsUsingSkiaRenderer() {
   return enabled;
 }
 
-bool IsUsingSkiaRendererNonDDL() {
-  // We require OOP-D everywhere but WebView.
-  bool enabled = base::FeatureList::IsEnabled(kUseSkiaRendererNonDDL);
-#if !defined(OS_ANDROID)
-  if (enabled && !IsVizDisplayCompositorEnabled()) {
-    DLOG(ERROR) << "UseSkiaRendererNonDDL requires VizDisplayCompositor.";
-    return false;
-  }
-#endif  // !defined(OS_ANDROID)
-  return enabled;
-}
-
 bool IsRecordingSkPicture() {
   return IsUsingSkiaRenderer() &&
          base::FeatureList::IsEnabled(kRecordSkPicture);

components/viz/common/features.h

@@ -15,7 +15,6 @@ VIZ_COMMON_EXPORT extern const base::Feature kEnableSurfaceSynchronization;
 VIZ_COMMON_EXPORT extern const base::Feature kEnableVizHitTestSurfaceLayer;
 VIZ_COMMON_EXPORT extern const base::Feature kUseSkiaForGLReadback;
 VIZ_COMMON_EXPORT extern const base::Feature kUseSkiaRenderer;
-VIZ_COMMON_EXPORT extern const base::Feature kUseSkiaRendererNonDDL;
 VIZ_COMMON_EXPORT extern const base::Feature kRecordSkPicture;
 VIZ_COMMON_EXPORT extern const base::Feature kVizDisplayCompositor;
 
@@ -26,7 +25,6 @@ VIZ_COMMON_EXPORT bool IsVizHitTestingDrawQuadEnabled();
 VIZ_COMMON_EXPORT bool IsVizHitTestingSurfaceLayerEnabled();
 VIZ_COMMON_EXPORT bool IsUsingSkiaForGLReadback();
 VIZ_COMMON_EXPORT bool IsUsingSkiaRenderer();
-VIZ_COMMON_EXPORT bool IsUsingSkiaRendererNonDDL();
 VIZ_COMMON_EXPORT bool IsRecordingSkPicture();
 
 }  // namespace features

components/viz/host/renderer_settings_creation.cc

@@ -64,8 +64,6 @@ RendererSettings CreateRendererSettings() {
   renderer_settings.allow_antialiasing =
       !command_line->HasSwitch(switches::kDisableCompositedAntialiasing);
   renderer_settings.use_skia_renderer = features::IsUsingSkiaRenderer();
-  renderer_settings.use_skia_renderer_non_ddl =
-      features::IsUsingSkiaRendererNonDDL();
 #if defined(OS_MACOSX)
   renderer_settings.allow_overlays =
       ui::RemoteLayerAPISupported() &&

components/viz/service/display/display.cc

@@ -338,9 +338,7 @@ void Display::InitializeRenderer(bool enable_shared_images) {
   resource_provider_ = std::make_unique<DisplayResourceProvider>(
       mode, output_surface_->context_provider(), bitmap_manager_,
       enable_shared_images);
-  const bool use_skia_renderer =
-      settings_.use_skia_renderer || settings_.use_skia_renderer_non_ddl;
-  if (use_skia_renderer && mode == DisplayResourceProvider::kGpu) {
+  if (settings_.use_skia_renderer && mode == DisplayResourceProvider::kGpu) {
     // Default to use DDL if skia_output_surface is not null.
     if (skia_output_surface_) {
       renderer_ = std::make_unique<SkiaRenderer>(

components/viz/service/display_embedder/output_surface_provider_impl.cc

@@ -111,21 +111,16 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
   if (!gpu_compositing) {
     output_surface = std::make_unique<SoftwareOutputSurface>(
         CreateSoftwareOutputDeviceForPlatform(surface_handle, display_client));
-  } else if (renderer_settings.use_skia_renderer ||
-             renderer_settings.use_skia_renderer_non_ddl) {
+  } else if (renderer_settings.use_skia_renderer) {
 #if defined(OS_MACOSX)
     // TODO(penghuang): Support SkiaRenderer for all platforms.
     NOTIMPLEMENTED();
     return nullptr;
 #else
-    if (renderer_settings.use_skia_renderer_non_ddl) {
-      NOTIMPLEMENTED();
-    } else {
     output_surface = std::make_unique<SkiaOutputSurfaceImpl>(
         std::make_unique<SkiaOutputSurfaceDependencyImpl>(gpu_service_impl_,
                                                           surface_handle),
         renderer_settings);
-    }
 #endif
   } else {
     DCHECK(task_executor_);

services/viz/privileged/interfaces/compositing/renderer_settings.mojom

@@ -20,7 +20,6 @@ struct RendererSettings {
   bool show_overdraw_feedback;
   int32 slow_down_compositing_scale_factor;
   bool use_skia_renderer;
-  bool use_skia_renderer_non_ddl;
   bool record_sk_picture;
   bool allow_overlays;
   bool requires_alpha_channel;

services/viz/privileged/interfaces/compositing/renderer_settings_struct_traits.cc

@@ -29,7 +29,6 @@ bool StructTraits<viz::mojom::RendererSettingsDataView, viz::RendererSettings>::
   out->slow_down_compositing_scale_factor =
       data.slow_down_compositing_scale_factor();
   out->use_skia_renderer = data.use_skia_renderer();
-  out->use_skia_renderer_non_ddl = data.use_skia_renderer_non_ddl();
   out->record_sk_picture = data.record_sk_picture();
   out->allow_overlays = data.allow_overlays();
   out->requires_alpha_channel = data.requires_alpha_channel();

services/viz/privileged/interfaces/compositing/renderer_settings_struct_traits.h

@@ -67,10 +67,6 @@ struct StructTraits<viz::mojom::RendererSettingsDataView,
     return input.use_skia_renderer;
   }
 
-  static bool use_skia_renderer_non_ddl(const viz::RendererSettings& input) {
-    return input.use_skia_renderer_non_ddl;
-  }
-
   static bool record_sk_picture(const viz::RendererSettings& input) {
     return input.record_sk_picture;
   }

services/viz/privileged/interfaces/struct_traits_unittest.cc

@@ -29,7 +29,6 @@ TEST_F(StructTraitsTest, RendererSettings) {
   input.show_overdraw_feedback = true;
   input.highp_threshold_min = -1;
   input.use_skia_renderer = true;
-  input.use_skia_renderer_non_ddl = true;
 
   RendererSettings output;
   mojom::RendererSettings::Deserialize(
@@ -48,7 +47,6 @@ TEST_F(StructTraitsTest, RendererSettings) {
   EXPECT_EQ(input.show_overdraw_feedback, output.show_overdraw_feedback);
   EXPECT_EQ(input.highp_threshold_min, output.highp_threshold_min);
   EXPECT_EQ(input.use_skia_renderer, output.use_skia_renderer);
-  EXPECT_EQ(input.use_skia_renderer_non_ddl, output.use_skia_renderer_non_ddl);
 }
 
 }  // namespace