| Index: cc/playback/raster_source.cc
|
| diff --git a/cc/playback/raster_source.cc b/cc/playback/raster_source.cc
|
| index 0dc9c6c520cc2dcddf0e10b67562b76c795f80b7..9edded7cbec26c5c3b3e2f34b2f638652a34c002 100644
|
| --- a/cc/playback/raster_source.cc
|
| +++ b/cc/playback/raster_source.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/trace_event/trace_event.h"
|
| #include "cc/base/math_util.h"
|
| #include "cc/base/region.h"
|
| +#include "cc/base/scale_translate2d.h"
|
| #include "cc/debug/debug_colors.h"
|
| #include "cc/playback/display_item_list.h"
|
| #include "cc/playback/image_hijack_canvas.h"
|
| @@ -67,7 +68,7 @@ RasterSource::~RasterSource() {
|
| void RasterSource::PlaybackToCanvas(SkCanvas* raster_canvas,
|
| const gfx::Rect& canvas_bitmap_rect,
|
| const gfx::Rect& canvas_playback_rect,
|
| - float contents_scale,
|
| + const ScaleTranslate2d& contents_transform,
|
| const PlaybackSettings& settings) const {
|
| SkIRect raster_bounds = gfx::RectToSkIRect(canvas_bitmap_rect);
|
| if (!canvas_playback_rect.IsEmpty() &&
|
| @@ -79,7 +80,7 @@ void RasterSource::PlaybackToCanvas(SkCanvas* raster_canvas,
|
| raster_canvas->save();
|
| raster_canvas->translate(-canvas_bitmap_rect.x(), -canvas_bitmap_rect.y());
|
| raster_canvas->clipRect(SkRect::MakeFromIRect(raster_bounds));
|
| - raster_canvas->scale(contents_scale, contents_scale);
|
| + contents_transform.ApplyToCanvas(raster_canvas);
|
| PlaybackToCanvas(raster_canvas, settings);
|
| raster_canvas->restore();
|
| }
|
|
|