Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1839235 - Protect VideoBridgeChild's singleton with a StaticMutex r=lsalzman

Browse Source 
Protect  sVideoBridge like ImageBridgeChild::GetSingleton() to avoid race condition.

Differential Revision: https://phabricator.services.mozilla.com/D181844
This commit is contained in:
sotaro 2023-07-06 00:09:03 +00:00
parent 6a6ef2a134
commit c5cba984e2
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gfx/layers/ipc/VideoBridgeChild.cpp
View File

@ -9,12 +9,15 @@
#include "CompositorThread.h"
#include "mozilla/dom/ContentChild.h"
#include "mozilla/ipc/Endpoint.h"
#include "mozilla/StaticMutex.h"
#include "transport/runnable_utils.h"
#include "SynchronousTask.h"
namespace mozilla {
namespace layers {
// Singleton
static StaticMutex sVideoBridgeLock MOZ_UNANNOTATED;
StaticRefPtr<VideoBridgeChild> sVideoBridge;
/* static */
@ -30,7 +33,9 @@ void VideoBridgeChild::StartupForGPUProcess() {
VideoBridgeParent::Open(std::move(parentPipe), VideoBridgeSource::GpuProcess);
}
/* static */
void VideoBridgeChild::Open(Endpoint<PVideoBridgeChild>&& aEndpoint) {
StaticMutexAutoLock lock(sVideoBridgeLock);
MOZ_ASSERT(!sVideoBridge || !sVideoBridge->CanSend());
sVideoBridge = new VideoBridgeChild();
@ -42,6 +47,7 @@ void VideoBridgeChild::Open(Endpoint<PVideoBridgeChild>&& aEndpoint) {
/* static */
void VideoBridgeChild::Shutdown() {
StaticMutexAutoLock lock(sVideoBridgeLock);
if (sVideoBridge) {
sVideoBridge->Close();
sVideoBridge = nullptr;
@ -53,7 +59,10 @@ VideoBridgeChild::VideoBridgeChild()
VideoBridgeChild::~VideoBridgeChild() = default;
VideoBridgeChild* VideoBridgeChild::GetSingleton() { return sVideoBridge; }
VideoBridgeChild* VideoBridgeChild::GetSingleton() {
StaticMutexAutoLock lock(sVideoBridgeLock);
return sVideoBridge;
}
bool VideoBridgeChild::AllocUnsafeShmem(size_t aSize, ipc::Shmem* aShmem) {
if (!mThread->IsOnCurrentThread()) {