Commit 979ea410 authored by Oleg Romashin's avatar Oleg Romashin
Browse files

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

parent ed773f9c

gfx/tests/gfxFontSelectionTest.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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

+1 −2
Original line number Diff line number Diff line
@@ -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

+1 −2
Original line number Diff line number Diff line
@@ -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

+5 −4
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ nsWindow::nsWindow() 
    mMoveEvent.needDispatch = false;

    

    if (!gGlobalsInitialized) {

        gfxPlatform::GetPlatform();

        gGlobalsInitialized = true;



#if defined(MOZ_X11) && (MOZ_PLATFORM_MAEMO == 6)