Backed out changeset e2de18f2d894 (bug 1690821) for possibly causing reftest crashes in table-cell-breaking-1a.html. CLOSED TREE

gfx/layers/wr/WebRenderBridgeChild.h

@@ -123,14 +123,6 @@ class WebRenderBridgeChild final : public PWebRenderBridgeChild,
     mIdNamespace = aIdNamespace;
   }
 
-  bool MatchesNamespace(const wr::ImageKey& aImageKey) const {
-    return aImageKey.mNamespace == mIdNamespace;
-  }
-
-  bool MatchesNamespace(const wr::BlobImageKey& aBlobKey) const {
-    return MatchesNamespace(aBlobKey._0);
-  }
-
   wr::FontKey GetNextFontKey() {
     return wr::FontKey{GetNamespace(), GetNextResourceId()};
   }

gfx/layers/wr/WebRenderCommandBuilder.cpp

@@ -710,10 +710,6 @@ struct DIGroup {
       }
       mKey = Some(key);
     } else {
-      MOZ_DIAGNOSTIC_ASSERT(
-          aWrManager->WrBridge()->MatchesNamespace(mKey.ref()),
-          "Stale blob key for group!");
-
       wr::ImageDescriptor descriptor(dtSize, 0, dt->GetFormat(), opacity);
 
       // Convert mInvalidRect to image space by subtracting the corner of the
@@ -2406,10 +2402,6 @@ WebRenderCommandBuilder::GenerateFallbackData(
   }
 
   if (useBlobImage) {
-    MOZ_DIAGNOSTIC_ASSERT(mManager->WrBridge()->MatchesNamespace(
-                              fallbackData->GetBlobImageKey().ref()),
-                          "Stale blob key for fallback!");
-
     aResources.SetBlobImageVisibleArea(
         fallbackData->GetBlobImageKey().value(),
         ViewAs<ImagePixel>(visibleRect, PixelCastJustification::LayerIsImage));
@@ -2601,10 +2593,6 @@ Maybe<wr::ImageMask> WebRenderCommandBuilder::BuildWrMaskImage(
     }
   }
 
-  MOZ_DIAGNOSTIC_ASSERT(
-      mManager->WrBridge()->MatchesNamespace(maskData->mBlobKey.ref()),
-      "Stale blob key for mask!");
-
   wr::ImageMask imageMask;
   imageMask.image = wr::AsImageKey(maskData->mBlobKey.value());
   imageMask.rect = wr::ToLayoutRect(imageRect);