summaryrefslogtreecommitdiffstats
path: root/layout/painting/RetainedDisplayListBuilder.cpp
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:13:33 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:13:33 +0000
commit086c044dc34dfc0f74fbe41f4ecb402b2cd34884 (patch)
treea4f824bd33cb075dd5aa3eb5a0a94af221bbe83a /layout/painting/RetainedDisplayListBuilder.cpp
parentAdding debian version 124.0.1-1. (diff)
downloadfirefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.tar.xz
firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.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.cpp11
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) {