DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Assert that node can have measure function <==> node is a leaf node

Browse Source 
Summary:
@public

Instead of silently ignorning non-leaf nodes with measure functions, we should assert that we don't create those kinds of trees.

Reviewed By: emilsjolander

Differential Revision: D4130770

fbshipit-source-id: a3ef10a2e63bbc12b5aa07977e4b84c8d59e3ffe
This commit is contained in:
Andy Street
2016-11-07 05:28:22 -08:00
committed by Facebook Github Bot
parent 0f822bbef2
commit 9c1896043d
2 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
CSSLayout/CSSLayout.c
View File

@@ -255,8 +255,18 @@ static void _CSSNodeMarkDirty(const CSSNodeRef node) {
} }
} }
void CSSNodeSetMeasureFunc(const CSSNodeRef node, CSSMeasureFunc measureFunc) {
CSS_ASSERT(CSSNodeChildCount(node) == 0, "Cannot set measure function: Nodes with measure functions cannot have children.");
node->measure = measureFunc;
}
CSSMeasureFunc CSSNodeGetMeasureFunc(const CSSNodeRef node) {
return node->measure;
}
void CSSNodeInsertChild(const CSSNodeRef node, const CSSNodeRef child, const uint32_t index) { void CSSNodeInsertChild(const CSSNodeRef node, const CSSNodeRef child, const uint32_t index) {
CSS_ASSERT(child->parent == NULL, "Child already has a parent, it must be removed first."); CSS_ASSERT(child->parent == NULL, "Child already has a parent, it must be removed first.");
CSS_ASSERT(node->measure == NULL, "Cannot add child: Nodes with measure functions cannot have children.");
CSSNodeListInsert(&node->children, child, index); CSSNodeListInsert(&node->children, child, index);
child->parent = node; child->parent = node;
_CSSNodeMarkDirty(node); _CSSNodeMarkDirty(node);
@@ -278,7 +288,7 @@ inline uint32_t CSSNodeChildCount(const CSSNodeRef node) {
} }
void CSSNodeMarkDirty(const CSSNodeRef node) { void CSSNodeMarkDirty(const CSSNodeRef node) {
CSS_ASSERT(node->measure != NULL || CSSNodeChildCount(node) > 0, CSS_ASSERT(node->measure != NULL,
"Only leaf nodes with custom measure functions" "Only leaf nodes with custom measure functions"
"should manually mark themselves as dirty"); "should manually mark themselves as dirty");
_CSSNodeMarkDirty(node); _CSSNodeMarkDirty(node);
@@ -367,7 +377,6 @@ void CSSNodeStyleSetFlex(const CSSNodeRef node, const float flex) {
} }
CSS_NODE_PROPERTY_IMPL(void *, Context, context, context); CSS_NODE_PROPERTY_IMPL(void *, Context, context, context);
CSS_NODE_PROPERTY_IMPL(CSSMeasureFunc, MeasureFunc, measureFunc, measure);
CSS_NODE_PROPERTY_IMPL(CSSPrintFunc, PrintFunc, printFunc, print); CSS_NODE_PROPERTY_IMPL(CSSPrintFunc, PrintFunc, printFunc, print);
CSS_NODE_PROPERTY_IMPL(bool, IsTextnode, isTextNode, isTextNode); CSS_NODE_PROPERTY_IMPL(bool, IsTextnode, isTextNode, isTextNode);
CSS_NODE_PROPERTY_IMPL(bool, HasNewLayout, hasNewLayout, hasNewLayout); CSS_NODE_PROPERTY_IMPL(bool, HasNewLayout, hasNewLayout, hasNewLayout);
@@ -1211,7 +1220,7 @@ static void layoutNodeImpl(const CSSNodeRef node,
// For content (text) nodes, determine the dimensions based on the text // For content (text) nodes, determine the dimensions based on the text
// contents. // contents.
if (node->measure && CSSNodeChildCount(node) == 0) { if (node->measure) {
const float innerWidth = availableWidth - marginAxisRow - paddingAndBorderAxisRow; const float innerWidth = availableWidth - marginAxisRow - paddingAndBorderAxisRow;
const float innerHeight = availableHeight - marginAxisColumn - paddingAndBorderAxisColumn; const float innerHeight = availableHeight - marginAxisColumn - paddingAndBorderAxisColumn;
@@ -2185,7 +2194,7 @@ bool layoutNodeInternal(const CSSNodeRef node,
// most // most
// expensive to measure, so it's worth avoiding redundant measurements if at // expensive to measure, so it's worth avoiding redundant measurements if at
// all possible. // all possible.
if (node->measure && CSSNodeChildCount(node) == 0) { if (node->measure) {
const float marginAxisRow = getMarginAxis(node, CSSFlexDirectionRow); const float marginAxisRow = getMarginAxis(node, CSSFlexDirectionRow);
const float marginAxisColumn = getMarginAxis(node, CSSFlexDirectionColumn); const float marginAxisColumn = getMarginAxis(node, CSSFlexDirectionColumn);

26
tests/CSSLayoutMeasureTest.cpp
View File

@@ -15,30 +15,24 @@ static CSSSize _measure(CSSNodeRef node,
CSSMeasureMode widthMode, CSSMeasureMode widthMode,
float height, float height,
CSSMeasureMode heightMode) { CSSMeasureMode heightMode) {
int *measureCount = (int *)CSSNodeGetContext(node);
*measureCount = *measureCount + 1;
return CSSSize { return CSSSize {
.width = widthMode == CSSMeasureModeUndefined ? 10 : width, .width = 0,
.height = heightMode == CSSMeasureModeUndefined ? 10 : width, .height = 0,
}; };
} }
TEST(CSSLayoutTest, ignore_measure_on_non_leaf_node) { TEST(CSSLayoutTest, cannot_add_child_to_node_with_measure_func) {
const CSSNodeRef root = CSSNodeNew(); const CSSNodeRef root = CSSNodeNew();
int measureCount = 0;
CSSNodeSetContext(root, &measureCount);
CSSNodeSetMeasureFunc(root, _measure); CSSNodeSetMeasureFunc(root, _measure);
const CSSNodeRef root_child0 = CSSNodeNew(); const CSSNodeRef root_child0 = CSSNodeNew();
int childMeasureCount = 0; ASSERT_DEATH(CSSNodeInsertChild(root, root_child0, 0), "Cannot add child.*");
CSSNodeSetContext(root_child0, &childMeasureCount); }
CSSNodeSetMeasureFunc(root_child0, _measure);
TEST(CSSLayoutTest, cannot_add_measure_func_to_non_leaf_node) {
const CSSNodeRef root = CSSNodeNew();
const CSSNodeRef root_child0 = CSSNodeNew();
CSSNodeInsertChild(root, root_child0, 0); CSSNodeInsertChild(root, root_child0, 0);
CSSNodeCalculateLayout(root, CSSUndefined, CSSUndefined, CSSDirectionLTR); ASSERT_DEATH(CSSNodeSetMeasureFunc(root, _measure), "Cannot set measure function.*");
ASSERT_EQ(0, measureCount);
ASSERT_EQ(1, childMeasureCount);
CSSNodeFreeRecursive(root);
} }