Ensure gfxPlatform is created before creating a compositor on Android. (
bug 1254899 part 3.1, r=snorp)
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -1778,16 +1778,19 @@ nsWindow::CreateLayerManager(int aCompos
}
nsWindow *topLevelWindow = FindTopLevel();
if (!topLevelWindow || topLevelWindow->mWindowType == eWindowType_invisible) {
// don't create a layer manager for an invisible top-level window
return;
}
+ // Ensure that gfxPlatform is initialized first.
+ gfxPlatform::GetPlatform();
+
if (ShouldUseOffMainThreadCompositing()) {
CreateCompositor(aCompositorWidth, aCompositorHeight);
if (mLayerManager) {
return;
}
// If we get here, then off main thread compositing failed to initialize.
sFailedToCreateGLContext = true;