| 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 69be32e062da002bc9cab9040c6376ad95054a60..ca0541d0de584244edf788d091ef956e6eed82e7 100644
|
| --- a/cc/test/fake_content_layer_client.cc
|
| +++ b/cc/test/fake_content_layer_client.cc
|
| @@ -60,8 +60,7 @@ FakeContentLayerClient::PaintContentsToDisplayList(
|
| recorder.beginRecording(gfx::RectFToSkRect(draw_rect));
|
| canvas->drawRect(gfx::RectFToSkRect(draw_rect), flags);
|
| display_list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
|
| - ToEnclosingRect(draw_rect), recorder.finishRecordingAsPicture(),
|
| - gfx::RectFToSkRect(draw_rect));
|
| + ToEnclosingRect(draw_rect), recorder.finishRecordingAsPicture());
|
| }
|
|
|
| for (ImageVector::const_iterator it = draw_images_.begin();
|
| @@ -70,12 +69,11 @@ FakeContentLayerClient::PaintContentsToDisplayList(
|
| display_list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(
|
| it->transform);
|
| }
|
| - PaintCanvas* canvas =
|
| - recorder.beginRecording(gfx::RectToSkRect(PaintableRegion()));
|
| + PaintCanvas* canvas = recorder.beginRecording(
|
| + it->image.sk_image()->width(), it->image.sk_image()->height());
|
| canvas->drawImage(it->image, it->point.x(), it->point.y(), &it->flags);
|
| display_list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
|
| - PaintableRegion(), recorder.finishRecordingAsPicture(),
|
| - gfx::RectToSkRect(PaintableRegion()));
|
| + PaintableRegion(), recorder.finishRecordingAsPicture());
|
| if (!it->transform.IsIdentity()) {
|
| display_list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
|
| }
|
| @@ -91,8 +89,7 @@ FakeContentLayerClient::PaintContentsToDisplayList(
|
| recorder.beginRecording(gfx::RectToSkRect(draw_rect));
|
| canvas->drawIRect(gfx::RectToSkIRect(draw_rect), flags);
|
| display_list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
|
| - draw_rect, recorder.finishRecordingAsPicture(),
|
| - gfx::RectToSkRect(draw_rect));
|
| + draw_rect, recorder.finishRecordingAsPicture());
|
| draw_rect.Inset(1, 1);
|
| }
|
| }
|
|
|