mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 737354 - Embedding initialize GL context before gfxPlatform::Init. r=roc
This commit is contained in:
parent
233e3b3dce
commit
e74b6215cf
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
@ -258,6 +258,7 @@ nsWindow::nsWindow()
|
||||
mMoveEvent.needDispatch = false;
|
||||
|
||||
if (!gGlobalsInitialized) {
|
||||
gfxPlatform::GetPlatform();
|
||||
gGlobalsInitialized = true;
|
||||
|
||||
#if defined(MOZ_X11) && (MOZ_PLATFORM_MAEMO == 6)
|
||||
|
Loading…
Reference in New Issue
Block a user