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/tests/YGLayoutAspectRatioTest.cpp
+++ b/tests/YGLayoutAspectRatioTest.cpp
--- a/tests/YGLayoutDefaultValuesTest.cpp
+++ b/tests/YGLayoutDefaultValuesTest.cpp
@@ -13,7 +13,7 @@
 TEST(YogaTest, assert_default_values) {
  const YGNodeRef root = YGNodeNew();

-  ASSERT_EQ(0, YGNodeChildCount(root));
+  ASSERT_EQ(0, YGNodeGetChildCount(root));
  ASSERT_EQ(NULL, YGNodeGetChild(root, 1));

  ASSERT_EQ(YGDirectionInherit, YGNodeStyleGetDirection(root));