CMXSL.org/trisquel-icecat
2
0
Fork 0
Code Issues Pull requests Projects Releases 11 Packages Wiki Activity Actions

icecat: add release icecat-140.10.1-1gnu1 for ecne

Browse source
This commit is contained in:
Ark74 2026-05-04 16:58:41 -06:00
parent a5f93cb214
commit ff85d7c623
1256 changed files with 63469 additions and 24141 deletions
Download patch file Download diff file Expand all files Collapse all files

38
icecat/gfx/layers/ipc/VideoBridgeParent.cpp
View file

@ -99,16 +99,16 @@ already_AddRefed<TextureHost> VideoBridgeParent::LookupTextureAsync(
MOZ_ASSERT(mCompositorThreadHolder->IsInThread());
auto* actor = mTextureMap[aSerial];
if (NS_WARN_IF(!actor)) {
const auto i = mTextureMap.find(aSerial);
if (NS_WARN_IF(i == mTextureMap.end())) {
return nullptr;
}
if (NS_WARN_IF(aContentId != TextureHost::GetTextureContentId(actor))) {
if (NS_WARN_IF(aContentId != i->second.mContentId)) {
return nullptr;
}
return do_AddRef(TextureHost::AsTextureHost(actor));
return do_AddRef(i->second.mTextureHost);
}
already_AddRefed<TextureHost> VideoBridgeParent::LookupTexture(
@ -120,12 +120,12 @@ already_AddRefed<TextureHost> VideoBridgeParent::LookupTexture(
return nullptr;
}
auto* actor = mTextureMap[aSerial];
if (actor) {
if (NS_WARN_IF(aContentId != TextureHost::GetTextureContentId(actor))) {
auto i = mTextureMap.find(aSerial);
if (i != mTextureMap.end()) {
if (NS_WARN_IF(aContentId != i->second.mContentId)) {
return nullptr;
}
return do_AddRef(TextureHost::AsTextureHost(actor));
return do_AddRef(i->second.mTextureHost);
}
// We cannot block on the Compositor thread because that is the thread we get
@ -166,16 +166,16 @@ already_AddRefed<TextureHost> VideoBridgeParent::LookupTexture(
lock.Wait();
}
actor = mTextureMap[aSerial];
if (!actor) {
i = mTextureMap.find(aSerial);
if (NS_WARN_IF(i == mTextureMap.end())) {
return nullptr;
}
if (NS_WARN_IF(aContentId != TextureHost::GetTextureContentId(actor))) {
if (NS_WARN_IF(aContentId != i->second.mContentId)) {
return nullptr;
}
return do_AddRef(TextureHost::AsTextureHost(actor));
return do_AddRef(i->second.mTextureHost);
}
void VideoBridgeParent::ActorDestroy(ActorDestroyReason aWhy) {
@ -259,13 +259,21 @@ PTextureParent* VideoBridgeParent::AllocPTextureParent(
}
MonitorAutoLock lock(mMonitor);
mTextureMap[aSerial] = parent;
mTextureMap.insert(
{aSerial, {TextureHost::AsTextureHost(parent), aContentId}});
return parent;
}
bool VideoBridgeParent::DeallocPTextureParent(PTextureParent* actor) {
MonitorAutoLock lock(mMonitor);
mTextureMap.erase(TextureHost::GetTextureSerial(actor));
RefPtr<TextureHost> textureHost;
{
MonitorAutoLock lock(mMonitor);
auto i = mTextureMap.find(TextureHost::GetTextureSerial(actor));
if (i != mTextureMap.end()) {
textureHost = std::move(i->second.mTextureHost);
mTextureMap.erase(i);
}
}
return TextureHost::DestroyIPDLActor(actor);
}