Bug 1417442 - P1. Don't attempt to initialize MediaPrefs in the GPU process. r?dvander
MozReview-Commit-ID: 66766Tx8vgM
--- a/widget/GfxInfoBase.cpp
+++ b/widget/GfxInfoBase.cpp
@@ -586,17 +586,20 @@ GfxInfoBase::~GfxInfoBase()
{
}
nsresult
GfxInfoBase::Init()
{
InitGfxDriverInfoShutdownObserver();
gfxPrefs::GetSingleton();
- MediaPrefs::GetSingleton();
+ if (!XRE_IsGPUProcess()) {
+ // MediaPrefs can't run in the GPU process.
+ MediaPrefs::GetSingleton();
+ }
nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
if (os) {
os->AddObserver(this, "blocklist-data-gfxItems", true);
}
return NS_OK;
}