status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove CSSAssertSetFailFunc 

Reviewed By: emilsjolander

Differential Revision: D4155452

fbshipit-source-id: 5a19c79a212f204d13064527fd6e5843bab76e6b
This commit is contained in:
Kazuki Sakamoto 2016-11-09 17:26:48 -08:00 committed by Facebook Github Bot
parent 9439b25e33
commit 1d9d8e93fb
3 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
React/CSSLayout/CSSLayout.c
View File

@ -2497,17 +2497,3 @@ void CSSLog(CSSLogLevel level, const char *format, ...) {
gLogger(level, format, args); gLogger(level, format, args);
va_end(args); va_end(args);
} }
#ifdef CSS_ASSERT_FAIL_ENABLED
static CSSAssertFailFunc gAssertFailFunc;
void CSSAssertSetFailFunc(CSSAssertFailFunc func) {
gAssertFailFunc = func;
}
void CSSAssertFail(const char *message) {
if (gAssertFailFunc) {
(*gAssertFailFunc)(message);
}
}
#endif

10
React/CSSLayout/CSSLayout.h
View File

@ -132,10 +132,6 @@ typedef CSSSize (*CSSMeasureFunc)(CSSNodeRef node,
typedef void (*CSSPrintFunc)(CSSNodeRef node); typedef void (*CSSPrintFunc)(CSSNodeRef node);
typedef int (*CSSLogger)(CSSLogLevel level, const char *format, va_list args); typedef int (*CSSLogger)(CSSLogLevel level, const char *format, va_list args);
#ifdef CSS_ASSERT_FAIL_ENABLED
typedef void (*CSSAssertFailFunc)(const char *message);
#endif
// CSSNode // CSSNode
WIN_EXPORT CSSNodeRef CSSNodeNew(void); WIN_EXPORT CSSNodeRef CSSNodeNew(void);
WIN_EXPORT void CSSNodeInit(const CSSNodeRef node); WIN_EXPORT void CSSNodeInit(const CSSNodeRef node);
@ -242,10 +238,4 @@ CSS_NODE_LAYOUT_PROPERTY(CSSDirection, Direction);
WIN_EXPORT void CSSLayoutSetLogger(CSSLogger logger); WIN_EXPORT void CSSLayoutSetLogger(CSSLogger logger);
WIN_EXPORT void CSSLog(CSSLogLevel level, const char *message, ...); WIN_EXPORT void CSSLog(CSSLogLevel level, const char *message, ...);
#ifdef CSS_ASSERT_FAIL_ENABLED
// Assert
WIN_EXPORT void CSSAssertSetFailFunc(CSSAssertFailFunc func);
WIN_EXPORT void CSSAssertFail(const char *message);
#endif
CSS_EXTERN_C_END CSS_EXTERN_C_END

8
React/CSSLayout/CSSMacros.h
View File

@ -33,16 +33,10 @@
#define CSS_ABORT() #define CSS_ABORT()
#endif #endif
#if CSS_ASSERT_FAIL_ENABLED
#define CSS_ERROR_FUNC(message) CSSAssertFail(message)
#else
#define CSS_ERROR_FUNC(message) CSSLog(CSSLogLevelError, "%s", message)
#endif
#ifndef CSS_ASSERT #ifndef CSS_ASSERT
#define CSS_ASSERT(X, message) \ #define CSS_ASSERT(X, message) \
if (!(X)) { \ if (!(X)) { \
CSS_ERROR_FUNC(message); \ CSSLog(CSSLogLevelError, "%s", message); \
CSS_ABORT(); \ CSS_ABORT(); \
} }
#endif #endif