Backout rev 2c149ce94c49 (bug 740244) due to Linux WebGL orange.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 29 Mar 2012 18:20:45 -0400
changeset 93980 c29542b23601bfb89cd2f6507191f86c525e8920
parent 93979 a771149141f87dacd17e054fbbc017bbfdcd89a0
child 93981 4df2d9a68d6ee7df428bdc56f62610d1942367a4
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs740244
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout rev 2c149ce94c49 (bug 740244) due to Linux WebGL orange.
toolkit/xre/Makefile.in
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -62,20 +62,21 @@ CPPSRCS = \
   nsConsoleWriter.cpp \
   nsXREDirProvider.cpp \
   nsNativeAppSupportBase.cpp \
   nsAppData.cpp \
   nsSigHandlers.cpp \
   nsEmbedFunctions.cpp \
   $(NULL)
 
-ifeq ($(MOZ_GL_PROVIDER),GLX)
-DEFINES += -DUSE_GLX_TEST
+ifdef MOZ_X11
+ifndef MOZ_PLATFORM_MAEMO
 CPPSRCS += glxtest.cpp
 endif
+endif
 
 ifdef MOZ_INSTRUMENT_EVENT_LOOP
 CPPSRCS += EventTracer.cpp
 EXPORTS += EventTracer.h
 endif
 
 DEFINES += -DIMPL_XREAPI -DMOZ_APP_NAME='"$(MOZ_APP_NAME)"'
 
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -2693,19 +2693,21 @@ static DWORD InitDwriteBG(LPVOID lpdwThr
       }
     }
   }
   SetThreadPriority(GetCurrentThread(), THREAD_MODE_BACKGROUND_END);
   return 0;
 }
 #endif
 
-#ifdef USE_GLX_TEST
+#ifdef MOZ_X11
+#ifndef MOZ_PLATFORM_MAEMO
 bool fire_glxtest_process();
 #endif
+#endif
 
 #include "sampler.h"
 
 // Encapsulates startup and shutdown state for XRE_main
 class XREMain
 {
 public:
   XREMain() :
@@ -2781,26 +2783,28 @@ XREMain::XRE_mainInit(const nsXREAppData
   nsresult rv;
   ArgResult ar;
 
 #ifdef DEBUG
   if (PR_GetEnv("XRE_MAIN_BREAK"))
     NS_BREAK();
 #endif
 
-#ifdef USE_GLX_TEST
+#ifdef MOZ_X11
+#ifndef MOZ_PLATFORM_MAEMO
   // bug 639842 - it's very important to fire this process BEFORE we set up
   // error handling. indeed, this process is expected to be crashy, and we
   // don't want the user to see its crashes. That's the whole reason for
   // doing this in a separate process.
   if (fire_glxtest_process()) {
     *aExitFlag = true;
     return 0;
   }
 #endif
+#endif
 
 #ifdef XP_WIN
   {
     // Vista API.  Mozilla is DPI Aware.
     typedef BOOL (*SetProcessDPIAwareFunc)(VOID);
     SetProcessDPIAwareFunc setDPIAware = (SetProcessDPIAwareFunc)
       GetProcAddress(LoadLibraryW(L"user32.dll"), "SetProcessDPIAware");
     if (setDPIAware) {