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

Introduce CSSLayoutSetLogger to pass the print result to C# side 

Reviewed By: emilsjolander

Differential Revision: D4027044

fbshipit-source-id: 90e2e449260888770f71fa7ea790ca9764d91c44
This commit is contained in:
Kazuki Sakamoto 2016-10-19 11:01:24 -07:00 committed by Facebook Github Bot
parent 5d97f6df15
commit 1607ff2466
2 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
React/CSSLayout/CSSLayout.c
View File

@ -98,6 +98,8 @@ typedef struct CSSNode {
static void _CSSNodeMarkDirty(const CSSNodeRef node); static void _CSSNodeMarkDirty(const CSSNodeRef node);
static CSSLogger gLogger = &printf;
static float static float
computedEdgeValue(const float edges[CSSEdgeCount], const CSSEdge edge, const float defaultValue) { computedEdgeValue(const float edges[CSSEdgeCount], const CSSEdge edge, const float defaultValue) {
CSS_ASSERT(edge <= CSSEdgeEnd, "Cannot get computed value of multi-edge shorthands"); CSS_ASSERT(edge <= CSSEdgeEnd, "Cannot get computed value of multi-edge shorthands");
@ -375,19 +377,19 @@ static bool eq(const float a, const float b) {
static void indent(const uint32_t n) { static void indent(const uint32_t n) {
for (uint32_t i = 0; i < n; i++) { for (uint32_t i = 0; i < n; i++) {
printf(" "); gLogger(" ");
} }
} }
static void printNumberIfNotZero(const char *str, const float number) { static void printNumberIfNotZero(const char *str, const float number) {
if (!eq(number, 0)) { if (!eq(number, 0)) {
printf("%s: %g, ", str, number); gLogger("%s: %g, ", str, number);
} }
} }
static void printNumberIfNotUndefined(const char *str, const float number) { static void printNumberIfNotUndefined(const char *str, const float number) {
if (!CSSValueIsUndefined(number)) { if (!CSSValueIsUndefined(number)) {
printf("%s: %g, ", str, number); gLogger("%s: %g, ", str, number);
} }
} }
@ -398,66 +400,66 @@ static bool eqFour(const float four[4]) {
static void static void
_CSSNodePrint(const CSSNodeRef node, const CSSPrintOptions options, const uint32_t level) { _CSSNodePrint(const CSSNodeRef node, const CSSPrintOptions options, const uint32_t level) {
indent(level); indent(level);
printf("{"); gLogger("{");
if (node->print) { if (node->print) {
node->print(node->context); node->print(node->context);
} }
if (options & CSSPrintOptionsLayout) { if (options & CSSPrintOptionsLayout) {
printf("layout: {"); gLogger("layout: {");
printf("width: %g, ", node->layout.dimensions[CSSDimensionWidth]); gLogger("width: %g, ", node->layout.dimensions[CSSDimensionWidth]);
printf("height: %g, ", node->layout.dimensions[CSSDimensionHeight]); gLogger("height: %g, ", node->layout.dimensions[CSSDimensionHeight]);
printf("top: %g, ", node->layout.position[CSSEdgeTop]); gLogger("top: %g, ", node->layout.position[CSSEdgeTop]);
printf("left: %g", node->layout.position[CSSEdgeLeft]); gLogger("left: %g", node->layout.position[CSSEdgeLeft]);
printf("}, "); gLogger("}, ");
} }
if (options & CSSPrintOptionsStyle) { if (options & CSSPrintOptionsStyle) {
if (node->style.flexDirection == CSSFlexDirectionColumn) { if (node->style.flexDirection == CSSFlexDirectionColumn) {
printf("flexDirection: 'column', "); gLogger("flexDirection: 'column', ");
} else if (node->style.flexDirection == CSSFlexDirectionColumnReverse) { } else if (node->style.flexDirection == CSSFlexDirectionColumnReverse) {
printf("flexDirection: 'column-reverse', "); gLogger("flexDirection: 'column-reverse', ");
} else if (node->style.flexDirection == CSSFlexDirectionRow) { } else if (node->style.flexDirection == CSSFlexDirectionRow) {
printf("flexDirection: 'row', "); gLogger("flexDirection: 'row', ");
} else if (node->style.flexDirection == CSSFlexDirectionRowReverse) { } else if (node->style.flexDirection == CSSFlexDirectionRowReverse) {
printf("flexDirection: 'row-reverse', "); gLogger("flexDirection: 'row-reverse', ");
} }
if (node->style.justifyContent == CSSJustifyCenter) { if (node->style.justifyContent == CSSJustifyCenter) {
printf("justifyContent: 'center', "); gLogger("justifyContent: 'center', ");
} else if (node->style.justifyContent == CSSJustifyFlexEnd) { } else if (node->style.justifyContent == CSSJustifyFlexEnd) {
printf("justifyContent: 'flex-end', "); gLogger("justifyContent: 'flex-end', ");
} else if (node->style.justifyContent == CSSJustifySpaceAround) { } else if (node->style.justifyContent == CSSJustifySpaceAround) {
printf("justifyContent: 'space-around', "); gLogger("justifyContent: 'space-around', ");
} else if (node->style.justifyContent == CSSJustifySpaceBetween) { } else if (node->style.justifyContent == CSSJustifySpaceBetween) {
printf("justifyContent: 'space-between', "); gLogger("justifyContent: 'space-between', ");
} }
if (node->style.alignItems == CSSAlignCenter) { if (node->style.alignItems == CSSAlignCenter) {
printf("alignItems: 'center', "); gLogger("alignItems: 'center', ");
} else if (node->style.alignItems == CSSAlignFlexEnd) { } else if (node->style.alignItems == CSSAlignFlexEnd) {
printf("alignItems: 'flex-end', "); gLogger("alignItems: 'flex-end', ");
} else if (node->style.alignItems == CSSAlignStretch) { } else if (node->style.alignItems == CSSAlignStretch) {
printf("alignItems: 'stretch', "); gLogger("alignItems: 'stretch', ");
} }
if (node->style.alignContent == CSSAlignCenter) { if (node->style.alignContent == CSSAlignCenter) {
printf("alignContent: 'center', "); gLogger("alignContent: 'center', ");
} else if (node->style.alignContent == CSSAlignFlexEnd) { } else if (node->style.alignContent == CSSAlignFlexEnd) {
printf("alignContent: 'flex-end', "); gLogger("alignContent: 'flex-end', ");
} else if (node->style.alignContent == CSSAlignStretch) { } else if (node->style.alignContent == CSSAlignStretch) {
printf("alignContent: 'stretch', "); gLogger("alignContent: 'stretch', ");
} }
if (node->style.alignSelf == CSSAlignFlexStart) { if (node->style.alignSelf == CSSAlignFlexStart) {
printf("alignSelf: 'flex-start', "); gLogger("alignSelf: 'flex-start', ");
} else if (node->style.alignSelf == CSSAlignCenter) { } else if (node->style.alignSelf == CSSAlignCenter) {
printf("alignSelf: 'center', "); gLogger("alignSelf: 'center', ");
} else if (node->style.alignSelf == CSSAlignFlexEnd) { } else if (node->style.alignSelf == CSSAlignFlexEnd) {
printf("alignSelf: 'flex-end', "); gLogger("alignSelf: 'flex-end', ");
} else if (node->style.alignSelf == CSSAlignStretch) { } else if (node->style.alignSelf == CSSAlignStretch) {
printf("alignSelf: 'stretch', "); gLogger("alignSelf: 'stretch', ");
} }
printNumberIfNotUndefined("flexGrow", node->style.flexGrow); printNumberIfNotUndefined("flexGrow", node->style.flexGrow);
@ -465,11 +467,11 @@ _CSSNodePrint(const CSSNodeRef node, const CSSPrintOptions options, const uint32
printNumberIfNotUndefined("flexBasis", node->style.flexBasis); printNumberIfNotUndefined("flexBasis", node->style.flexBasis);
if (node->style.overflow == CSSOverflowHidden) { if (node->style.overflow == CSSOverflowHidden) {
printf("overflow: 'hidden', "); gLogger("overflow: 'hidden', ");
} else if (node->style.overflow == CSSOverflowVisible) { } else if (node->style.overflow == CSSOverflowVisible) {
printf("overflow: 'visible', "); gLogger("overflow: 'visible', ");
} else if (node->style.overflow == CSSOverflowScroll) { } else if (node->style.overflow == CSSOverflowScroll) {
printf("overflow: 'scroll', "); gLogger("overflow: 'scroll', ");
} }
if (eqFour(node->style.margin)) { if (eqFour(node->style.margin)) {
@ -518,7 +520,7 @@ _CSSNodePrint(const CSSNodeRef node, const CSSPrintOptions options, const uint32
printNumberIfNotUndefined("minHeight", node->style.minDimensions[CSSDimensionHeight]); printNumberIfNotUndefined("minHeight", node->style.minDimensions[CSSDimensionHeight]);
if (node->style.positionType == CSSPositionTypeAbsolute) { if (node->style.positionType == CSSPositionTypeAbsolute) {
printf("position: 'absolute', "); gLogger("position: 'absolute', ");
} }
printNumberIfNotUndefined("left", printNumberIfNotUndefined("left",
@ -533,14 +535,14 @@ _CSSNodePrint(const CSSNodeRef node, const CSSPrintOptions options, const uint32
const uint32_t childCount = CSSNodeListCount(node->children); const uint32_t childCount = CSSNodeListCount(node->children);
if (options & CSSPrintOptionsChildren && childCount > 0) { if (options & CSSPrintOptionsChildren && childCount > 0) {
printf("children: [\n"); gLogger("children: [\n");
for (uint32_t i = 0; i < childCount; i++) { for (uint32_t i = 0; i < childCount; i++) {
_CSSNodePrint(CSSNodeGetChild(node, i), options, level + 1); _CSSNodePrint(CSSNodeGetChild(node, i), options, level + 1);
} }
indent(level); indent(level);
printf("]},\n"); gLogger("]},\n");
} else { } else {
printf("},\n"); gLogger("},\n");
} }
} }
@ -2363,6 +2365,10 @@ void CSSNodeCalculateLayout(const CSSNodeRef node,
} }
} }
void CSSLayoutSetLogger(CSSLogger logger) {
gLogger = logger;
}
#ifdef CSS_ASSERT_FAIL_ENABLED #ifdef CSS_ASSERT_FAIL_ENABLED
static CSSAssertFailFunc gAssertFailFunc; static CSSAssertFailFunc gAssertFailFunc;

4
React/CSSLayout/CSSLayout.h
View File

@ -11,6 +11,7 @@
#include <assert.h> #include <assert.h>
#include <math.h> #include <math.h>
#include <stdarg.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -121,6 +122,7 @@ typedef CSSSize (*CSSMeasureFunc)(void *context,
float height, float height,
CSSMeasureMode heightMode); CSSMeasureMode heightMode);
typedef void (*CSSPrintFunc)(void *context); typedef void (*CSSPrintFunc)(void *context);
typedef int (*CSSLogger)(const char *format, ...);
#ifdef CSS_ASSERT_FAIL_ENABLED #ifdef CSS_ASSERT_FAIL_ENABLED
typedef void (*CSSAssertFailFunc)(const char *message); typedef void (*CSSAssertFailFunc)(const char *message);
@ -210,6 +212,8 @@ CSS_NODE_LAYOUT_PROPERTY(float, Width);
CSS_NODE_LAYOUT_PROPERTY(float, Height); CSS_NODE_LAYOUT_PROPERTY(float, Height);
CSS_NODE_LAYOUT_PROPERTY(CSSDirection, Direction); CSS_NODE_LAYOUT_PROPERTY(CSSDirection, Direction);
WIN_EXPORT void CSSLayoutSetLogger(CSSLogger logger);
#ifdef CSS_ASSERT_FAIL_ENABLED #ifdef CSS_ASSERT_FAIL_ENABLED
// Assert // Assert
WIN_EXPORT void CSSAssertSetFailFunc(CSSAssertFailFunc func); WIN_EXPORT void CSSAssertSetFailFunc(CSSAssertFailFunc func);