Switch to one-at-a-time SkPicture::clone interface

cc/resources/picture.cc

 // 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.
 
 #include "cc/resources/picture.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 
@@ skipping 213 matching lines @@
     return;
   }
 
   DCHECK(picture_);
   DCHECK(clones_.empty());
 
   // We can re-use this picture for one raster worker thread.
   raster_thread_checker_.DetachFromThread();
 
   if (num_threads > 1) {
-    scoped_ptr<SkPicture[]> clones(new SkPicture[num_threads - 1]);
-    picture_->clone(&clones[0], num_threads - 1);
-
     for (int i = 0; i < num_threads - 1; i++) {
-      scoped_refptr<Picture> clone = make_scoped_refptr(
-          new Picture(skia::AdoptRef(new SkPicture(clones[i])),
-                      layer_rect_,
-                      opaque_rect_,
-                      pixel_refs_));
+      scoped_refptr<Picture> clone =
+          make_scoped_refptr(new Picture(skia::AdoptRef(picture_->clone()),

[danakj, 2014/07/11 15:30:40]

nit: FWIW make_scoped_refptr is redundant, that conversion happens implicitly.

[robertphillips, 2014/07/11 15:59:42]

Done.

+                                         layer_rect_,
+                                         opaque_rect_,
+                                         pixel_refs_));
       clones_.push_back(clone);
 
       clone->EmitTraceSnapshotAlias(this);
       clone->raster_thread_checker_.DetachFromThread();
     }
   }
 }
 
 void Picture::Record(ContentLayerClient* painter,
                      const SkTileGridFactory::TileGridInfo& tile_grid_info,
@@ skipping 344 matching lines @@
 
 scoped_refptr<base::debug::ConvertableToTraceFormat>
     Picture::AsTraceableRecordData() const {
   scoped_ptr<base::DictionaryValue> record_data(new base::DictionaryValue());
   record_data->Set("picture_id", TracedValue::CreateIDRef(this).release());
   record_data->Set("layer_rect", MathUtil::AsValue(layer_rect_).release());
   return TracedValue::FromValue(record_data.release());
 }
 
 }  // namespace cc