Revert of cc: Combine analysis and raster

cc/debug/rasterize_and_record_benchmark_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/debug/rasterize_and_record_benchmark_impl.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/basictypes.h"
@@ skipping 79 matching lines @@
       bitmap.setConfig(SkBitmap::kARGB_8888_Config,
                        content_rect.width(),
                        content_rect.height());
       bitmap.allocPixels();
 
       SkBitmapDevice device(bitmap);
       SkCanvas canvas(&device);
       PicturePileImpl::Analysis analysis;
 
       base::TimeTicks start = Now();
+      picture_pile->AnalyzeInRect(
+          content_rect, contents_scale, &analysis, NULL);
       picture_pile->RasterToBitmap(&canvas, content_rect, contents_scale, NULL);
       base::TimeTicks end = Now();
       base::TimeDelta duration = end - start;
       if (duration < min_time)
         min_time = duration;
     }
 
     rasterize_results_.pixels_rasterized +=
         content_rect.width() * content_rect.height();
     rasterize_results_.total_best_time += min_time;
   }
 }
 
 RasterizeAndRecordBenchmarkImpl::RasterizeResults::RasterizeResults()
     : pixels_rasterized(0) {}
 
 RasterizeAndRecordBenchmarkImpl::RasterizeResults::~RasterizeResults() {}
 
 }  // namespace cc