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

Only mark Nodes dirty if an actual node is removed.

Browse Source 
Summary: Currently, when we try to remove a child from a node, that node is mark dirty //regardless of whether or not anything was actually removed//. This fixes it.

Reviewed By: gkassabli

Differential Revision: D4125453

fbshipit-source-id: 745cfc55269415fea106a80c72401eb3074f2d31
This commit is contained in:
Dustin Shahidehpour
2016-11-03 13:30:34 -07:00
committed by Facebook Github Bot
parent b938017ccf
commit e00e30ca15
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CSSLayout/CSSLayout.c
View File

@@ -263,9 +263,10 @@ void CSSNodeInsertChild(const CSSNodeRef node, const CSSNodeRef child, const uin
} }
void CSSNodeRemoveChild(const CSSNodeRef node, const CSSNodeRef child) { void CSSNodeRemoveChild(const CSSNodeRef node, const CSSNodeRef child) {
CSSNodeListDelete(node->children, child); if (CSSNodeListDelete(node->children, child) != NULL) {
child->parent = NULL; child->parent = NULL;
_CSSNodeMarkDirty(node); _CSSNodeMarkDirty(node);
}
} }
CSSNodeRef CSSNodeGetChild(const CSSNodeRef node, const uint32_t index) { CSSNodeRef CSSNodeGetChild(const CSSNodeRef node, const uint32_t index) {

22
tests/CSSLayoutDirtyMarkingTest.cpp
View File

@@ -69,3 +69,25 @@ TEST(CSSLayoutTest, dirty_propagation_only_if_prop_changed) {
CSSNodeFreeRecursive(root); CSSNodeFreeRecursive(root);
} }
TEST(CSSLayoutTest, dirty_node_only_if_children_are_actually_removed) {
const CSSNodeRef root = CSSNodeNew();
CSSNodeStyleSetAlignItems(root, CSSAlignFlexStart);
CSSNodeStyleSetWidth(root, 50);
CSSNodeStyleSetHeight(root, 50);
const CSSNodeRef child0 = CSSNodeNew();
CSSNodeStyleSetWidth(child0, 50);
CSSNodeStyleSetHeight(child0, 25);
CSSNodeInsertChild(root, child0, 0);
CSSNodeCalculateLayout(root, CSSUndefined, CSSUndefined, CSSDirectionLTR);
CSSNodeRemoveChild(root, CSSNodeNew());
EXPECT_FALSE(CSSNodeIsDirty(root));
CSSNodeRemoveChild(root, child0);
EXPECT_TRUE(CSSNodeIsDirty(root));
CSSNodeFreeRecursive(root);
}