| Index: cc/playback/raster_source.cc
|
| diff --git a/cc/playback/raster_source.cc b/cc/playback/raster_source.cc
|
| index 9e5e946fb777e24a834a56eaa1a34216ee8cc673..4f4e552dbfe5aa4e2b605a9cfbbcd7c29d6a859c 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"
|
| @@ -66,7 +67,7 @@ RasterSource::~RasterSource() {
|
| void RasterSource::PlaybackToCanvas(SkCanvas* raster_canvas,
|
| const gfx::Rect& canvas_bitmap_rect,
|
| const gfx::Rect& canvas_playback_rect,
|
| - const gfx::SizeF& raster_scales,
|
| + const ScaleTranslate2d& raster_transform,
|
| const PlaybackSettings& settings) const {
|
| SkIRect raster_bounds = gfx::RectToSkIRect(canvas_bitmap_rect);
|
| if (!canvas_playback_rect.IsEmpty() &&
|
| @@ -78,7 +79,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(raster_scales.width(), raster_scales.height());
|
| + raster_transform.ApplyToCanvas(raster_canvas);
|
| PlaybackToCanvas(raster_canvas, settings);
|
| raster_canvas->restore();
|
| }
|
|
|