Index: cc/tiles/tile_manager.cc |
diff --git a/cc/tiles/tile_manager.cc b/cc/tiles/tile_manager.cc |
index afdd8c19767e43f01fdb841d4d765a513e5ed61f..c0bdb3c1e5c0fa83acfce999178333a87f47a30e 100644 |
--- a/cc/tiles/tile_manager.cc |
+++ b/cc/tiles/tile_manager.cc |
@@ -99,7 +99,7 @@ class RasterTaskImpl : public TileTask { |
raster_source_(std::move(raster_source)), |
content_rect_(tile->content_rect()), |
invalid_content_rect_(invalidated_rect), |
- raster_scales_(tile->raster_scales()), |
+ raster_transform_(tile->raster_transform()), |
playback_settings_(playback_settings), |
tile_resolution_(tile_resolution), |
layer_id_(tile->layer_id()), |
@@ -127,10 +127,9 @@ class RasterTaskImpl : public TileTask { |
DCHECK(raster_source_); |
- DCHECK_EQ(raster_scales_.width(), raster_scales_.height()); |
raster_buffer_->Playback(raster_source_.get(), content_rect_, |
invalid_content_rect_, new_content_id_, |
- ScaleTranslate2d(raster_scales_.width(), gfx::Vector2dF()), playback_settings_); |
+ raster_transform_, playback_settings_); |
} |
// Overridden from TileTask: |
@@ -164,7 +163,7 @@ class RasterTaskImpl : public TileTask { |
scoped_refptr<RasterSource> raster_source_; |
gfx::Rect content_rect_; |
gfx::Rect invalid_content_rect_; |
- gfx::SizeF raster_scales_; |
+ ScaleTranslate2d raster_transform_; |
RasterSource::PlaybackSettings playback_settings_; |
TileResolution tile_resolution_; |
int layer_id_; |
@@ -678,9 +677,11 @@ TileManager::PrioritizedWorkToSchedule TileManager::AssignGpuMemoryToTiles() { |
// canvas which is reset between tiles. |
tile->set_solid_color_analysis_performed(true); |
SkColor color = SK_ColorTRANSPARENT; |
+ gfx::RectF layer_rect = tile->raster_transform().TransformRectReverse( |
+ gfx::RectF(tile->content_rect())); |
bool is_solid_color = |
prioritized_tile.raster_source()->PerformSolidColorAnalysis( |
- tile->content_rect(), tile->raster_scales(), &color); |
+ gfx::ToEnclosingRect(layer_rect), 1.f, &color); |
if (is_solid_color) { |
tile->draw_info().set_solid_color(color); |
tile->draw_info().set_was_ever_ready_to_draw(); |
@@ -886,7 +887,7 @@ void TileManager::ScheduleTasks( |
std::vector<DrawImage> images; |
prioritized_tile.raster_source()->GetDiscardableImagesInRect( |
- tile->enclosing_layer_rect(), tile->raster_scales(), &images); |
+ tile->enclosing_layer_rect(), tile->raster_transform().scale(), &images); |
new_locked_images.insert(new_locked_images.end(), images.begin(), |
images.end()); |
} |
@@ -989,7 +990,7 @@ scoped_refptr<TileTask> TileManager::CreateRasterTask( |
images.clear(); |
if (!playback_settings.skip_images) { |
prioritized_tile.raster_source()->GetDiscardableImagesInRect( |
- tile->enclosing_layer_rect(), tile->raster_scales(), &images); |
+ tile->enclosing_layer_rect(), tile->raster_transform().scale(), &images); |
} |
// We can skip the image hijack canvas if we have no images. |