nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Backed out changeset 6aa6da68d232 (bug 1897636) for causing Xpcshell crashes at docshell/test/unit/test_privacy_transition.js.

Browse source
This commit is contained in:
Butkovits Atila 2024-05-24 12:38:40 +03:00
parent 67039cecb0
commit 05ae0bc4db
2 changed files with 14 additions and 16 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
dom/media/ipc/RemoteDecoderManagerChild.cpp
View file

@ -96,6 +96,7 @@ StaticRefPtr<ShutdownObserver> sObserver;
/* static */
void RemoteDecoderManagerChild::Init() {
MOZ_ASSERT(NS_IsMainThread());
LOG("RemoteDecoderManagerChild Init");
auto remoteDecoderManagerThread = sRemoteDecoderManagerChildThread.Lock();

29
dom/media/platforms/PDMFactory.cpp
View file

@ -192,9 +192,8 @@ StaticMutex PDMInitializer::sMonitor;
/* static */
void PDMInitializer::InitPDMs() {
StaticMutexAutoLock mon(sMonitor);
if (sHasInitializedPDMs) {
return;
}
MOZ_DIAGNOSTIC_ASSERT(NS_IsMainThread());
MOZ_ASSERT(!sHasInitializedPDMs);
if (XRE_IsGPUProcess()) {
PDM_INIT_LOG("Init PDMs in GPU process");
InitGpuPDMs();
@ -307,28 +306,26 @@ void PDMFactory::EnsureInit() {
if (PDMInitializer::HasInitializedPDMs()) {
return;
}
static Atomic<bool> sInitGfxVarsAndPreferences(false);
auto initalizationGfxVarsAndPreferences = []() {
auto initalization = []() {
MOZ_DIAGNOSTIC_ASSERT(NS_IsMainThread());
if (!sInitGfxVarsAndPreferences) {
if (!PDMInitializer::HasInitializedPDMs()) {
// Ensure that all system variables are initialized.
gfx::gfxVars::Initialize();
// Prime the preferences system from the main thread.
Unused << BrowserTabsRemoteAutostart();
sInitGfxVarsAndPreferences = true;
PDMInitializer::InitPDMs();
}
};
// There are some initialization needed to be done on the main thread.
// If on the main thread, then initialize PDMs. Otherwise, do a sync-dispatch
// to main thread.
if (NS_IsMainThread()) {
initalizationGfxVarsAndPreferences();
} else {
nsCOMPtr<nsIEventTarget> mainTarget = GetMainThreadSerialEventTarget();
nsCOMPtr<nsIRunnable> runnable =
NS_NewRunnableFunction("PDMFactory::EnsureInit",
std::move(initalizationGfxVarsAndPreferences));
SyncRunnable::DispatchToThread(mainTarget, runnable);
initalization();
return;
}
PDMInitializer::InitPDMs();
nsCOMPtr<nsIEventTarget> mainTarget = GetMainThreadSerialEventTarget();
nsCOMPtr<nsIRunnable> runnable = NS_NewRunnableFunction(
"PDMFactory::EnsureInit", std::move(initalization));
SyncRunnable::DispatchToThread(mainTarget, runnable);
}
RefPtr<PlatformDecoderModule::CreateDecoderPromise> PDMFactory::CreateDecoder(