| Index: cc/raster/raster_source.cc
|
| diff --git a/cc/raster/raster_source.cc b/cc/raster/raster_source.cc
|
| index 43d7792336be2b6c7da6bb0f1ec0e3943f3d295c..a890f14430f6a08bb7ee54a758b06f79284f6b35 100644
|
| --- a/cc/raster/raster_source.cc
|
| +++ b/cc/raster/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/debug/traced_value.h"
|
| #include "cc/paint/display_item_list.h"
|
| @@ -64,7 +65,7 @@ void RasterSource::PlaybackToCanvas(SkCanvas* raster_canvas,
|
| const gfx::ColorSpace& canvas_color_space,
|
| const gfx::Rect& canvas_bitmap_rect,
|
| const gfx::Rect& canvas_playback_rect,
|
| - float raster_scale,
|
| + const ScaleTranslate2d& raster_transform,
|
| const PlaybackSettings& settings) const {
|
| SkIRect raster_bounds = gfx::RectToSkIRect(canvas_bitmap_rect);
|
| if (!canvas_playback_rect.IsEmpty() &&
|
| @@ -76,7 +77,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_scale, raster_scale);
|
| + raster_transform.ApplyToCanvas(raster_canvas);
|
| PlaybackToCanvas(raster_canvas, canvas_color_space, settings);
|
| raster_canvas->restore();
|
| }
|
|
|