Prevent use of GPU IDC in Resourceless Software Draw

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 f4733c5730c0fccb28ec644fd02d7fad009b5958..9323358d8cefb4717099e56cfaf00ed8f6363bcd 100644
--- a/cc/output/software_renderer.h
+++ b/cc/output/software_renderer.h
@@ -30,7 +30,8 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
       RendererClient* client,
       const RendererSettings* settings,
       OutputSurface* output_surface,
-      ResourceProvider* resource_provider);
+      ResourceProvider* resource_provider,
+      bool use_image_hijack_canvas);
 
   ~SoftwareRenderer() override;
   const RendererCapabilitiesImpl& Capabilities() const override;
@@ -63,7 +64,8 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
   SoftwareRenderer(RendererClient* client,
                    const RendererSettings* settings,
                    OutputSurface* output_surface,
-                   ResourceProvider* resource_provider);
+                   ResourceProvider* resource_provider,
+                   bool use_image_hijack_canvas);
 
   void DidChangeVisibility() override;
 
@@ -115,6 +117,13 @@ 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);
 };