Bug 1278574 - [2.2] Instantiate MediaPrefs on Android during AndroidB…

…ridge construction. r=jya
Brli · Jun 23, 2016 · 52dd796 · 52dd796
1 parent 72fbf11
commit 52dd796
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
@@ -322,6 +322,11 @@ nsLayoutStatics::Initialize()
   Servo_Initialize();
 #endif
 
+#ifndef MOZ_WIDGET_ANDROID
+  // On Android, we instantiate it when constructing AndroidBridge.
+  MediaPrefs::GetSingleton();
+#endif
+
   return NS_OK;
 }
 

diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp
@@ -52,6 +52,7 @@
 #include "mozilla/UniquePtr.h"
 #include "mozilla/dom/ContentChild.h"
 #include "nsIObserverService.h"
+#include "MediaPrefs.h"
 
 using namespace mozilla;
 using namespace mozilla::gfx;
@@ -169,6 +170,7 @@ AndroidBridge::ConstructBridge()
     MOZ_ASSERT(!sBridge);
     sBridge = new AndroidBridge();
 
+    MediaPrefs::GetSingleton();
 }
 
 void