cc: Support on demand raster with ganesh

cc/output/software_renderer.cc

Index: cc/output/software_renderer.cc
diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc
index d0f97c0c58e973d6aa7152fbf354d52e16a78ab9..7acfb9ef3386871ba452d02e1f8258eb2e778a79 100644
--- a/cc/output/software_renderer.cc
+++ b/cc/output/software_renderer.cc
@@ -389,13 +389,18 @@ void SoftwareRenderer::DrawPictureQuad(const DrawingFrame* frame,
   TRACE_EVENT0("cc",
                "SoftwareRenderer::DrawPictureQuad");
 
-  // Create and run on-demand raster task for tile.
-  scoped_refptr<Task> on_demand_raster_task(
-      new OnDemandRasterTaskImpl(quad->picture_pile,
-                                 current_canvas_,
-                                 quad->content_rect,
-                                 quad->contents_scale));
-  RunOnDemandRasterTask(on_demand_raster_task.get());
+  if (client_->UseTaskGraphRunnerForOnDemandRaster()) {
+    // Create and run on-demand raster task for tile.
+    scoped_refptr<Task> on_demand_raster_task(
+        new OnDemandRasterTaskImpl(quad->picture_pile,
+                                   current_canvas_,
+                                   quad->content_rect,
+                                   quad->contents_scale));
+    RunOnDemandRasterTask(on_demand_raster_task.get());
+  } else {
+    quad->picture_pile->RasterDirect(
+        current_canvas_, quad->content_rect, quad->contents_scale, NULL);
+  }
 
   current_canvas_->setDrawFilter(NULL);
 }