Use SkPictureRecorder::endRecordingAsPicture() instead of endRecording()

cc/resources/display_item_list.cc

 // Copyright 2014 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/display_item_list.h"
 
 #include <string>
 
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
@@ skipping 54 matching lines @@
   // that in Picture::Record.
   SkRTreeFactory factory;
   SkPictureRecorder recorder;
   skia::RefPtr<SkCanvas> canvas;
   canvas = skia::SharePtr(recorder.beginRecording(
       layer_rect_.width(), layer_rect_.height(), &factory));
   canvas->translate(-layer_rect_.x(), -layer_rect_.y());
   canvas->clipRect(gfx::RectToSkRect(layer_rect_));
   for (size_t i = 0; i < items_.size(); ++i)
     items_[i]->Raster(canvas.get(), NULL);
-  picture_ = skia::AdoptRef(recorder.endRecording());
+  picture_ = skia::AdoptRef(recorder.endRecordingAsPicture());
   DCHECK(picture_);
 }
 
 void DisplayItemList::AppendItem(scoped_ptr<DisplayItem> item) {
   is_suitable_for_gpu_rasterization_ &= item->IsSuitableForGpuRasterization();
   approximate_op_count_ += item->ApproximateOpCount();
   items_.push_back(item.Pass());
 }
 
 bool DisplayItemList::IsSuitableForGpuRasterization() const {
@@ skipping 34 matching lines @@
   state->SetValue("params.layer_rect",
                   MathUtil::AsValue(layer_rect_).release());
 
   SkPictureRecorder recorder;
   SkCanvas* canvas =
       recorder.beginRecording(layer_rect_.width(), layer_rect_.height());
   canvas->translate(-layer_rect_.x(), -layer_rect_.y());
   canvas->clipRect(gfx::RectToSkRect(layer_rect_));
   for (size_t i = 0; i < items_.size(); ++i)
     items_[i]->RasterForTracing(canvas);
-  skia::RefPtr<SkPicture> picture = skia::AdoptRef(recorder.endRecording());
+  skia::RefPtr<SkPicture> picture =
+      skia::AdoptRef(recorder.endRecordingAsPicture());
 
   std::string b64_picture;
   PictureDebugUtil::SerializeAsBase64(picture.get(), &b64_picture);
   state->SetString("skp64", b64_picture);
 
   return state;
 }
 
 void DisplayItemList::EmitTraceSnapshot() const {
   TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(
       TRACE_DISABLED_BY_DEFAULT("cc.debug.picture") ","
       TRACE_DISABLED_BY_DEFAULT("devtools.timeline.picture"),
       "cc::DisplayItemList", this, AsValue());
 }
 
 void DisplayItemList::GatherPixelRefs(const gfx::Size& grid_cell_size) {
   // This should be only called once, and only after CreateAndCacheSkPicture.
   DCHECK(picture_);
   DCHECK(!pixel_refs_);
   pixel_refs_ = make_scoped_ptr(new PixelRefMap(grid_cell_size));
   if (!picture_->willPlayBackBitmaps())
     return;
 
   pixel_refs_->GatherPixelRefsFromPicture(picture_.get());
 }
 }  // namespace cc