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

This commit is contained in:
Oleg Romashin 2012-03-21 16:14:09 -07:00
parent 233e3b3dce
commit e74b6215cf
5 changed files with 9 additions and 10 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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;

View File

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