diff options
Diffstat (limited to 'cc/layers/tiled_layer.cc')
-rw-r--r-- | cc/layers/tiled_layer.cc | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/cc/layers/tiled_layer.cc b/cc/layers/tiled_layer.cc index 99b44ce..7afb0d7 100644 --- a/cc/layers/tiled_layer.cc +++ b/cc/layers/tiled_layer.cc @@ -317,7 +317,6 @@ bool TiledLayer::UpdateTiles(int left, int bottom, ResourceUpdateQueue* queue, const OcclusionTracker* occlusion, - RenderingStats* stats, bool* did_paint) { *did_paint = false; CreateUpdaterIfNeeded(); @@ -339,7 +338,7 @@ bool TiledLayer::UpdateTiles(int left, *did_paint = true; UpdateTileTextures( - paint_rect, left, top, right, bottom, queue, occlusion, stats); + paint_rect, left, top, right, bottom, queue, occlusion); return true; } @@ -465,8 +464,7 @@ void TiledLayer::UpdateTileTextures(gfx::Rect paint_rect, int right, int bottom, ResourceUpdateQueue* queue, - const OcclusionTracker* occlusion, - RenderingStats* stats) { + const OcclusionTracker* occlusion) { // The update_rect should be in layer space. So we have to convert the // paint_rect from content space to layer space. float width_scale = @@ -486,8 +484,7 @@ void TiledLayer::UpdateTileTextures(gfx::Rect paint_rect, tiler_->tile_size(), 1.f / width_scale, 1.f / height_scale, - &painted_opaque_rect, - stats); + &painted_opaque_rect); for (int j = top; j <= bottom; ++j) { for (int i = left; i <= right; ++i) { @@ -552,7 +549,7 @@ void TiledLayer::UpdateTileTextures(gfx::Rect paint_rect, CHECK_LE(paint_offset.y() + source_rect.height(), paint_rect.height()); tile->updater_resource()->Update( - queue, source_rect, dest_offset, tile->partial_update, stats); + queue, source_rect, dest_offset, tile->partial_update); if (occlusion) { occlusion->overdraw_metrics()-> DidUpload(gfx::Transform(), source_rect, tile->opaque_rect()); @@ -719,14 +716,13 @@ void TiledLayer::UpdateScrollPrediction() { } void TiledLayer::Update(ResourceUpdateQueue* queue, - const OcclusionTracker* occlusion, - RenderingStats* stats) { + const OcclusionTracker* occlusion) { DCHECK(!skips_draw_ && !failed_update_); // Did ResetUpdateState get skipped? { base::AutoReset<bool> ignore_set_needs_commit(&ignore_set_needs_commit_, true); - ContentsScalingLayer::Update(queue, occlusion, stats); + ContentsScalingLayer::Update(queue, occlusion); UpdateBounds(); } @@ -745,7 +741,7 @@ void TiledLayer::Update(ResourceUpdateQueue* queue, &top, &right, &bottom); - UpdateTiles(left, top, right, bottom, queue, NULL, stats, &did_paint); + UpdateTiles(left, top, right, bottom, queue, NULL, &did_paint); if (did_paint) return; // This was an attempt to paint the entire layer so if we fail it's okay, @@ -763,7 +759,7 @@ void TiledLayer::Update(ResourceUpdateQueue* queue, predicted_visible_rect_, &left, &top, &right, &bottom); MarkOcclusionsAndRequestTextures(left, top, right, bottom, occlusion); skips_draw_ = !UpdateTiles( - left, top, right, bottom, queue, occlusion, stats, &did_paint); + left, top, right, bottom, queue, occlusion, &did_paint); if (skips_draw_) tiler_->reset(); if (skips_draw_ || did_paint) @@ -776,7 +772,7 @@ void TiledLayer::Update(ResourceUpdateQueue* queue, return; // Prepaint anything that was occluded but inside the layer's visible region. - if (!UpdateTiles(left, top, right, bottom, queue, NULL, stats, &did_paint) || + if (!UpdateTiles(left, top, right, bottom, queue, NULL, &did_paint) || did_paint) return; @@ -806,7 +802,7 @@ void TiledLayer::Update(ResourceUpdateQueue* queue, while (bottom < prepaint_bottom) { ++bottom; if (!UpdateTiles( - left, bottom, right, bottom, queue, NULL, stats, &did_paint) || + left, bottom, right, bottom, queue, NULL, &did_paint) || did_paint) return; } @@ -815,7 +811,7 @@ void TiledLayer::Update(ResourceUpdateQueue* queue, while (top > prepaint_top) { --top; if (!UpdateTiles( - left, top, right, top, queue, NULL, stats, &did_paint) || + left, top, right, top, queue, NULL, &did_paint) || did_paint) return; } @@ -824,7 +820,7 @@ void TiledLayer::Update(ResourceUpdateQueue* queue, while (left > prepaint_left) { --left; if (!UpdateTiles( - left, top, left, bottom, queue, NULL, stats, &did_paint) || + left, top, left, bottom, queue, NULL, &did_paint) || did_paint) return; } @@ -833,7 +829,7 @@ void TiledLayer::Update(ResourceUpdateQueue* queue, while (right < prepaint_right) { ++right; if (!UpdateTiles( - right, top, right, bottom, queue, NULL, stats, &did_paint) || + right, top, right, bottom, queue, NULL, &did_paint) || did_paint) return; } |