corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 72bda4790c32 (bug 1933840) for causing bc failures @ browser_test_powerMetrics.js . CLOSED TREE

Browse Source
This commit is contained in:
Alexandru Marc
2024-11-28 09:48:09 +02:00
parent 43772f7e31
commit f61d4824bd
3 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dom/ipc/ContentParent.cpp
View File

@@ -151,7 +151,6 @@
#include "mozilla/ipc/Endpoint.h" #include "mozilla/ipc/Endpoint.h"
#include "mozilla/ipc/FileDescriptorUtils.h" #include "mozilla/ipc/FileDescriptorUtils.h"
#include "mozilla/ipc/IPCStreamUtils.h" #include "mozilla/ipc/IPCStreamUtils.h"
#include "mozilla/ipc/UtilityProcessManager.h"
#include "mozilla/ipc/SharedMemory.h" #include "mozilla/ipc/SharedMemory.h"
#include "mozilla/ipc/TestShellParent.h" #include "mozilla/ipc/TestShellParent.h"
#include "mozilla/layers/CompositorThread.h" #include "mozilla/layers/CompositorThread.h"
@@ -2972,12 +2971,6 @@ bool ContentParent::InitInternal(ProcessPriority aInitialPriority) {
rdd->LaunchRDDProcess(); rdd->LaunchRDDProcess();
} }
if (StaticPrefs::media_utility_process_enabled()) {
// Ensure the Utility media processes have been started.
RefPtr<UtilityProcessManager> upm = UtilityProcessManager::GetSingleton();
upm->StartProcessForRemoteMediaDecoding();
}
nsStyleSheetService* sheetService = nsStyleSheetService::GetInstance(); nsStyleSheetService* sheetService = nsStyleSheetService::GetInstance();
if (sheetService) { if (sheetService) {
// This looks like a lot of work, but in a normal browser session we just // This looks like a lot of work, but in a normal browser session we just

20
ipc/glue/UtilityProcessManager.cpp
View File

@@ -317,26 +317,6 @@ UtilityProcessManager::StartUtility(RefPtr<Actor> aActor,
}); });
} }
void UtilityProcessManager::StartProcessForRemoteMediaDecoding() {
RefPtr<UtilityAudioDecoderChild> genericUadc =
UtilityAudioDecoderChild::GetSingleton(SandboxingKind::GENERIC_UTILITY);
StartUtility(genericUadc, SandboxingKind::GENERIC_UTILITY);
#ifdef MOZ_APPLEMEDIA
RefPtr<UtilityAudioDecoderChild> appleUadc =
UtilityAudioDecoderChild::GetSingleton(
SandboxingKind::UTILITY_AUDIO_DECODING_APPLE_MEDIA);
StartUtility(appleUadc, SandboxingKind::UTILITY_AUDIO_DECODING_APPLE_MEDIA);
#endif
#ifdef XP_WIN
RefPtr<UtilityAudioDecoderChild> wmfUadc =
UtilityAudioDecoderChild::GetSingleton(
SandboxingKind::UTILITY_AUDIO_DECODING_WMF);
StartUtility(wmfUadc, SandboxingKind::UTILITY_AUDIO_DECODING_WMF);
#endif
}
RefPtr<UtilityProcessManager::StartRemoteDecodingUtilityPromise> RefPtr<UtilityProcessManager::StartRemoteDecodingUtilityPromise>
UtilityProcessManager::StartProcessForRemoteMediaDecoding( UtilityProcessManager::StartProcessForRemoteMediaDecoding(
EndpointProcInfo aOtherProcess, dom::ContentParentId aChildId, EndpointProcInfo aOtherProcess, dom::ContentParentId aChildId,

3
ipc/glue/UtilityProcessManager.h
View File

@@ -64,9 +64,6 @@ class UtilityProcessManager final : public UtilityProcessHost::Listener {
RefPtr<LaunchPromise<Ok>> StartUtility(RefPtr<Actor> aActor, RefPtr<LaunchPromise<Ok>> StartUtility(RefPtr<Actor> aActor,
SandboxingKind aSandbox); SandboxingKind aSandbox);
// Launch Utility processes for media decoding.
void StartProcessForRemoteMediaDecoding();
RefPtr<StartRemoteDecodingUtilityPromise> StartProcessForRemoteMediaDecoding( RefPtr<StartRemoteDecodingUtilityPromise> StartProcessForRemoteMediaDecoding(
EndpointProcInfo aOtherProcess, dom::ContentParentId aChildId, EndpointProcInfo aOtherProcess, dom::ContentParentId aChildId,
SandboxingKind aSandbox); SandboxingKind aSandbox);