telemetry: Refactored rasterize_and_record measurement.

cc/resources/picture.h

 // Copyright 2012 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.
 
 #ifndef CC_RESOURCES_PICTURE_H_
 #define CC_RESOURCES_PICTURE_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 50 matching lines @@
   void Record(ContentLayerClient* client,
               const SkTileGridPicture::TileGridInfo& tile_grid_info);
 
   // Gather pixel refs from recording.
   void GatherPixelRefs(const SkTileGridPicture::TileGridInfo& tile_grid_info);
 
   // Has Record() been called yet?
   bool HasRecording() const { return picture_.get() != NULL; }
 
   // Apply this contents scale and raster the content rect into the canvas.
-  void Raster(SkCanvas* canvas,
-              SkDrawPictureCallback* callback,
-              gfx::Rect content_rect,
-              float contents_scale);
+  int Raster(SkCanvas* canvas,
+             SkDrawPictureCallback* callback,
+             gfx::Rect content_rect,
+             float contents_scale);
 
   // Draw the picture directly into the given canvas, without applying any
   // clip/scale/layer transformations.
   void Replay(SkCanvas* canvas);
 
   scoped_ptr<base::Value> AsValue() const;
 
   class CC_EXPORT PixelRefIterator {
    public:
     PixelRefIterator();
@@ skipping 62 matching lines @@
     AsTraceableRecordData() const;
 
   friend class base::RefCountedThreadSafe<Picture>;
   friend class PixelRefIterator;
   DISALLOW_COPY_AND_ASSIGN(Picture);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PICTURE_H_