Index: cc/tiles/tile_manager.cc |
diff --git a/cc/tiles/tile_manager.cc b/cc/tiles/tile_manager.cc |
index 9916918d96ce14d636b40f0b846acd4fa3b8f952..71e179bacd827b191d2fe0e79bb34ef9ef8fa766 100644 |
--- a/cc/tiles/tile_manager.cc |
+++ b/cc/tiles/tile_manager.cc |
@@ -23,6 +23,7 @@ |
#include "base/trace_event/trace_event_argument.h" |
#include "cc/base/devtools_instrumentation.h" |
#include "cc/base/histograms.h" |
+#include "cc/base/scale_translate2d.h" |
#include "cc/debug/traced_value.h" |
#include "cc/layers/picture_layer_impl.h" |
#include "cc/raster/raster_buffer.h" |
@@ -98,7 +99,7 @@ class RasterTaskImpl : public TileTask { |
raster_source_(std::move(raster_source)), |
content_rect_(tile->content_rect()), |
invalid_content_rect_(invalidated_rect), |
- raster_scale_(tile->contents_scale()), |
+ raster_transform_(tile->raster_transform()), |
playback_settings_(playback_settings), |
tile_resolution_(tile_resolution), |
layer_id_(tile->layer_id()), |
@@ -128,7 +129,7 @@ class RasterTaskImpl : public TileTask { |
raster_buffer_->Playback(raster_source_.get(), content_rect_, |
invalid_content_rect_, new_content_id_, |
- raster_scale_, playback_settings_); |
+ raster_transform_, playback_settings_); |
} |
// Overridden from TileTask: |
@@ -162,7 +163,7 @@ class RasterTaskImpl : public TileTask { |
scoped_refptr<RasterSource> raster_source_; |
gfx::Rect content_rect_; |
gfx::Rect invalid_content_rect_; |
- float raster_scale_; |
+ ScaleTranslate2d raster_transform_; |
RasterSource::PlaybackSettings playback_settings_; |
TileResolution tile_resolution_; |
int layer_id_; |
@@ -664,9 +665,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->contents_scale(), &color); |
+ gfx::ToEnclosingRect(layer_rect), 1.f, &color); |
if (is_solid_color) { |
tile->draw_info().set_solid_color(color); |
client_->NotifyTileStateChanged(tile); |
@@ -863,7 +866,8 @@ void TileManager::ScheduleTasks( |
// the CheckerImageTracker as well. See crbug.com/691087. |
std::vector<DrawImage> images; |
prioritized_tile.raster_source()->GetDiscardableImagesInRect( |
- tile->enclosing_layer_rect(), tile->contents_scale(), &images); |
+ tile->enclosing_layer_rect(), tile->raster_transform().scale(), |
+ &images); |
new_locked_images.insert(new_locked_images.end(), images.begin(), |
images.end()); |
} |
@@ -967,7 +971,8 @@ scoped_refptr<TileTask> TileManager::CreateRasterTask( |
images.clear(); |
if (!playback_settings.skip_images) { |
prioritized_tile.raster_source()->GetDiscardableImagesInRect( |
- tile->enclosing_layer_rect(), tile->contents_scale(), &images); |
+ tile->enclosing_layer_rect(), tile->raster_transform().scale(), |
+ &images); |
checker_image_tracker_.FilterImagesForCheckeringForTile( |
&images, &images_to_skip, prioritized_tile.tile()->tiling()->tree()); |
} |