| Index: cc/tiles/tile.h
|
| diff --git a/cc/tiles/tile.h b/cc/tiles/tile.h
|
| index 8da46d69657a08962e36599235b90ae4fe472d81..6a15784f8031e35727658c086102b2e2fbf718b4 100644
|
| --- a/cc/tiles/tile.h
|
| +++ b/cc/tiles/tile.h
|
| @@ -10,6 +10,7 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| +#include "cc/base/scale_translate2d.h"
|
| #include "cc/raster/tile_task.h"
|
| #include "cc/tiles/tile_draw_info.h"
|
| #include "ui/gfx/geometry/rect.h"
|
| @@ -32,18 +33,18 @@ class CC_EXPORT Tile {
|
| int tiling_j_index;
|
| gfx::Rect enclosing_layer_rect;
|
| gfx::Rect content_rect;
|
| - gfx::SizeF raster_scales;
|
| + ScaleTranslate2d raster_transform;
|
|
|
| CreateInfo(int tiling_i_index,
|
| int tiling_j_index,
|
| const gfx::Rect& enclosing_layer_rect,
|
| const gfx::Rect& content_rect,
|
| - const gfx::SizeF& raster_scales)
|
| + const ScaleTranslate2d& raster_transform)
|
| : tiling_i_index(tiling_i_index),
|
| tiling_j_index(tiling_j_index),
|
| enclosing_layer_rect(enclosing_layer_rect),
|
| content_rect(content_rect),
|
| - raster_scales(raster_scales) {}
|
| + raster_transform(raster_transform) {}
|
| };
|
|
|
| enum TileRasterFlags { USE_PICTURE_ANALYSIS = 1 << 0, IS_OPAQUE = 1 << 1 };
|
| @@ -75,8 +76,10 @@ class CC_EXPORT Tile {
|
| const TileDrawInfo& draw_info() const { return draw_info_; }
|
| TileDrawInfo& draw_info() { return draw_info_; }
|
|
|
| - float contents_scale_key() const { return raster_scales_.width(); }
|
| - const gfx::SizeF& raster_scales() const { return raster_scales_; }
|
| + float contents_scale_key() const { return raster_transform_.scale(); }
|
| + const ScaleTranslate2d& raster_transform() const {
|
| + return raster_transform_;
|
| + }
|
| const gfx::Rect& content_rect() const { return content_rect_; }
|
| const gfx::Rect& enclosing_layer_rect() const {
|
| return enclosing_layer_rect_;
|
| @@ -129,7 +132,7 @@ class CC_EXPORT Tile {
|
| TileManager* const tile_manager_;
|
| const gfx::Rect content_rect_;
|
| const gfx::Rect enclosing_layer_rect_;
|
| - const gfx::SizeF raster_scales_;
|
| + const ScaleTranslate2d raster_transform_;
|
|
|
| TileDrawInfo draw_info_;
|
|
|
|
|