Revert of cc: Combine analysis and raster

cc/resources/picture.cc

Index: cc/resources/picture.cc
diff --git a/cc/resources/picture.cc b/cc/resources/picture.cc
index cf8acb899b8bd001ccb0bc0a2c170f16104536e4..8c3be9c3bcacbb4034191a432ba6287eea763dea 100644
--- a/cc/resources/picture.cc
+++ b/cc/resources/picture.cc
@@ -298,6 +298,7 @@
 
 int Picture::Raster(
     SkCanvas* canvas,
+    SkDrawPictureCallback* callback,
     const Region& negated_content_region,
     float contents_scale) {
   TRACE_EVENT_BEGIN1(
@@ -315,7 +316,7 @@
 
   canvas->scale(contents_scale, contents_scale);
   canvas->translate(layer_rect_.x(), layer_rect_.y());
-  picture_->draw(canvas);
+  picture_->draw(canvas, callback);
   SkIRect bounds;
   canvas->getClipDeviceBounds(&bounds);
   canvas->restore();