diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /layout/painting/RetainedDisplayListBuilder.cpp | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'layout/painting/RetainedDisplayListBuilder.cpp')
| -rw-r--r-- | layout/painting/RetainedDisplayListBuilder.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/layout/painting/RetainedDisplayListBuilder.cpp b/layout/painting/RetainedDisplayListBuilder.cpp index bb3a896b9a..ca8f37a252 100644 --- a/layout/painting/RetainedDisplayListBuilder.cpp +++ b/layout/painting/RetainedDisplayListBuilder.cpp @@ -523,6 +523,17 @@ class MergeState { // current ASR, which gets reset during RestoreState(), so we always need // to run it again. aOutItem->UpdateBounds(mBuilder->Builder()); + + if (aOutItem->GetType() == DisplayItemType::TYPE_TRANSFORM) { + MOZ_ASSERT(!aNewItem || + aNewItem->GetType() == DisplayItemType::TYPE_TRANSFORM); + MOZ_ASSERT(aOldItem->GetType() == DisplayItemType::TYPE_TRANSFORM); + static_cast<nsDisplayTransform*>(aOutItem)->SetContainsASRs( + static_cast<nsDisplayTransform*>(aOldItem)->GetContainsASRs() || + (aNewItem + ? static_cast<nsDisplayTransform*>(aNewItem)->GetContainsASRs() + : false)); + } } bool ShouldUseNewItem(nsDisplayItem* aNewItem) { |