Bug 737354 - Embedding initialize GL context before gfxPlatform::Init. r=roc

gfx/tests/gfxFontSelectionTest.cpp

@@ -341,8 +341,7 @@ main (int argc, char **argv) {
     if (NS_FAILED(rv))
         return -1;
 
-    rv = gfxPlatform::Init();
-    if (NS_FAILED(rv))
+    if (!gfxPlatform::GetPlatform())
         return -1;
 
     // let's get all the xpcom goop out of the system

gfx/tests/gfxTextRunPerfTest.cpp

@@ -150,8 +150,7 @@ main (int argc, char **argv) {
     if (NS_FAILED(rv))
         return -1; 
 
-    rv = gfxPlatform::Init();
-    if (NS_FAILED(rv))
+    if (!gfxPlatform::GetPlatform())
         return -1;
 
     // let's get all the xpcom goop out of the system

gfx/tests/gfxWordCacheTest.cpp

@@ -137,8 +137,7 @@ main (int argc, char **argv) {
    if (NS_FAILED(rv))
        return -1;
 
-   rv = gfxPlatform::Init();
-   if (NS_FAILED(rv))
+   if (!gfxPlatform::GetPlatform())
        return -1;
 
    // let's get all the xpcom goop out of the system

gfx/thebes/gfxPlatform.h

@@ -175,10 +175,6 @@ public:
      */
     static gfxPlatform *GetPlatform();
 
-    /**
-     * Start up Thebes.
-     */
-    static void Init();
 
     /**
      * Shut down Thebes.
@@ -481,6 +477,11 @@ protected:
     mozilla::gfx::BackendType mPreferredDrawTargetBackend;
 
 private:
+    /**
+     * Start up Thebes.
+     */
+    static void Init();
+
     virtual qcms_profile* GetPlatformCMSOutputProfile();
 
     nsRefPtr<gfxASurface> mScreenReferenceSurface;

widget/qt/nsWindow.cpp

@@ -258,6 +258,7 @@ nsWindow::nsWindow()
     mMoveEvent.needDispatch = false;
     
     if (!gGlobalsInitialized) {
+        gfxPlatform::GetPlatform();
         gGlobalsInitialized = true;
 
 #if defined(MOZ_X11) && (MOZ_PLATFORM_MAEMO == 6)