Use a cc::Display for WebView resourceless software draws.

cc/output/software_renderer.h

Index: cc/output/software_renderer.h
diff --git a/cc/output/software_renderer.h b/cc/output/software_renderer.h
index 5a0bb04d4c74fff37a38885327aea2fccff43049..c7e0f809d43fd3171f34b0f069b3e115ebfb16d4 100644
--- a/cc/output/software_renderer.h
+++ b/cc/output/software_renderer.h
@@ -30,8 +30,7 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
       RendererClient* client,
       const RendererSettings* settings,
       OutputSurface* output_surface,
-      ResourceProvider* resource_provider,
-      bool use_image_hijack_canvas);
+      ResourceProvider* resource_provider);
 
   ~SoftwareRenderer() override;
   const RendererCapabilitiesImpl& Capabilities() const override;
@@ -40,6 +39,10 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
   void DiscardBackbuffer() override;
   void EnsureBackbuffer() override;
 
+  void SetDisablePictureQuadImageFiltering(bool disable) {
+    disable_picture_quad_image_filtering_ = disable;
+  }
+
  protected:
   void BindFramebufferToOutputSurface(DrawingFrame* frame) override;
   bool BindFramebufferToTexture(DrawingFrame* frame,
@@ -64,8 +67,7 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
   SoftwareRenderer(RendererClient* client,
                    const RendererSettings* settings,
                    OutputSurface* output_surface,
-                   ResourceProvider* resource_provider,
-                   bool use_image_hijack_canvas);
+                   ResourceProvider* resource_provider);
 
   void DidChangeVisibility() override;
 
@@ -104,6 +106,8 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
       const RenderPassDrawQuad* quad,
       SkShader::TileMode content_tile_mode) const;
 
+  bool disable_picture_quad_image_filtering_ = false;
+
   RendererCapabilitiesImpl capabilities_;
   bool is_scissor_enabled_;
   bool is_backbuffer_discarded_;
@@ -117,13 +121,6 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
       current_framebuffer_lock_;
   sk_sp<SkCanvas> current_framebuffer_canvas_;
 
-  // Indicates whether content rasterization should happen through an
-  // ImageHijackCanvas, which causes image decodes to be managed by an
-  // ImageDecodeController. We set this to false during resourceless software
-  // draw when a GPU ImageDecodeController is in use, as software rasterization
-  // cannot use the GPU IDC.
-  const bool use_image_hijack_canvas_;
-
   DISALLOW_COPY_AND_ASSIGN(SoftwareRenderer);
 };