Skip to content

Commit 0c036a7

Browse files
authored
Revert "Only provide frame damage to rasterizer if partial repaint is enabled (flutter#30461)" (flutter#30696)
1 parent 36eafae commit 0c036a7

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

shell/common/rasterizer.cc

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -560,25 +560,22 @@ RasterStatus Rasterizer::DrawToSurfaceUnsafe(
560560
external_view_embedder_ &&
561561
(!raster_thread_merger_ || raster_thread_merger_->IsMerged());
562562

563-
std::unique_ptr<FrameDamage> damage;
563+
FrameDamage damage;
564564
if (!disable_partial_repaint && frame->framebuffer_info().existing_damage) {
565-
damage = std::make_unique<FrameDamage>();
566-
damage->SetPreviousLayerTree(last_layer_tree_.get());
567-
damage->AddAdditonalDamage(*frame->framebuffer_info().existing_damage);
565+
damage.SetPreviousLayerTree(last_layer_tree_.get());
566+
damage.AddAdditonalDamage(*frame->framebuffer_info().existing_damage);
568567
}
569568

570569
RasterStatus raster_status =
571-
compositor_frame->Raster(layer_tree, false, damage.get());
570+
compositor_frame->Raster(layer_tree, false, &damage);
572571
if (raster_status == RasterStatus::kFailed ||
573572
raster_status == RasterStatus::kSkipAndRetry) {
574573
return raster_status;
575574
}
576575

577576
SurfaceFrame::SubmitInfo submit_info;
578-
if (damage) {
579-
submit_info.frame_damage = damage->GetFrameDamage();
580-
submit_info.buffer_damage = damage->GetBufferDamage();
581-
}
577+
submit_info.frame_damage = damage.GetFrameDamage();
578+
submit_info.buffer_damage = damage.GetBufferDamage();
582579

583580
frame->set_submit_info(submit_info);
584581

0 commit comments

Comments
 (0)