Backed out changeset e91e04dadeb3 (bug 1320134) for crashing webgl on Windows. r=backout

This commit is contained in:
Cervantes Yu 2017-03-15 12:41:21 +08:00
Родитель a00bb8ab35
Коммит 8b1cde8577
1 изменённых файлов: 0 добавлений и 17 удалений

Просмотреть файл

@ -25,7 +25,6 @@
#ifdef XP_WIN #ifdef XP_WIN
#include <process.h> #include <process.h>
#include "mozilla/ipc/WindowsMessageLoop.h" #include "mozilla/ipc/WindowsMessageLoop.h"
#include "mozilla/TlsAllocationTracker.h"
#endif #endif
#include "nsAppDirectoryServiceDefs.h" #include "nsAppDirectoryServiceDefs.h"
@ -359,14 +358,6 @@ XRE_InitChildProcess(int aArgc,
#endif #endif
#if defined(XP_WIN) #if defined(XP_WIN)
#ifndef DEBUG
// XXX Bug 1320134: added for diagnosing the crashes because we're running out
// of TLS indices on Windows. Remove after the root cause is found.
if (XRE_GetProcessType() == GeckoProcessType_Content) {
mozilla::InitTlsAllocationTracker();
}
#endif
// From the --attach-console support in nsNativeAppSupportWin.cpp, but // From the --attach-console support in nsNativeAppSupportWin.cpp, but
// here we are a content child process, so we always attempt to attach // here we are a content child process, so we always attempt to attach
// to the parent's (ie, the browser's) console. // to the parent's (ie, the browser's) console.
@ -706,14 +697,6 @@ XRE_InitChildProcess(int aArgc,
} }
} }
#if defined(XP_WIN) && !defined(DEBUG)
// XXX Bug 1320134: added for diagnosing the crashes because we're running out
// of TLS indices on Windows. Remove after the root cause is found.
if (XRE_GetProcessType() == GeckoProcessType_Content) {
mozilla::ShutdownTlsAllocationTracker();
}
#endif
Telemetry::DestroyStatisticsRecorder(); Telemetry::DestroyStatisticsRecorder();
return XRE_DeinitCommandLine(); return XRE_DeinitCommandLine();
} }