| Index: cc/test/fake_content_layer_client.cc
|
| diff --git a/cc/test/fake_content_layer_client.cc b/cc/test/fake_content_layer_client.cc
|
| index 6370a2ef328d7048a786f061bc97e8171b0ddb95..97492679241255300d0d66ab6bdd440b9e407e92 100644
|
| --- a/cc/test/fake_content_layer_client.cc
|
| +++ b/cc/test/fake_content_layer_client.cc
|
| @@ -62,26 +62,23 @@ FakeContentLayerClient::PaintContentsToDisplayList(
|
| skia::SharePtr(recorder.beginRecording(gfx::RectFToSkRect(draw_rect)));
|
| canvas->drawRect(gfx::RectFToSkRect(draw_rect), paint);
|
| picture = skia::AdoptRef(recorder.endRecordingAsPicture());
|
| - auto* item = display_list->CreateAndAppendItem<DrawingDisplayItem>(
|
| - ToEnclosingRect(draw_rect));
|
| - item->SetNew(std::move(picture));
|
| + display_list->CreateAndAppendItem<DrawingDisplayItem>(
|
| + ToEnclosingRect(draw_rect), std::move(picture));
|
| }
|
|
|
| for (ImageVector::const_iterator it = draw_images_.begin();
|
| it != draw_images_.end(); ++it) {
|
| if (!it->transform.IsIdentity()) {
|
| - auto* item = display_list->CreateAndAppendItem<TransformDisplayItem>(
|
| - PaintableRegion());
|
| - item->SetNew(it->transform);
|
| + display_list->CreateAndAppendItem<TransformDisplayItem>(PaintableRegion(),
|
| + it->transform);
|
| }
|
| canvas = skia::SharePtr(
|
| recorder.beginRecording(it->image->width(), it->image->height()));
|
| canvas->drawImage(it->image.get(), it->point.x(), it->point.y(),
|
| &it->paint);
|
| picture = skia::AdoptRef(recorder.endRecordingAsPicture());
|
| - auto* item = display_list->CreateAndAppendItem<DrawingDisplayItem>(
|
| - PaintableRegion());
|
| - item->SetNew(std::move(picture));
|
| + display_list->CreateAndAppendItem<DrawingDisplayItem>(PaintableRegion(),
|
| + std::move(picture));
|
| if (!it->transform.IsIdentity()) {
|
| display_list->CreateAndAppendItem<EndTransformDisplayItem>(
|
| PaintableRegion());
|
| @@ -98,9 +95,8 @@ FakeContentLayerClient::PaintContentsToDisplayList(
|
| skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(draw_rect)));
|
| canvas->drawIRect(gfx::RectToSkIRect(draw_rect), paint);
|
| picture = skia::AdoptRef(recorder.endRecordingAsPicture());
|
| - auto* item =
|
| - display_list->CreateAndAppendItem<DrawingDisplayItem>(draw_rect);
|
| - item->SetNew(std::move(picture));
|
| + display_list->CreateAndAppendItem<DrawingDisplayItem>(draw_rect,
|
| + std::move(picture));
|
| draw_rect.Inset(1, 1);
|
| }
|
| }
|
|
|