| Index: cc/debug/rasterize_and_record_benchmark_impl.cc
|
| diff --git a/cc/debug/rasterize_and_record_benchmark_impl.cc b/cc/debug/rasterize_and_record_benchmark_impl.cc
|
| index d4b4c110eb842b7bc8ed4e0a3fb2b375dacb1f87..ee819349fee10c18327164bd79322560c534a7e3 100644
|
| --- a/cc/debug/rasterize_and_record_benchmark_impl.cc
|
| +++ b/cc/debug/rasterize_and_record_benchmark_impl.cc
|
| @@ -133,7 +133,7 @@ void RasterizeAndRecordBenchmarkImpl::DidCompleteCommit(
|
| },
|
| CallFunctionLayerType::ALL_LAYERS);
|
|
|
| - scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());
|
| + std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
|
| result->SetDouble("rasterize_time_ms",
|
| rasterize_results_.total_best_time.InMillisecondsF());
|
| result->SetDouble("total_pictures_in_pile_size",
|
| @@ -172,10 +172,11 @@ void RasterizeAndRecordBenchmarkImpl::RunOnLayer(PictureLayerImpl* layer) {
|
| // it takes to rasterize content. As such, the actual settings used here don't
|
| // really matter.
|
| const LayerTreeSettings& settings = layer->layer_tree_impl()->settings();
|
| - scoped_ptr<PictureLayerTilingSet> tiling_set = PictureLayerTilingSet::Create(
|
| - layer->GetTree(), &client, settings.tiling_interest_area_padding,
|
| - settings.skewport_target_time_in_seconds,
|
| - settings.skewport_extrapolation_limit_in_content_pixels);
|
| + std::unique_ptr<PictureLayerTilingSet> tiling_set =
|
| + PictureLayerTilingSet::Create(
|
| + layer->GetTree(), &client, settings.tiling_interest_area_padding,
|
| + settings.skewport_target_time_in_seconds,
|
| + settings.skewport_extrapolation_limit_in_content_pixels);
|
|
|
| PictureLayerTiling* tiling =
|
| tiling_set->AddTiling(1.f, layer->GetRasterSource());
|
|
|