wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1248896 - don't conditional compile on config ENABLE_TESTS in Nuwa. r=khuey

Browse Source
This commit is contained in:
Cervantes Yu 2016-02-18 15:33:59 +08:00
parent ff7604e68d
commit 0b0aa6da47
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ipc/glue/MessageLink.cpp
View File

@ -16,7 +16,7 @@
#include "mozilla/dom/ContentParent.h" #include "mozilla/dom/ContentParent.h"
#include "mozilla/dom/PNuwa.h" #include "mozilla/dom/PNuwa.h"
#include "mozilla/hal_sandbox/PHal.h" #include "mozilla/hal_sandbox/PHal.h"
#if defined(DEBUG) || defined(ENABLE_TESTS) #ifdef DEBUG
#include "jsprf.h" #include "jsprf.h"
extern "C" char* PrintJSStack(); extern "C" char* PrintJSStack();
#endif #endif
@ -202,18 +202,17 @@ ProcessLink::SendMessage(Message *msg)
} }
} }
#if defined(DEBUG)
// Nuwa to parent: check whether we are currently blocked. // Nuwa to parent: check whether we are currently blocked.
if (IsNuwaProcess() && mIsBlocked) { if (IsNuwaProcess() && mIsBlocked) {
#if defined(ENABLE_TESTS) || defined(DEBUG)
char* jsstack = PrintJSStack(); char* jsstack = PrintJSStack();
printf_stderr("Fatal error: sending a message to the chrome process" printf_stderr("Fatal error: sending a message to the chrome process"
"with a blocked IPC channel from \n%s", "with a blocked IPC channel from \n%s",
jsstack ? jsstack : "<no JS stack>"); jsstack ? jsstack : "<no JS stack>");
JS_smprintf_free(jsstack); JS_smprintf_free(jsstack);
MOZ_CRASH(); MOZ_CRASH();
#endif
} }
#endif
#endif #endif
mIOLoop->PostTask( mIOLoop->PostTask(

2
mozglue/build/Nuwa.cpp
View File

@ -2077,7 +2077,7 @@ IsNuwaReady() {
return sNuwaReady; return sNuwaReady;
} }
#if defined(DEBUG) || defined(ENABLE_TESTS) #if defined(DEBUG)
MFBT_API void MFBT_API void
NuwaAssertNotFrozen(unsigned int aThread, const char* aThreadName) { NuwaAssertNotFrozen(unsigned int aThread, const char* aThreadName) {
if (!sIsNuwaProcess || !sIsFreezing) { if (!sIsNuwaProcess || !sIsFreezing) {

2
mozglue/build/Nuwa.h
View File

@ -187,7 +187,7 @@ MFBT_API bool IsNuwaProcess();
*/ */
MFBT_API bool IsNuwaReady(); MFBT_API bool IsNuwaReady();
#if defined(DEBUG) || defined(ENABLE_TESTS) #if defined(DEBUG)
/** /**
* Asserts that aThread is not frozen. * Asserts that aThread is not frozen.
*/ */