Backed out changeset 5311508efeba (bug 1661147) as requested by Emili…

…o. CLOSED TREE
dothq · Aug 23, 2022 · f96c89a · f96c89a
1 parent 6e618ef
commit f96c89a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 41 deletions.
diff --git a/gfx/layers/wr/ClipManager.cpp b/gfx/layers/wr/ClipManager.cpp
@@ -63,7 +63,7 @@ void ClipManager::BeginList(const StackingContextHelper& aStackingContext) {
 
   ItemClips clips(nullptr, nullptr, false);
   if (!mItemClipStack.empty()) {
-    clips = mItemClipStack.top();
+    clips.CopyOutputsFrom(mItemClipStack.top());
   }
 
   if (aStackingContext.ReferenceFrameId()) {
@@ -436,6 +436,11 @@ bool ClipManager::ItemClips::HasSameInputs(const ItemClips& aOther) {
          mSeparateLeaf == aOther.mSeparateLeaf;
 }
 
+void ClipManager::ItemClips::CopyOutputsFrom(const ItemClips& aOther) {
+  mScrollId = aOther.mScrollId;
+  mClipChainId = aOther.mClipChainId;
+}
+
 wr::WrSpaceAndClipChain ClipManager::ItemClips::GetSpaceAndClipChain() const {
   auto spaceAndClipChain = wr::RootScrollNodeWithChain();
   spaceAndClipChain.space = mScrollId;

diff --git a/gfx/layers/wr/ClipManager.h b/gfx/layers/wr/ClipManager.h
@@ -133,6 +133,7 @@ class ClipManager {
     void UpdateSeparateLeaf(wr::DisplayListBuilder& aBuilder,
                             int32_t aAppUnitsPerDevPixel);
     bool HasSameInputs(const ItemClips& aOther);
+    void CopyOutputsFrom(const ItemClips& aOther);
     wr::WrSpaceAndClipChain GetSpaceAndClipChain() const;
   };
 

diff --git a/testing/web-platform/tests/css/filter-effects/fixed-pos-filter-clip-001.html b/testing/web-platform/tests/css/filter-effects/fixed-pos-filter-clip-001.html
diff --git a/testing/web-platform/tests/css/filter-effects/fixed-pos-filter-clip-002-ref.html b/testing/web-platform/tests/css/filter-effects/fixed-pos-filter-clip-002-ref.html
diff --git a/testing/web-platform/tests/css/filter-effects/fixed-pos-filter-clip-002.html b/testing/web-platform/tests/css/filter-effects/fixed-pos-filter-clip-002.html