Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-22 18:32:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to autoland on a CLOSED TREE

Browse Source
This commit is contained in:
Bogdan Tara 2021-02-05 15:36:42 +02:00
commit 51135ce4d4
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/layers/wr/WebRenderBridgeParent.cpp
View File

@ -518,8 +518,6 @@ bool WebRenderBridgeParent::UpdateResources(
}
case OpUpdateResource::TOpAddBlobImage: {
const auto& op = cmd.get_OpAddBlobImage();
MOZ_DIAGNOSTIC_ASSERT(MatchesNamespace(op.key()),
"stale blob key for add!");
wr::Vec<uint8_t> bytes;
if (!reader.Read(op.bytes(), bytes)) {
gfxCriticalNote << "TOpAddBlobImage failed";
@ -531,8 +529,6 @@ bool WebRenderBridgeParent::UpdateResources(
}
case OpUpdateResource::TOpUpdateBlobImage: {
const auto& op = cmd.get_OpUpdateBlobImage();
MOZ_DIAGNOSTIC_ASSERT(MatchesNamespace(op.key()),
"stale blob key for update!");
wr::Vec<uint8_t> bytes;
if (!reader.Read(op.bytes(), bytes)) {
gfxCriticalNote << "TOpUpdateBlobImage failed";
@ -545,8 +541,6 @@ bool WebRenderBridgeParent::UpdateResources(
}
case OpUpdateResource::TOpSetBlobImageVisibleArea: {
const auto& op = cmd.get_OpSetBlobImageVisibleArea();
MOZ_DIAGNOSTIC_ASSERT(MatchesNamespace(op.key()),
"stale blob key for visible area!");
aUpdates.SetBlobImageVisibleArea(op.key(),
wr::ToDeviceIntRect(op.area()));
break;

8
gfx/layers/wr/WebRenderBridgeParent.h
View File

@ -220,14 +220,6 @@ class WebRenderBridgeParent final : public PWebRenderBridgeParent,
wr::Epoch GetCurrentEpoch() const { return mWrEpoch; }
wr::IdNamespace GetIdNamespace() { return mIdNamespace; }
bool MatchesNamespace(const wr::ImageKey& aImageKey) const {
return aImageKey.mNamespace == mIdNamespace;
}
bool MatchesNamespace(const wr::BlobImageKey& aBlobKey) const {
return MatchesNamespace(aBlobKey._0);
}
void FlushRendering(bool aWaitForPresent = true);
/**