Merge remote-tracking branch 'refs/remotes/facebook/master' into percentage-feature

# Conflicts: # csharp/Facebook.Yoga/YogaNode.Create.cs
2016-12-19 23:04:15 +01:00
parent e2c586490a 74fb205083
commit 1cb7ca431d
16 changed files with 330 additions and 46 deletions
--- a/java/jni/YGJNI.cpp
+++ b/java/jni/YGJNI.cpp
@@ -36,7 +36,7 @@ static void YGTransferLayoutOutputsRecursive(YGNodeRef root) {
    obj->setFieldValue(topField, YGNodeLayoutGetTop(root));
    YGTransferLayoutDirection(root, obj);

-    for (uint32_t i = 0; i < YGNodeChildCount(root); i++) {
+    for (uint32_t i = 0; i < YGNodeGetChildCount(root); i++) {
      YGTransferLayoutOutputsRecursive(YGNodeGetChild(root, i));
    }
  } else {