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

Move node cloning to YGConfig

Browse Source 
Summary:
@public

Encapsulates node cloning within `YGConfig`.
This is necessary for allowing for context-aware cloning functions, which will ultimately allow for removal of weak global JNI references.

Reviewed By: shergin

Differential Revision: D14132608

fbshipit-source-id: 0dec114c8e172b1e34a4b7fd146c43f13c151ade
This commit is contained in:
David Aurelio
2019-02-20 11:52:38 -08:00
committed by Facebook Github Bot
parent 2643b96589
commit 367a93de88
5 changed files with 82 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
yoga/Yoga.cpp
View File

@@ -425,8 +425,6 @@ void YGNodeRemoveChild(const YGNodeRef owner, const YGNodeRef excludedChild) {
// Otherwise we have to clone the node list except for the child we're trying
// to delete. We don't want to simply clone all children, because then the
// host will need to free the clone of the child that was just deleted.
const YGCloneNodeFunc cloneNodeCallback =
owner->getConfig()->cloneNodeCallback;
uint32_t nextInsertIndex = 0;
for (uint32_t i = 0; i < childCount; i++) {
const YGNodeRef oldChild = owner->getChild(i);
@@ -437,13 +435,8 @@ void YGNodeRemoveChild(const YGNodeRef owner, const YGNodeRef excludedChild) {
owner->markDirtyAndPropogate();
continue;
}
YGNodeRef newChild = nullptr;
if (cloneNodeCallback) {
newChild = cloneNodeCallback(oldChild, owner, nextInsertIndex);
}
if (newChild == nullptr) {
newChild = YGNodeClone(oldChild);
}
YGNodeRef newChild =
owner->getConfig()->cloneNode(oldChild, owner, nextInsertIndex);
owner->replaceChild(newChild, nextInsertIndex);
newChild->setOwner(owner);
@@ -4293,7 +4286,7 @@ void* YGConfigGetContext(const YGConfigRef config) {
void YGConfigSetCloneNodeFunc(
const YGConfigRef config,
const YGCloneNodeFunc callback) {
config->cloneNodeCallback = callback;
config->setCloneNodeCallback(callback);
}
static void YGTraverseChildrenPreOrder(