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

Don't assume a node with a measure function is a leaf node

Browse Source 
Summary: Don't assume a node with a measure function is a leaf node

Reviewed By: gkassabli

Differential Revision: D4021096

fbshipit-source-id: 7e039239b1697a0ac42dce9f4b7e252a931bad7e
This commit is contained in:
Emil Sjolander
2016-10-14 04:35:46 -07:00
committed by Facebook Github Bot
parent 14009ec470
commit b45a7e3737
2 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CSSLayout/CSSLayout.c
View File

@@ -242,10 +242,9 @@ uint32_t CSSNodeChildCount(const CSSNodeRef node) {
}
void CSSNodeMarkDirty(const CSSNodeRef node) {
CSS_ASSERT(node->measure != NULL,
"Nodes without custom measure functions "
"should not manually mark themselves as "
"dirty");
CSS_ASSERT(node->measure != NULL || CSSNodeChildCount(node) > 0,
"Only leaf nodes with custom measure functions"
"should manually mark themselves as dirty");
_CSSNodeMarkDirty(node);
}
@@ -966,7 +965,7 @@ static void layoutNodeImpl(const CSSNodeRef node,
// For content (text) nodes, determine the dimensions based on the text
// contents.
if (node->measure) {
if (node->measure && CSSNodeChildCount(node) == 0) {
const float innerWidth = availableWidth - marginAxisRow - paddingAndBorderAxisRow;
const float innerHeight = availableHeight - marginAxisColumn - paddingAndBorderAxisColumn;
@@ -2100,7 +2099,7 @@ bool layoutNodeInternal(const CSSNodeRef node,
// most
// expensive to measure, so it's worth avoiding redundant measurements if at
// all possible.
if (node->measure) {
if (node->measure && CSSNodeChildCount(node) == 0) {
const float marginAxisRow = getMarginAxis(node, CSSFlexDirectionRow);
const float marginAxisColumn = getMarginAxis(node, CSSFlexDirectionColumn);