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..71be48a2dfa18cee61eeb8c42de784930badaa8f 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;
 
@@ -114,6 +116,7 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
   std::unique_ptr<ResourceProvider::ScopedWriteLockSoftware>
       current_framebuffer_lock_;
   sk_sp<SkCanvas> current_framebuffer_canvas_;
+  const bool use_image_hijack_canvas_;

[vmpstr, 2016/06/02 19:57:47]

Can you add a comment here explaining what this does. 

[ericrk, 2016/06/02 20:45:36]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(SoftwareRenderer);
 };