From 0c2b6d453a6096f6d9bb21730a1807a6b7e2aa3d Mon Sep 17 00:00:00 2001 From: Kaushik Iska Date: Wed, 5 Jan 2022 13:21:15 -0800 Subject: [PATCH] Revert "Only provide frame damage to rasterizer if partial repaint is enabled (#30461)" This reverts commit a6a856f3487731241846b5c3bebbe46c8320e0ae. --- shell/common/rasterizer.cc | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc index 403fcc91de2ee..ad5644c45f986 100644 --- a/shell/common/rasterizer.cc +++ b/shell/common/rasterizer.cc @@ -560,25 +560,22 @@ RasterStatus Rasterizer::DrawToSurfaceUnsafe( external_view_embedder_ && (!raster_thread_merger_ || raster_thread_merger_->IsMerged()); - std::unique_ptr damage; + FrameDamage damage; if (!disable_partial_repaint && frame->framebuffer_info().existing_damage) { - damage = std::make_unique(); - damage->SetPreviousLayerTree(last_layer_tree_.get()); - damage->AddAdditonalDamage(*frame->framebuffer_info().existing_damage); + damage.SetPreviousLayerTree(last_layer_tree_.get()); + damage.AddAdditonalDamage(*frame->framebuffer_info().existing_damage); } RasterStatus raster_status = - compositor_frame->Raster(layer_tree, false, damage.get()); + compositor_frame->Raster(layer_tree, false, &damage); if (raster_status == RasterStatus::kFailed || raster_status == RasterStatus::kSkipAndRetry) { return raster_status; } SurfaceFrame::SubmitInfo submit_info; - if (damage) { - submit_info.frame_damage = damage->GetFrameDamage(); - submit_info.buffer_damage = damage->GetBufferDamage(); - } + submit_info.frame_damage = damage.GetFrameDamage(); + submit_info.buffer_damage = damage.GetBufferDamage(); frame->set_submit_info(submit_info);