minus total outer flex basis for available width or height

.clang-format

@@ -1,56 +0,0 @@
-Language: Cpp
-AccessModifierOffset: -2
-AlignAfterOpenBracket: AlwaysBreak
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AlignEscapedNewlines: Left
-AlignOperands: false
-AlignTrailingComments: false
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: Empty
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: true
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: true
-AlwaysBreakTemplateDeclarations: Yes
-BinPackArguments: false
-BinPackParameters: false
-BreakBeforeBinaryOperators: false
-BreakBeforeBraces: Attach
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializers: BeforeColon
-BreakInheritanceList: BeforeColon
-BreakStringLiterals: true
-ColumnLimit: 80
-CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: false
-FixNamespaceComments: true
-IndentCaseLabels: true
-IndentPPDirectives: None
-IndentWidth: 2
-IndentWrappedFunctionNames: false
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-PenaltyReturnTypeOnItsOwnLine: 2000
-PointerAlignment: Left
-ReflowComments: true
-SortIncludes: false
-SortUsingDeclarations: true
-SpaceAfterCStyleCast: true
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeCpp11BracedList: false
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeInheritanceColon: true
-SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-Standard: Cpp11
-UseTab: Never

.clang-format-ignore

@@ -1 +0,0 @@
-^lib/.*

BUCK

@@ -34,7 +34,6 @@ yoga_cxx_library(
 yoga_cxx_test(
     name = "YogaTests",
     srcs = glob(["tests/*.cpp"]),
-    headers = subdir_glob([("", "yoga/**/*.h")]),
     compiler_flags = TEST_COMPILER_FLAGS,
     contacts = ["emilsj@fb.com"],
     visibility = ["PUBLIC"],

Yoga.podspec

@@ -1,12 +1,6 @@
-#
-#  Copyright (c) Facebook, Inc. and its affiliates.
-#
-#  This source code is licensed under the MIT license found in the LICENSE
-#  file in the root directory of this source tree.
-#
 Pod::Spec.new do |spec|
   spec.name = 'Yoga'
-  spec.version = '1.12.0-pre.1'
+  spec.version = '1.9.0'
   spec.license =  { :type => 'MIT', :file => "LICENSE" }
   spec.homepage = 'https://yogalayout.com/'
   spec.documentation_url = 'https://yogalayout.com/docs'
@@ -19,7 +13,7 @@ Pod::Spec.new do |spec|
     :git => 'https://github.com/facebook/yoga.git',
     :tag => spec.version.to_s,
   }
-  spec.platforms = { :ios => "4.3", :osx => "10.7", :tvos => "10.0", :watchos => "2.0" }
+  spec.platforms = { :ios => "8.0", :tvos => "10.0" }
   spec.module_name = 'yoga'
   spec.requires_arc = false
   spec.pod_target_xcconfig = {
@@ -34,6 +28,6 @@ Pod::Spec.new do |spec|
       '-fPIC'
   ]
   spec.source_files = 'yoga/**/*.{c,h,cpp}'
-  spec.public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
+  spec.public_header_files = 'yoga/{Yoga,YGEnums,YGMacros}.h'
 
 end

YogaKit.podspec

@@ -1,12 +1,6 @@
-#
-#  Copyright (c) Facebook, Inc. and its affiliates.
-#
-#  This source code is licensed under the MIT license found in the LICENSE
-#  file in the root directory of this source tree.
-#
 podspec = Pod::Spec.new do |spec|
   spec.name = 'YogaKit'
-  spec.version = '1.12.0'
+  spec.version = '1.9.0'
   spec.license =  { :type => 'MIT', :file => "LICENSE" }
   spec.homepage = 'https://facebook.github.io/yoga/'
   spec.documentation_url = 'https://facebook.github.io/yoga/docs/api/yogakit/'
@@ -28,7 +22,6 @@ podspec = Pod::Spec.new do |spec|
   spec.source_files = 'YogaKit/Source/*.{h,m,swift}'
   spec.public_header_files = 'YogaKit/Source/{YGLayout,UIView+Yoga}.h'
   spec.private_header_files = 'YogaKit/Source/YGLayout+Private.h'
-  spec.swift_version = '3.0'
 end
 
 # See https://github.com/facebook/yoga/pull/366

YogaKit/Source/UIView+Yoga.h

@@ -1,9 +1,10 @@
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #import "YGLayout.h"
 #import <UIKit/UIKit.h>
 

YogaKit/Source/YGLayout+Private.h

@@ -1,9 +1,10 @@
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #import "YGLayout.h"
 #import <yoga/Yoga.h>
 

YogaKit/Source/YGLayout.h

@@ -1,9 +1,10 @@
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #import <UIKit/UIKit.h>
 #import <yoga/YGEnums.h>
 #import <yoga/Yoga.h>
@@ -62,7 +63,6 @@ typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
 @property (nonatomic, readwrite, assign) YGOverflow overflow;
 @property (nonatomic, readwrite, assign) YGDisplay display;
 
-@property (nonatomic, readwrite, assign) CGFloat flex;
 @property (nonatomic, readwrite, assign) CGFloat flexGrow;
 @property (nonatomic, readwrite, assign) CGFloat flexShrink;
 @property (nonatomic, readwrite, assign) YGValue flexBasis;

YogaKit/Source/YGLayout.m

@@ -129,7 +129,6 @@ static YGConfigRef globalConfig;
 @interface YGLayout ()
 
 @property (nonatomic, weak, readonly) UIView *view;
-@property(nonatomic, assign, readonly) BOOL isUIView;
 
 @end
 
@@ -154,7 +153,6 @@ static YGConfigRef globalConfig;
     YGNodeSetContext(_node, (__bridge void *) view);
     _isEnabled = NO;
     _isIncludedInLayout = YES;
-    _isUIView = [view isMemberOfClass:[UIView class]];
   }
 
   return self;
@@ -180,7 +178,7 @@ static YGConfigRef globalConfig;
   // the measure function. Since we already know that this is a leaf,
   // this *should* be fine. Forgive me Hack Gods.
   const YGNodeRef node = self.node;
-  if (YGNodeHasMeasureFunc(node)) {
+  if (YGNodeGetMeasureFunc(node) == NULL) {
     YGNodeSetMeasureFunc(node, YGMeasureView);
   }
 
@@ -229,7 +227,6 @@ YG_PROPERTY(YGWrap, flexWrap, FlexWrap)
 YG_PROPERTY(YGOverflow, overflow, Overflow)
 YG_PROPERTY(YGDisplay, display, Display)
 
-YG_PROPERTY(CGFloat, flex, Flex)
 YG_PROPERTY(CGFloat, flexGrow, FlexGrow)
 YG_PROPERTY(CGFloat, flexShrink, FlexShrink)
 YG_AUTO_VALUE_PROPERTY(flexBasis, FlexBasis)
@@ -334,20 +331,10 @@ static YGSize YGMeasureView(
   const CGFloat constrainedHeight = (heightMode == YGMeasureModeUndefined) ? CGFLOAT_MAX: height;
 
   UIView *view = (__bridge UIView*) YGNodeGetContext(node);
-  CGSize sizeThatFits = CGSizeZero;
-
-  // The default implementation of sizeThatFits: returns the existing size of
-  // the view. That means that if we want to layout an empty UIView, which
-  // already has got a frame set, its measured size should be CGSizeZero, but
-  // UIKit returns the existing size.
-  //
-  // See https://github.com/facebook/yoga/issues/606 for more information.
-  if (!view.yoga.isUIView || [view.subviews count] > 0) {
-    sizeThatFits = [view sizeThatFits:(CGSize){
-                                          .width = constrainedWidth,
-                                          .height = constrainedHeight,
-                                      }];
-  }
+  const CGSize sizeThatFits = [view sizeThatFits:(CGSize) {
+    .width = constrainedWidth,
+    .height = constrainedHeight,
+  }];
 
   return (YGSize) {
     .width = YGSanitizeMeasurement(constrainedWidth, sizeThatFits.width, widthMode),
@@ -425,7 +412,9 @@ static void YGRemoveAllChildren(const YGNodeRef node)
     return;
   }
 
-  YGNodeRemoveAllChildren(node);
+  while (YGNodeGetChildCount(node) > 0) {
+    YGNodeRemoveChild(node, YGNodeGetChild(node, YGNodeGetChildCount(node) - 1));
+  }
 }
 
 static CGFloat YGRoundPixelValue(CGFloat value)

YogaKit/Tests/YogaKitTests.m

@@ -127,15 +127,6 @@
   XCTAssertEqual(longTextLabelSize.width + textBadgeView.yoga.intrinsicSize.width, containerSize.width);
 }
 
-- (void)testSizeThatFitsEmptyView {
-  UIView* view = [[UIView alloc] initWithFrame:CGRectMake(10, 10, 200, 200)];
-  view.yoga.isEnabled = YES;
-
-  const CGSize viewSize = view.yoga.intrinsicSize;
-  XCTAssertEqual(viewSize.height, 0);
-  XCTAssertEqual(viewSize.width, 0);
-}
-
 - (void)testPreservingOrigin
 {
   UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0,0,50,75)];

YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.pbxproj

@@ -1,10 +1,3 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 // !$*UTF8*$!
 {
 	archiveVersion = 1;

YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,10 +1,3 @@
-<!--
-  Copyright (c) Facebook, Inc. and its affiliates.
-
-  This source code is licensed under the MIT license found in the
-  LICENSE file in the root directory of this source tree.
--->
-
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">

YogaKit/YogaKitSample/YogaKitSample.xcworkspace/contents.xcworkspacedata

@@ -1,10 +1,3 @@
-<!--
-  Copyright (c) Facebook, Inc. and its affiliates.
-
-  This source code is licensed under the MIT license found in the
-  LICENSE file in the root directory of this source tree.
--->
-
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">

android/build.gradle

@@ -1,10 +1,3 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'

android/gradle.properties

@@ -1,10 +1,3 @@
-#
-#  Copyright (c) Facebook, Inc. and its affiliates.
-#
-#  This source code is licensed under the MIT license found in the LICENSE
-#  file in the root directory of this source tree.
-#
-
 GROUP=com.facebook.yoga.android
 POM_NAME=YogaLayout
 POM_DESCRIPTION=YogaLayout

android/sample/BUCK

@@ -4,7 +4,6 @@
 # This source code is licensed under the license found in the
 # LICENSE-examples file in the root directory of this source tree.
 
-load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
 load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_RES_TARGET", "ANDROID_SAMPLE_JAVA_TARGET", "ANDROID_SAMPLE_RES_TARGET", "yoga_android_binary", "yoga_android_resource")
 
 yoga_android_binary(
@@ -29,7 +28,7 @@ yoga_android_resource(
     ],
 )
 
-fb_native.keystore(
+keystore(
     name = "debug_keystore",
     properties = "debug.keystore.properties",
     store = "debug.keystore",

android/src/main/java/com/facebook/yoga/android/VirtualYogaLayout.java

@@ -33,7 +33,7 @@ public class VirtualYogaLayout extends ViewGroup {
 
   final private List<View> mChildren = new LinkedList<>();
   final private Map<View, YogaNode> mYogaNodes = new HashMap<>();
-  final private YogaNode mYogaNode = YogaNode.create();
+  final private YogaNode mYogaNode = new YogaNode();
 
   public VirtualYogaLayout(Context context) {
     super(context);
@@ -73,7 +73,7 @@ public class VirtualYogaLayout extends ViewGroup {
       return;
     }
 
-    YogaNode node = YogaNode.create();
+    YogaNode node = new YogaNode();
     YogaLayout.LayoutParams lp = new YogaLayout.LayoutParams(params);
     YogaLayout.applyLayoutParams(lp, node, child);
     node.setData(child);

android/src/main/java/com/facebook/yoga/android/YogaLayout.java

@@ -78,7 +78,7 @@ public class YogaLayout extends ViewGroup {
   public YogaLayout(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
 
-    mYogaNode = YogaNode.create();
+    mYogaNode = new YogaNode();
     mYogaNodes = new HashMap<>();
 
     mYogaNode.setData(this);
@@ -155,7 +155,7 @@ public class YogaLayout extends ViewGroup {
       if(mYogaNodes.containsKey(child)) {
         childNode = mYogaNodes.get(child);
       } else {
-        childNode = YogaNode.create();
+        childNode = new YogaNode();
       }
 
       childNode.setData(child);

benchmark/YGBenchmark.c

@@ -1,9 +1,10 @@
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #include <math.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -15,7 +16,7 @@
 #define NUM_REPETITIONS 1000
 
 #define YGBENCHMARKS(BLOCK)                \
-  int main(int argc, char const* argv[]) { \
+  int main(int argc, char const *argv[]) { \
     clock_t __start;                       \
     clock_t __endTimes[NUM_REPETITIONS];   \
     { BLOCK }                              \
@@ -25,13 +26,14 @@
 #define YGBENCHMARK(NAME, BLOCK)                         \
   __start = clock();                                     \
   for (uint32_t __i = 0; __i < NUM_REPETITIONS; __i++) { \
-    {BLOCK} __endTimes[__i] = clock();                   \
+    { BLOCK }                                            \
+    __endTimes[__i] = clock();                           \
   }                                                      \
   __printBenchmarkResult(NAME, __start, __endTimes);
 
-static int __compareDoubles(const void* a, const void* b) {
-  double arg1 = *(const double*) a;
-  double arg2 = *(const double*) b;
+static int __compareDoubles(const void *a, const void *b) {
+  double arg1 = *(const double *) a;
+  double arg2 = *(const double *) b;
 
   if (arg1 < arg2) {
     return -1;
@@ -44,10 +46,7 @@ static int __compareDoubles(const void* a, const void* b) {
   return 0;
 }
 
-static void __printBenchmarkResult(
-    char* name,
-    clock_t start,
-    clock_t* endTimes) {
+static void __printBenchmarkResult(char *name, clock_t start, clock_t *endTimes) {
   double timesInMs[NUM_REPETITIONS];
   double mean = 0;
   clock_t lastEnd = start;
@@ -71,12 +70,12 @@ static void __printBenchmarkResult(
   printf("%s: median: %lf ms, stddev: %lf ms\n", name, median, stddev);
 }
 
-static YGSize _measure(
-    YGNodeRef node,
-    float width,
-    YGMeasureMode widthMode,
-    float height,
-    YGMeasureMode heightMode) {
+
+static YGSize _measure(YGNodeRef node,
+                       float width,
+                       YGMeasureMode widthMode,
+                       float height,
+                       YGMeasureMode heightMode) {
   return (YGSize){
       .width = widthMode == YGMeasureModeUndefined ? 10 : width,
       .height = heightMode == YGMeasureModeUndefined ? 10 : width,
@@ -84,6 +83,7 @@ static YGSize _measure(
 }
 
 YGBENCHMARKS({
+
   YGBENCHMARK("Stack with flex", {
     const YGNodeRef root = YGNodeNew();
     YGNodeStyleSetWidth(root, 100);
@@ -161,8 +161,7 @@ YGBENCHMARKS({
 
           for (uint32_t iiii = 0; iiii < 10; iiii++) {
             const YGNodeRef grandGrandGrandChild = YGNodeNew();
-            YGNodeStyleSetFlexDirection(
-                grandGrandGrandChild, YGFlexDirectionRow);
+            YGNodeStyleSetFlexDirection(grandGrandGrandChild, YGFlexDirectionRow);
             YGNodeStyleSetFlexGrow(grandGrandGrandChild, 1);
             YGNodeStyleSetWidth(grandGrandGrandChild, 10);
             YGNodeStyleSetHeight(grandGrandGrandChild, 10);
@@ -175,4 +174,5 @@ YGBENCHMARKS({
     YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
     YGNodeFreeRecursive(root);
   });
+
 });

build.gradle

@@ -1,20 +1,12 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
     repositories {
-        google()
         jcenter()
         maven { url 'https://maven.google.com/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.0.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 
@@ -25,7 +17,6 @@ buildscript {
 
 allprojects {
   repositories {
-    google()
     jcenter()
   }
 }

csharp/BUCK

@@ -3,7 +3,6 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
 load(
     "//tools/build_defs/oss:yoga_defs.bzl",
     "BASE_COMPILER_FLAGS",
@@ -14,14 +13,14 @@ load(
 
 COMPILER_FLAGS = BASE_COMPILER_FLAGS + ["-std=c++11"]
 
-fb_native.csharp_library(
+csharp_library(
     name = "yogalibnet46",
     srcs = glob(["**/*.cs"]),
     dll_name = "Facebook.Yoga.dll",
     framework_ver = "net46",
 )
 
-fb_native.csharp_library(
+csharp_library(
     name = "yogalibnet45",
     srcs = glob(["**/*.cs"]),
     dll_name = "Facebook.Yoga.dll",
@@ -30,7 +29,7 @@ fb_native.csharp_library(
 
 yoga_cxx_library(
     name = "yoganet",
-    srcs = ["Yoga/YGInterop.cpp"],
+    srcs = glob(["Yoga/YGInterop.cpp"]),
     compiler_flags = COMPILER_FLAGS,
     link_style = "static",
     link_whole = True,

csharp/Facebook.Yoga/Native.cs

@@ -10,6 +10,12 @@ using System.Runtime.InteropServices;
 
 namespace Facebook.Yoga
 {
+#if WINDOWS_UWP_ARM
+    using YogaValueType = IntPtr;
+#else
+    using YogaValueType = YogaValue;
+#endif
+
     internal static class Native
     {
 #if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
@@ -68,14 +74,6 @@ namespace Facebook.Yoga
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern bool YGConfigGetUseWebDefaults(YGConfigHandle config);
 
-        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void YGConfigSetUseLegacyStretchBehaviour(
-            YGConfigHandle config,
-            bool useLegacyStretchBehavior);
-
-        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool YGConfigGetUseLegacyStretchBehaviour(YGConfigHandle config);
-
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGConfigSetPointScaleFactor(
             YGConfigHandle config,
@@ -90,14 +88,6 @@ namespace Facebook.Yoga
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeRemoveChild(YGNodeHandle node, YGNodeHandle child);
 
-        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void YGNodeSetIsReferenceBaseline(
-            YGNodeHandle node,
-            bool isReferenceBaseline);
-
-        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool YGNodeIsReferenceBaseline(YGNodeHandle node);
-
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeCalculateLayout(
             YGNodeHandle node,
@@ -228,7 +218,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetFlexBasisAuto(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetFlexBasis(YGNodeHandle node);
+        public static extern YogaValueType YGNodeStyleGetFlexBasis(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetWidth(YGNodeHandle node, float width);
@@ -240,7 +230,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetWidthAuto(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetWidth(YGNodeHandle node);
+        public static extern YogaValueType YGNodeStyleGetWidth(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetHeight(YGNodeHandle node, float height);
@@ -252,7 +242,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetHeightAuto(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetHeight(YGNodeHandle node);
+        public static extern YogaValueType YGNodeStyleGetHeight(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetMinWidth(YGNodeHandle node, float minWidth);
@@ -261,7 +251,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetMinWidthPercent(YGNodeHandle node, float minWidth);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetMinWidth(YGNodeHandle node);
+        public static extern YogaValueType YGNodeStyleGetMinWidth(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetMinHeight(YGNodeHandle node, float minHeight);
@@ -270,7 +260,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetMinHeightPercent(YGNodeHandle node, float minHeight);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetMinHeight(YGNodeHandle node);
+        public static extern YogaValueType YGNodeStyleGetMinHeight(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetMaxWidth(YGNodeHandle node, float maxWidth);
@@ -279,7 +269,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetMaxWidthPercent(YGNodeHandle node, float maxWidth);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetMaxWidth(YGNodeHandle node);
+        public static extern YogaValueType YGNodeStyleGetMaxWidth(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetMaxHeight(YGNodeHandle node, float maxHeight);
@@ -288,7 +278,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetMaxHeightPercent(YGNodeHandle node, float maxHeight);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetMaxHeight(YGNodeHandle node);
+        public static extern YogaValueType YGNodeStyleGetMaxHeight(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetAspectRatio(YGNodeHandle node, float aspectRatio);
@@ -307,7 +297,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetPositionPercent(YGNodeHandle node, YogaEdge edge, float position);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetPosition(YGNodeHandle node, YogaEdge edge);
+        public static extern YogaValueType YGNodeStyleGetPosition(YGNodeHandle node, YogaEdge edge);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetMargin(YGNodeHandle node, YogaEdge edge, float margin);
@@ -319,7 +309,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetMarginAuto(YGNodeHandle node, YogaEdge edge);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetMargin(YGNodeHandle node, YogaEdge edge);
+        public static extern YogaValueType YGNodeStyleGetMargin(YGNodeHandle node, YogaEdge edge);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetPadding(YGNodeHandle node, YogaEdge edge, float padding);
@@ -328,7 +318,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetPaddingPercent(YGNodeHandle node, YogaEdge edge, float padding);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetPadding(YGNodeHandle node, YogaEdge edge);
+        public static extern YogaValueType YGNodeStyleGetPadding(YGNodeHandle node, YogaEdge edge);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetBorder(YGNodeHandle node, YogaEdge edge, float border);

csharp/Facebook.Yoga/YogaConfig.cs

@@ -1,4 +1,4 @@
-/**
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -117,19 +117,6 @@ namespace Facebook.Yoga
             }
         }
 
-        public bool UseLegacyStretchBehaviour
-        {
-            get
-            {
-                return Native.YGConfigGetUseLegacyStretchBehaviour(_ygConfig);
-            }
-
-            set
-            {
-                Native.YGConfigSetUseLegacyStretchBehaviour(_ygConfig, value);
-            }
-        }
-
         public float PointScaleFactor
         {
             set

csharp/Facebook.Yoga/YogaConstants.cs

@@ -1,4 +1,4 @@
-/**
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaNode.Spacing.cs

@@ -1,4 +1,4 @@
-/**
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -13,7 +13,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Left);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Left));
             }
 
             set
@@ -26,7 +26,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Top);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Top));
             }
 
             set
@@ -39,7 +39,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Right);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Right));
             }
 
             set
@@ -52,7 +52,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Bottom);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Bottom));
             }
 
             set
@@ -65,7 +65,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Start);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Start));
             }
 
             set
@@ -78,7 +78,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.End);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.End));
             }
 
             set
@@ -103,7 +103,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Left);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Left));
             }
 
             set
@@ -116,7 +116,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Top);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Top));
             }
 
             set
@@ -129,7 +129,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Right);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Right));
             }
 
             set
@@ -142,7 +142,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Bottom);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Bottom));
             }
 
             set
@@ -155,7 +155,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Start);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Start));
             }
 
             set
@@ -168,7 +168,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.End);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.End));
             }
 
             set
@@ -181,7 +181,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Horizontal);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Horizontal));
             }
 
             set
@@ -194,7 +194,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Vertical);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Vertical));
             }
 
             set
@@ -207,7 +207,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.All);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.All));
             }
 
             set
@@ -236,7 +236,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Left);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Left));
             }
 
             set
@@ -249,7 +249,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Top);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Top));
             }
 
             set
@@ -262,7 +262,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Right);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Right));
             }
 
             set
@@ -275,7 +275,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Bottom);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Bottom));
             }
 
             set
@@ -288,7 +288,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Start);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Start));
             }
 
             set
@@ -301,7 +301,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.End);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.End));
             }
 
             set
@@ -314,7 +314,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Horizontal);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Horizontal));
             }
 
             set
@@ -327,7 +327,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Vertical);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Vertical));
             }
 
             set
@@ -340,7 +340,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.All);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.All));
             }
 
             set

csharp/Facebook.Yoga/YogaNode.cs

@@ -1,4 +1,4 @@
-/**
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -271,7 +271,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetFlexBasis(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetFlexBasis(_ygNode));
             }
 
             set
@@ -295,7 +295,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetWidth(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetWidth(_ygNode));
             }
 
             set
@@ -319,7 +319,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetHeight(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetHeight(_ygNode));
             }
 
             set
@@ -343,7 +343,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMaxWidth(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMaxWidth(_ygNode));
             }
 
             set
@@ -363,7 +363,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMaxHeight(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMaxHeight(_ygNode));
             }
 
             set
@@ -383,7 +383,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMinWidth(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMinWidth(_ygNode));
             }
 
             set
@@ -403,7 +403,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMinHeight(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMinHeight(_ygNode));
             }
 
             set
@@ -519,19 +519,6 @@ namespace Facebook.Yoga
             Native.YGNodeSetHasNewLayout(_ygNode, false);
         }
 
-        public bool IsReferenceBaseline
-        {
-            get
-            {
-                return Native.YGNodeIsReferenceBaseline(_ygNode);
-            }
-
-            set
-            {
-                Native.YGNodeSetIsReferenceBaseline(_ygNode, value);
-            }
-        }
-
         public bool ValuesEqual(float f1, float f2)
         {
             if (float.IsNaN(f1) || float.IsNaN(f2))
@@ -607,7 +594,7 @@ namespace Facebook.Yoga
         }
 
         public void CalculateLayout(
-            float width = YogaConstants.Undefined,
+            float width = YogaConstants.Undefined, 
             float height = YogaConstants.Undefined)
         {
             Native.YGNodeCalculateLayout(

csharp/Facebook.Yoga/YogaValue.cs

@@ -91,5 +91,17 @@ namespace Facebook.Yoga
         {
             return Point(pointValue);
         }
+
+#if WINDOWS_UWP_ARM
+        internal static YogaValue MarshalValue(IntPtr ptr)
+        {
+            return Marshal.PtrToStructure<YogaValue>(ptr);
+        }
+#else
+        internal static YogaValue MarshalValue(YogaValue value)
+        {
+            return value;
+        }
+#endif
     }
 }

csharp/Mac/run-tests.sh

@@ -1,10 +1,2 @@
 #!/bin/sh
-
-#
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-#
-
-./csharp/Mac/Facebook.Yoga.Mac.Tests/bin/Release/Facebook.Yoga.Mac.Tests.app/Contents/MacOS/Facebook.Yoga.Mac.Tests
+./csharp/Mac/Facebook.Yoga.Mac.Tests/bin/Release/Facebook.Yoga.Mac.Tests.app/Contents/MacOS/Facebook.Yoga.Mac.Tests

csharp/Windows/Facebook.Yoga.Universal.Tests/YogaNodeTest.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
 using Facebook.Yoga;
 
@@ -206,8 +206,8 @@ namespace Facebook.Yoga.Universal.Tests
                 return MeasureOutput.Make(123.4f, 81.7f);
             });
             node.CalculateLayout();
-            Assert.AreEqual(124, node.LayoutWidth);
-            Assert.AreEqual(82, node.LayoutHeight);
+            Assert.AreEqual(123, node.LayoutWidth);
+            Assert.AreEqual(81, node.LayoutHeight);
         }
 
         [TestMethod]
@@ -268,12 +268,7 @@ namespace Facebook.Yoga.Universal.Tests
             parent.Insert(0, child0);
             parent.Insert(0, child1);
             parent.CalculateLayout();
-            Assert.AreEqual(parent.Print(),
-              "<div layout=\"width: 100; height: 120; top: 0; left: 0;\" style=\"width: 100px; height: 120px; \" >\n" +
-              "  <div layout=\"width: 35; height: 45; top: 0; left: 0;\" style=\"width: 35px; height: 45px; \" ></div>\n" +
-              "  <div layout=\"width: 30; height: 40; top: 45; left: 0;\" style=\"width: 30px; height: 40px; \" ></div>\n" +
-              "</div>"
-            );
+            Assert.AreEqual(parent.Print(), "{layout: {width: 100, height: 120, top: 0, left: 0}, flexDirection: 'column', alignItems: 'stretch', flexGrow: 0, flexShrink: 0, overflow: 'visible', width: 100, height: 120, children: [\n  {layout: {width: 35, height: 45, top: 0, left: 0}, flexDirection: 'column', alignItems: 'stretch', flexGrow: 0, flexShrink: 0, overflow: 'visible', width: 35, height: 45, },\n  {layout: {width: 30, height: 40, top: 45, left: 0}, flexDirection: 'column', alignItems: 'stretch', flexGrow: 0, flexShrink: 0, overflow: 'visible', width: 30, height: 40, },\n]},\n");
         }
 
         [TestMethod]
@@ -419,4 +414,4 @@ namespace Facebook.Yoga.Universal.Tests
         }
 #endif
     }
-}
+}

csharp/Yoga/YGInterop.cpp

@@ -1,9 +1,10 @@
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #include "YGInterop.h"
 
 static YGInteropLogger gManagedLogger;

csharp/Yoga/YGInterop.h

@@ -1,9 +1,10 @@
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #pragma once
 
 #include <yoga/Yoga.h>

csharp/Yoga/Yoga.Universal.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
@@ -33,47 +33,47 @@
     <RootNamespace>Yoga</RootNamespace>
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -116,7 +116,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>bin\Universal\$(PlatformTarget)\$(Configuration)\</OutDir>
-    <IntDir>obj\Universal\$(PlatformTarget)\$(Configuration)\</IntDir>
+    <IntDir>obj\$(PlatformTarget)\$(Configuration)\</IntDir>
     <TargetName>yoga</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -242,31 +242,19 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\yoga\Utils.h" />
-    <ClInclude Include="..\..\yoga\YGConfig.h" />
     <ClInclude Include="..\..\yoga\YGEnums.h" />
-    <ClInclude Include="..\..\yoga\YGFloatOptional.h" />
-    <ClInclude Include="..\..\yoga\YGLayout.h" />
-    <ClInclude Include="..\..\yoga\YGMacros.h" />
-    <ClInclude Include="..\..\yoga\YGNode.h" />
-    <ClInclude Include="..\..\yoga\YGNodePrint.h" />
-    <ClInclude Include="..\..\yoga\YGStyle.h" />
-    <ClInclude Include="..\..\yoga\Yoga-internal.h" />
     <ClInclude Include="..\..\yoga\Yoga.h" />
+    <ClInclude Include="..\..\yoga\YGMacros.h" />
+    <ClInclude Include="..\..\yoga\YGNodeList.h" />
     <ClInclude Include="resource.h" />
+    <ClInclude Include="YGInterop.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\yoga\Utils.cpp" />
-    <ClCompile Include="..\..\yoga\YGConfig.cpp" />
-    <ClCompile Include="..\..\yoga\YGEnums.cpp" />
-    <ClCompile Include="..\..\yoga\YGFloatOptional.cpp" />
-    <ClCompile Include="..\..\yoga\YGLayout.cpp" />
-    <ClCompile Include="..\..\yoga\YGNode.cpp" />
-    <ClCompile Include="..\..\yoga\YGNodePrint.cpp" />
-    <ClCompile Include="..\..\yoga\YGStyle.cpp" />
-    <ClCompile Include="..\..\yoga\Yoga.cpp" />
+    <ClCompile Include="..\..\yoga\YGEnums.c" />
+    <ClCompile Include="..\..\yoga\Yoga.c" />
+    <ClCompile Include="..\..\yoga\YGNodeList.c" />
     <ClCompile Include="YGInterop.cpp" />
     <ClCompile Include="dllmain.cpp">
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
@@ -296,4 +284,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

csharp/Yoga/Yoga.Universal.vcxproj.filters

@@ -21,40 +21,22 @@
     <ClInclude Include="targetver.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\yoga\Utils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGEnums.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGFloatOptional.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGLayout.h">
+    <ClInclude Include="..\..\yoga\Yoga.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\yoga\YGMacros.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\yoga\YGNode.h">
+    <ClInclude Include="..\..\yoga\YGNodeList.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\yoga\YGNodePrint.h">
+    <ClInclude Include="YGInterop.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\yoga\YGStyle.h">
+    <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\yoga\Yoga.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\yoga\Yoga-internal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGConfig.h">
+    <ClInclude Include="..\..\yoga\YGEnums.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -65,34 +47,16 @@
     <ClCompile Include="dllmain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\yoga\Yoga.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\yoga\YGNodeList.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="YGInterop.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\yoga\Utils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGEnums.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGFloatOptional.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGLayout.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGNode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGNodePrint.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGStyle.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\yoga\Yoga.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGConfig.cpp">
+    <ClCompile Include="..\..\yoga\YGEnums.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -101,4 +65,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>

csharp/Yoga/Yoga.vcxproj

@@ -38,39 +38,39 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

csharp/Yoga/dllmain.cpp

@@ -1,9 +1,10 @@
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 // dllmain.cpp : Defines the entry point for the DLL application.
 #include "stdafx.h"
 

csharp/Yoga/stdafx.cpp

@@ -1,9 +1,10 @@
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 // stdafx.cpp : source file that includes just the standard includes
 // Yoga.pch will be the pre-compiled header
 // stdafx.obj will contain the pre-compiled type information

csharp/Yoga/stdafx.h

@@ -1,9 +1,10 @@
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 // stdafx.h : include file for standard system include files,
 // or project specific include files that are used frequently, but
 // are changed infrequently

csharp/Yoga/targetver.h

@@ -1,9 +1,10 @@
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #pragma once
 
 // Including SDKDDKVer.h defines the highest available Windows platform.

csharp/build-native.sh

@@ -1,12 +1,4 @@
 #!/bin/sh
-
-#
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-#
-
 cd `dirname "$0"`
 echo $ANDROID_SDK
 BUCK_RELEASE=2018.02.16.01
@@ -30,3 +22,4 @@ $BUCK build \
     //csharp:yoganet-macosx \
     //csharp:yoganet#android-armv7,shared \
     //csharp:yoganet#android-x86,shared
+

csharp/tests/Facebook.Yoga/YGAlignBaselineTest.cs

@@ -1,104 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-using System;
-using NUnit.Framework;
-
-namespace Facebook.Yoga
-{
-    [TestFixture]
-    public class YGAlignBaselineTest
-    {
-        [Test]
-        public void Test_align_baseline_parent_using_child_in_column_as_reference()
-        {
-          YogaConfig config = new YogaConfig();
-          YogaNode root = createYGNode(config, YogaFlexDirection.Row, 1000, 1000, true);
-
-          YogaNode root_child0 = createYGNode(config, YogaFlexDirection.Column, 500, 600, false);
-          root.Insert(0, root_child0);
-
-          YogaNode root_child1 = createYGNode(config, YogaFlexDirection.Column, 500, 800, false);
-          root.Insert(1, root_child1);
-
-          YogaNode root_child1_child0 = createYGNode(config, YogaFlexDirection.Column, 500, 300, false);
-          root_child1.Insert(0, root_child1_child0);
-
-          YogaNode root_child1_child1 = createYGNode(config, YogaFlexDirection.Column, 500, 400, false);
-          root_child1_child1.SetBaselineFunction((_, width, height) => {
-              return height / 2;
-          });
-          root_child1_child1.IsReferenceBaseline = true;
-          root_child1.Insert(1, root_child1_child1);
-
-          root.CalculateLayout();
-
-          Assert.AreEqual(0f, root_child0.LayoutX);
-          Assert.AreEqual(0f, root_child0.LayoutY);
-
-          Assert.AreEqual(500f, root_child1.LayoutX);
-          Assert.AreEqual(100f, root_child1.LayoutY);
-
-          Assert.AreEqual(0f, root_child1_child0.LayoutX);
-          Assert.AreEqual(0f, root_child1_child0.LayoutY);
-
-          Assert.AreEqual(0f, root_child1_child1.LayoutX);
-          Assert.AreEqual(300f, root_child1_child1.LayoutY);
-        }
-
-        [Test]
-        public void Test_align_baseline_parent_using_child_in_row_as_reference()
-        {
-          YogaConfig config = new YogaConfig();
-
-          YogaNode root = createYGNode(config, YogaFlexDirection.Row, 1000, 1000, true);
-
-          YogaNode root_child0 = createYGNode(config, YogaFlexDirection.Column, 500, 600, false);
-          root.Insert(0, root_child0);
-
-          YogaNode root_child1 = createYGNode(config, YogaFlexDirection.Row, 500, 800, true);
-          root.Insert(1, root_child1);
-
-          YogaNode root_child1_child0 = createYGNode(config, YogaFlexDirection.Row, 500, 500, false);
-          root_child1.Insert(0, root_child1_child0);
-
-          YogaNode root_child1_child1 = createYGNode(config, YogaFlexDirection.Row, 500, 400, false);
-          root_child1_child1.SetBaselineFunction((_, width, height) => {
-              return height / 2;
-          });
-          root_child1_child1.IsReferenceBaseline = true;
-          root_child1.Insert(1, root_child1_child1);
-
-          root.StyleDirection = YogaDirection.LTR;
-
-          root.CalculateLayout();
-
-          Assert.AreEqual(0f, root_child0.LayoutX);
-          Assert.AreEqual(0f, root_child0.LayoutY);
-
-          Assert.AreEqual(500f, root_child1.LayoutX);
-          Assert.AreEqual(100f, root_child1.LayoutY);
-
-          Assert.AreEqual(0f, root_child1_child0.LayoutX);
-          Assert.AreEqual(0f, root_child1_child0.LayoutY);
-
-          Assert.AreEqual(500f, root_child1_child1.LayoutX);
-          Assert.AreEqual(300f, root_child1_child1.LayoutY);
-        }
-
-        private YogaNode createYGNode(YogaConfig config, YogaFlexDirection flexDirection, int width, int height, bool alignBaseline) {
-          YogaNode node = new YogaNode(config);
-          node.FlexDirection = flexDirection;
-          node.Width = width;
-          node.Height = height;
-          if (alignBaseline) {
-            node.AlignItems = YogaAlign.Baseline;
-          }
-          return node;
-        }
-    }
-}

csharp/tests/Facebook.Yoga/YGFlexTest.cs

@@ -69,123 +69,6 @@ namespace Facebook.Yoga
             Assert.AreEqual(25f, root_child1.LayoutHeight);
         }
 
-        [Test]
-        public void Test_flex_shrink_flex_grow_row()
-        {
-            YogaConfig config = new YogaConfig();
-
-            YogaNode root = new YogaNode(config);
-            root.FlexDirection = YogaFlexDirection.Row;
-            root.Width = 500;
-            root.Height = 500;
-
-            YogaNode root_child0 = new YogaNode(config);
-            root_child0.FlexShrink = 1;
-            root_child0.Width = 500;
-            root_child0.Height = 100;
-            root.Insert(0, root_child0);
-
-            YogaNode root_child1 = new YogaNode(config);
-            root_child1.FlexShrink = 1;
-            root_child1.Width = 500;
-            root_child1.Height = 100;
-            root.Insert(1, root_child1);
-            root.StyleDirection = YogaDirection.LTR;
-            root.CalculateLayout();
-
-            Assert.AreEqual(0f, root.LayoutX);
-            Assert.AreEqual(0f, root.LayoutY);
-            Assert.AreEqual(500f, root.LayoutWidth);
-            Assert.AreEqual(500f, root.LayoutHeight);
-
-            Assert.AreEqual(0f, root_child0.LayoutX);
-            Assert.AreEqual(0f, root_child0.LayoutY);
-            Assert.AreEqual(250f, root_child0.LayoutWidth);
-            Assert.AreEqual(100f, root_child0.LayoutHeight);
-
-            Assert.AreEqual(250f, root_child1.LayoutX);
-            Assert.AreEqual(0f, root_child1.LayoutY);
-            Assert.AreEqual(250f, root_child1.LayoutWidth);
-            Assert.AreEqual(100f, root_child1.LayoutHeight);
-
-            root.StyleDirection = YogaDirection.RTL;
-            root.CalculateLayout();
-
-            Assert.AreEqual(0f, root.LayoutX);
-            Assert.AreEqual(0f, root.LayoutY);
-            Assert.AreEqual(500f, root.LayoutWidth);
-            Assert.AreEqual(500f, root.LayoutHeight);
-
-            Assert.AreEqual(250f, root_child0.LayoutX);
-            Assert.AreEqual(0f, root_child0.LayoutY);
-            Assert.AreEqual(250f, root_child0.LayoutWidth);
-            Assert.AreEqual(100f, root_child0.LayoutHeight);
-
-            Assert.AreEqual(0f, root_child1.LayoutX);
-            Assert.AreEqual(0f, root_child1.LayoutY);
-            Assert.AreEqual(250f, root_child1.LayoutWidth);
-            Assert.AreEqual(100f, root_child1.LayoutHeight);
-        }
-
-        [Test]
-        public void Test_flex_shrink_flex_grow_child_flex_shrink_other_child()
-        {
-            YogaConfig config = new YogaConfig();
-
-            YogaNode root = new YogaNode(config);
-            root.FlexDirection = YogaFlexDirection.Row;
-            root.Width = 500;
-            root.Height = 500;
-
-            YogaNode root_child0 = new YogaNode(config);
-            root_child0.FlexShrink = 1;
-            root_child0.Width = 500;
-            root_child0.Height = 100;
-            root.Insert(0, root_child0);
-
-            YogaNode root_child1 = new YogaNode(config);
-            root_child1.FlexGrow = 1;
-            root_child1.FlexShrink = 1;
-            root_child1.Width = 500;
-            root_child1.Height = 100;
-            root.Insert(1, root_child1);
-            root.StyleDirection = YogaDirection.LTR;
-            root.CalculateLayout();
-
-            Assert.AreEqual(0f, root.LayoutX);
-            Assert.AreEqual(0f, root.LayoutY);
-            Assert.AreEqual(500f, root.LayoutWidth);
-            Assert.AreEqual(500f, root.LayoutHeight);
-
-            Assert.AreEqual(0f, root_child0.LayoutX);
-            Assert.AreEqual(0f, root_child0.LayoutY);
-            Assert.AreEqual(250f, root_child0.LayoutWidth);
-            Assert.AreEqual(100f, root_child0.LayoutHeight);
-
-            Assert.AreEqual(250f, root_child1.LayoutX);
-            Assert.AreEqual(0f, root_child1.LayoutY);
-            Assert.AreEqual(250f, root_child1.LayoutWidth);
-            Assert.AreEqual(100f, root_child1.LayoutHeight);
-
-            root.StyleDirection = YogaDirection.RTL;
-            root.CalculateLayout();
-
-            Assert.AreEqual(0f, root.LayoutX);
-            Assert.AreEqual(0f, root.LayoutY);
-            Assert.AreEqual(500f, root.LayoutWidth);
-            Assert.AreEqual(500f, root.LayoutHeight);
-
-            Assert.AreEqual(250f, root_child0.LayoutX);
-            Assert.AreEqual(0f, root_child0.LayoutY);
-            Assert.AreEqual(250f, root_child0.LayoutWidth);
-            Assert.AreEqual(100f, root_child0.LayoutHeight);
-
-            Assert.AreEqual(0f, root_child1.LayoutX);
-            Assert.AreEqual(0f, root_child1.LayoutY);
-            Assert.AreEqual(250f, root_child1.LayoutWidth);
-            Assert.AreEqual(100f, root_child1.LayoutHeight);
-        }
-
         [Test]
         public void Test_flex_basis_flex_grow_row()
         {

csharp/tests/Facebook.Yoga/YGJustifyContentTest.cs

@@ -1003,159 +1003,5 @@ namespace Facebook.Yoga
             Assert.AreEqual(10f, root_child2.LayoutHeight);
         }
 
-        [Test]
-        public void Test_justify_content_min_width_with_padding_child_width_greater_than_parent()
-        {
-            YogaConfig config = new YogaConfig();
-
-            YogaNode root = new YogaNode(config);
-            root.AlignContent = YogaAlign.Stretch;
-            root.Width = 1000;
-            root.Height = 1584;
-
-            YogaNode root_child0 = new YogaNode(config);
-            root_child0.FlexDirection = YogaFlexDirection.Row;
-            root_child0.AlignContent = YogaAlign.Stretch;
-            root.Insert(0, root_child0);
-
-            YogaNode root_child0_child0 = new YogaNode(config);
-            root_child0_child0.FlexDirection = YogaFlexDirection.Row;
-            root_child0_child0.JustifyContent = YogaJustify.Center;
-            root_child0_child0.AlignContent = YogaAlign.Stretch;
-            root_child0_child0.PaddingLeft = 100;
-            root_child0_child0.PaddingRight = 100;
-            root_child0_child0.MinWidth = 400;
-            root_child0.Insert(0, root_child0_child0);
-
-            YogaNode root_child0_child0_child0 = new YogaNode(config);
-            root_child0_child0_child0.FlexDirection = YogaFlexDirection.Row;
-            root_child0_child0_child0.AlignContent = YogaAlign.Stretch;
-            root_child0_child0_child0.Width = 300;
-            root_child0_child0_child0.Height = 100;
-            root_child0_child0.Insert(0, root_child0_child0_child0);
-            root.StyleDirection = YogaDirection.LTR;
-            root.CalculateLayout();
-
-            Assert.AreEqual(0f, root.LayoutX);
-            Assert.AreEqual(0f, root.LayoutY);
-            Assert.AreEqual(1000f, root.LayoutWidth);
-            Assert.AreEqual(1584f, root.LayoutHeight);
-
-            Assert.AreEqual(0f, root_child0.LayoutX);
-            Assert.AreEqual(0f, root_child0.LayoutY);
-            Assert.AreEqual(1000f, root_child0.LayoutWidth);
-            Assert.AreEqual(100f, root_child0.LayoutHeight);
-
-            Assert.AreEqual(0f, root_child0_child0.LayoutX);
-            Assert.AreEqual(0f, root_child0_child0.LayoutY);
-            Assert.AreEqual(500f, root_child0_child0.LayoutWidth);
-            Assert.AreEqual(100f, root_child0_child0.LayoutHeight);
-
-            Assert.AreEqual(100f, root_child0_child0_child0.LayoutX);
-            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
-            Assert.AreEqual(300f, root_child0_child0_child0.LayoutWidth);
-            Assert.AreEqual(100f, root_child0_child0_child0.LayoutHeight);
-
-            root.StyleDirection = YogaDirection.RTL;
-            root.CalculateLayout();
-
-            Assert.AreEqual(0f, root.LayoutX);
-            Assert.AreEqual(0f, root.LayoutY);
-            Assert.AreEqual(1000f, root.LayoutWidth);
-            Assert.AreEqual(1584f, root.LayoutHeight);
-
-            Assert.AreEqual(0f, root_child0.LayoutX);
-            Assert.AreEqual(0f, root_child0.LayoutY);
-            Assert.AreEqual(1000f, root_child0.LayoutWidth);
-            Assert.AreEqual(100f, root_child0.LayoutHeight);
-
-            Assert.AreEqual(500f, root_child0_child0.LayoutX);
-            Assert.AreEqual(0f, root_child0_child0.LayoutY);
-            Assert.AreEqual(500f, root_child0_child0.LayoutWidth);
-            Assert.AreEqual(100f, root_child0_child0.LayoutHeight);
-
-            Assert.AreEqual(100f, root_child0_child0_child0.LayoutX);
-            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
-            Assert.AreEqual(300f, root_child0_child0_child0.LayoutWidth);
-            Assert.AreEqual(100f, root_child0_child0_child0.LayoutHeight);
-        }
-
-        [Test]
-        public void Test_justify_content_min_width_with_padding_child_width_lower_than_parent()
-        {
-            YogaConfig config = new YogaConfig();
-
-            YogaNode root = new YogaNode(config);
-            root.AlignContent = YogaAlign.Stretch;
-            root.Width = 1080;
-            root.Height = 1584;
-
-            YogaNode root_child0 = new YogaNode(config);
-            root_child0.FlexDirection = YogaFlexDirection.Row;
-            root_child0.AlignContent = YogaAlign.Stretch;
-            root.Insert(0, root_child0);
-
-            YogaNode root_child0_child0 = new YogaNode(config);
-            root_child0_child0.FlexDirection = YogaFlexDirection.Row;
-            root_child0_child0.JustifyContent = YogaJustify.Center;
-            root_child0_child0.AlignContent = YogaAlign.Stretch;
-            root_child0_child0.PaddingLeft = 100;
-            root_child0_child0.PaddingRight = 100;
-            root_child0_child0.MinWidth = 400;
-            root_child0.Insert(0, root_child0_child0);
-
-            YogaNode root_child0_child0_child0 = new YogaNode(config);
-            root_child0_child0_child0.FlexDirection = YogaFlexDirection.Row;
-            root_child0_child0_child0.AlignContent = YogaAlign.Stretch;
-            root_child0_child0_child0.Width = 199;
-            root_child0_child0_child0.Height = 100;
-            root_child0_child0.Insert(0, root_child0_child0_child0);
-            root.StyleDirection = YogaDirection.LTR;
-            root.CalculateLayout();
-
-            Assert.AreEqual(0f, root.LayoutX);
-            Assert.AreEqual(0f, root.LayoutY);
-            Assert.AreEqual(1080f, root.LayoutWidth);
-            Assert.AreEqual(1584f, root.LayoutHeight);
-
-            Assert.AreEqual(0f, root_child0.LayoutX);
-            Assert.AreEqual(0f, root_child0.LayoutY);
-            Assert.AreEqual(1080f, root_child0.LayoutWidth);
-            Assert.AreEqual(100f, root_child0.LayoutHeight);
-
-            Assert.AreEqual(0f, root_child0_child0.LayoutX);
-            Assert.AreEqual(0f, root_child0_child0.LayoutY);
-            Assert.AreEqual(400f, root_child0_child0.LayoutWidth);
-            Assert.AreEqual(100f, root_child0_child0.LayoutHeight);
-
-            Assert.AreEqual(101f, root_child0_child0_child0.LayoutX);
-            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
-            Assert.AreEqual(199f, root_child0_child0_child0.LayoutWidth);
-            Assert.AreEqual(100f, root_child0_child0_child0.LayoutHeight);
-
-            root.StyleDirection = YogaDirection.RTL;
-            root.CalculateLayout();
-
-            Assert.AreEqual(0f, root.LayoutX);
-            Assert.AreEqual(0f, root.LayoutY);
-            Assert.AreEqual(1080f, root.LayoutWidth);
-            Assert.AreEqual(1584f, root.LayoutHeight);
-
-            Assert.AreEqual(0f, root_child0.LayoutX);
-            Assert.AreEqual(0f, root_child0.LayoutY);
-            Assert.AreEqual(1080f, root_child0.LayoutWidth);
-            Assert.AreEqual(100f, root_child0.LayoutHeight);
-
-            Assert.AreEqual(680f, root_child0_child0.LayoutX);
-            Assert.AreEqual(0f, root_child0_child0.LayoutY);
-            Assert.AreEqual(400f, root_child0_child0.LayoutWidth);
-            Assert.AreEqual(100f, root_child0_child0.LayoutHeight);
-
-            Assert.AreEqual(101f, root_child0_child0_child0.LayoutX);
-            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
-            Assert.AreEqual(199f, root_child0_child0_child0.LayoutWidth);
-            Assert.AreEqual(100f, root_child0_child0_child0.LayoutHeight);
-        }
-
     }
 }

csharp/tests/Facebook.Yoga/YogaNodeTest.cs

@@ -259,7 +259,7 @@ namespace Facebook.Yoga
         [Test]
         public void TestPrintWithLogger()
         {
-            YogaNode node = new YogaNode();
+            YogaNode node = new YogaNode(new YogaConfig{Logger = (c, n, l, m) => {}});
             node.Width = 110;
             node.Height = 105;
             node.CalculateLayout();

fbandroid/libraries/components/lib/yoga/src/main/cpp/yoga/Yoga-internal.h

@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#pragma once
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <vector>
+#include "Yoga.h"
+
+using YGVector = std::vector<YGNodeRef>;
+
+YG_EXTERN_C_BEGIN
+
+WIN_EXPORT float YGRoundValueToPixelGrid(
+    const float value,
+    const float pointScaleFactor,
+    const bool forceCeil,
+    const bool forceFloor);
+
+YG_EXTERN_C_END
+
+extern const std::array<YGEdge, 4> trailing;
+extern const std::array<YGEdge, 4> leading;
+extern bool YGValueEqual(const YGValue a, const YGValue b);
+extern const YGValue YGValueUndefined;
+extern const YGValue YGValueAuto;
+extern const YGValue YGValueZero;
+
+template <std::size_t size>
+bool YGValueArrayEqual(
+    const std::array<YGValue, size> val1,
+    const std::array<YGValue, size> val2) {
+  bool areEqual = true;
+  for (uint32_t i = 0; i < size && areEqual; ++i) {
+    areEqual = YGValueEqual(val1[i], val2[i]);
+  }
+  return areEqual;
+}
+
+const YGValue kYGValueUndefined = {YGUndefined, YGUnitUndefined};
+const YGValue kYGValueAuto = {YGUndefined, YGUnitAuto};
+const std::array<YGValue, YGEdgeCount> kYGDefaultEdgeValuesUnit = {
+    {kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined}};
+const std::array<YGValue, 2> kYGDefaultDimensionValuesAutoUnit = {
+    {kYGValueAuto, kYGValueAuto}};
+const std::array<YGValue, 2> kYGDefaultDimensionValuesUnit = {
+    {kYGValueUndefined, kYGValueUndefined}};
+
+struct YGCachedMeasurement {
+  float availableWidth;
+  float availableHeight;
+  YGMeasureMode widthMeasureMode;
+  YGMeasureMode heightMeasureMode;
+
+  float computedWidth;
+  float computedHeight;
+
+  bool operator==(YGCachedMeasurement measurement) const {
+    bool isEqual = widthMeasureMode == measurement.widthMeasureMode &&
+        heightMeasureMode == measurement.heightMeasureMode;
+
+    if (!std::isnan(availableWidth) ||
+        !std::isnan(measurement.availableWidth)) {
+      isEqual = isEqual && availableWidth == measurement.availableWidth;
+    }
+    if (!std::isnan(availableHeight) ||
+        !std::isnan(measurement.availableHeight)) {
+      isEqual = isEqual && availableHeight == measurement.availableHeight;
+    }
+    if (!std::isnan(computedWidth) || !std::isnan(measurement.computedWidth)) {
+      isEqual = isEqual && computedWidth == measurement.computedWidth;
+    }
+    if (!std::isnan(computedHeight) ||
+        !std::isnan(measurement.computedHeight)) {
+      isEqual = isEqual && computedHeight == measurement.computedHeight;
+    }
+
+    return isEqual;
+  }
+};
+
+// This value was chosen based on empiracle data. Even the most complicated
+// layouts should not require more than 16 entries to fit within the cache.
+#define YG_MAX_CACHED_RESULT_COUNT 16
+
+struct YGConfig {
+  bool experimentalFeatures[YGExperimentalFeatureCount + 1];
+  bool useWebDefaults;
+  bool useLegacyStretchBehaviour;
+  bool shouldDiffLayoutWithoutLegacyStretchBehaviour;
+  float pointScaleFactor;
+  YGLogger logger;
+  YGNodeClonedFunc cloneNodeCallback;
+  void* context;
+};
+
+static const float kDefaultFlexGrow = 0.0f;
+static const float kDefaultFlexShrink = 0.0f;
+static const float kWebDefaultFlexShrink = 1.0f;
+
+extern bool YGFloatsEqual(const float a, const float b);
+extern bool YGValueEqual(const YGValue a, const YGValue b);
+extern const YGValue* YGComputedEdgeValue(
+    const std::array<YGValue, YGEdgeCount>& edges,
+    const YGEdge edge,
+    const YGValue* const defaultValue);

gentest/fixtures/YGFlexTest.html

@@ -3,16 +3,6 @@
   <div style="flex-grow: 1;"></div>
 </div>
 
-<div id="flex_shrink_flex_grow_row" style="width: 500px; height: 500px; flex-direction: row;">
-  <div style="width: 500px; height: 100px; flex-grow: 0; flex-shrink: 1;"></div>
-  <div style="width: 500px; height: 100px; flex-grow: 0; flex-shrink: 1;"></div>
-</div>
-
-<div id="flex_shrink_flex_grow_child_flex_shrink_other_child" style="width: 500px; height: 500px; flex-direction: row;">
-  <div style="width: 500px; height: 100px; flex-grow: 0; flex-shrink: 1;"></div>
-  <div style="width: 500px; height: 100px; flex-grow: 1; flex-shrink: 1;"></div>
-</div>
-
 <div id="flex_basis_flex_grow_row" style="width: 100px; height: 100px; flex-direction: row;">
   <div style="flex-basis: 50px; flex-grow: 1;"></div>
   <div style="flex-grow: 1;"></div>

gentest/fixtures/YGJustifyContentTest.html

@@ -86,7 +86,7 @@
   <div style="height: 10px;"></div>
 </div>
 
-<div id="justify_content_min_width_with_padding_child_width_greater_than_parent" style="width: 1000px; height: 1584px; align-content: stretch;">
+<div id="justify_content_min_width_with_padding_child_width_greater_than_parent" style="width: 1000px; height: 1584px;">
     <div style="flex-direction: row; align-content: stretch;">
         <div style="flex-direction: row; justify-content: center; align-content: stretch; min-width: 400px; padding-left: 100px; padding-right: 100px;">
             <div style="height: 100px; width: 300px; align-content: stretch; flex-direction: row;"></div>
@@ -94,7 +94,7 @@
     </div>
 </div>
 
-<div id="justify_content_min_width_with_padding_child_width_lower_than_parent" style="width: 1080px; height: 1584px; align-content: stretch;">
+<div id="justify_content_min_width_with_padding_child_width_greater_than_parent" style="width: 1080px; height: 1584px;">
     <div style="flex-direction: row; align-content: stretch;">
         <div style="flex-direction: row; justify-content: center; align-content: stretch; min-width: 400px; padding-left: 100px; padding-right: 100px;">
             <div style="height: 100px; width: 199px; align-content: stretch; flex-direction: row;"></div>

gentest/gentest-java.js

@@ -42,29 +42,13 @@ JavaEmitter.prototype = Object.create(Emitter.prototype, {
     this.push([
       'package com.facebook.yoga;',
       '',
+      'import org.junit.Test;',
+      '',
       'import static org.junit.Assert.assertEquals;',
       '',
-      'import org.junit.Test;',
-      'import org.junit.runner.RunWith;',
-      'import org.junit.runners.Parameterized;',
-      '',
-      '@RunWith(Parameterized.class)',
       'public class YogaTest {',
     ]);
     this.pushIndent();
-    this.push([
-      '@Parameterized.Parameters(name = "{0}")',
-      'public static Iterable<TestParametrization.NodeFactory> nodeFactories() {',
-    ]);
-    this.pushIndent();
-    this.push('return TestParametrization.nodeFactories();');
-    this.popIndent();
-    this.push('}');
-    this.push([
-      '',
-      '@Parameterized.Parameter public TestParametrization.NodeFactory mNodeFactory;',
-      '',
-    ]);
   }},
 
   emitTestPrologue:{value:function(name, experiments) {
@@ -80,7 +64,7 @@ JavaEmitter.prototype = Object.create(Emitter.prototype, {
   }},
 
   emitTestTreePrologue:{value:function(nodeName) {
-    this.push('final YogaNode ' + nodeName + ' = createNode(config);');
+    this.push('final YogaNode ' + nodeName + ' = new YogaNode(config);');
   }},
 
   emitTestEpilogue:{value:function(experiments) {
@@ -92,11 +76,6 @@ JavaEmitter.prototype = Object.create(Emitter.prototype, {
   }},
 
   emitEpilogue:{value:function(lines) {
-    this.push('private YogaNode createNode(YogaConfig config) {');
-    this.pushIndent();
-    this.push('return mNodeFactory.create(config);');
-    this.popIndent();
-    this.push('}');
     this.popIndent();
     this.push([
       '}',

gentest/gentest.js

@@ -42,7 +42,7 @@ function assert(condition, message) {
 function printTest(e, LTRContainer, RTLContainer, genericContainer) {
   e.push([
     '/**',
-    ' * Copyright (c) Facebook, Inc. and its affiliates.',
+    ' * Copyright (c) 2014-present, Facebook, Inc.',
     ' *',
     ' * This source code is licensed under the MIT license found in the',
     ' * LICENSE file in the root directory of this source tree.',

gradle.properties

@@ -1,15 +1,8 @@
-#
-#  Copyright (c) Facebook, Inc. and its affiliates.
-#
-#  This source code is licensed under the MIT license found in the LICENSE
-#  file in the root directory of this source tree.
-#
-
 # Project-wide Gradle settings.
 
 org.gradle.jvmargs=-Xmx1536M
 
-VERSION_NAME=1.12.0-SNAPSHOT
+VERSION_NAME=1.10.0-SNAPSHOT
 POM_URL=https://github.com/facebook/yoga
 POM_SCM_URL=https://github.com/facebook/yoga.git
 POM_SCM_CONNECTION=scm:git:https://github.com/facebook/yoga.git

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip

java/BUCK

@@ -10,14 +10,13 @@ yoga_cxx_library(
     srcs = glob(["jni/*.cpp"]),
     headers = glob(["jni/*.h"]),
     header_namespace = "",
-    allow_jni_merging = True,
     compiler_flags = [
         "-fno-omit-frame-pointer",
         "-fexceptions",
         "-fPIC",
         "-Wall",
         "-Werror",
-        "-Os",
+        "-O3",
         "-std=c++11",
     ],
     platforms = ANDROID,

java/CMakeLists.txt

@@ -29,7 +29,7 @@ add_compile_options(
     -Wall
     -std=c++11)
 
-add_library(yoga SHARED jni/YGJNI.cpp jni/YGJTypes.cpp)
+add_library(yoga SHARED jni/YGJNI.cpp)
 
 target_include_directories(yoga PRIVATE
     ${libfb_DIR}/include

java/build.gradle

@@ -1,10 +1,3 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
@@ -35,7 +28,6 @@ android {
     externalNativeBuild {
         cmake {
             path 'CMakeLists.txt'
-            version '3.6.0-rc2'
         }
     }
 

java/com/facebook/yoga/YogaAlign.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.

java/com/facebook/yoga/YogaConfig.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.
@@ -16,13 +16,12 @@ public class YogaConfig {
   public static int SPACING_TYPE = 1;
 
   static {
-    SoLoader.loadLibrary("yoga");
+      YogaJNI.init();
   }
 
   long mNativePointer;
   private YogaLogger mLogger;
   private YogaNodeCloneFunction mYogaNodeCloneFunction;
-  public boolean avoidGlobalJNIRefs = false;
 
   private native long jni_YGConfigNew();
   public YogaConfig() {
@@ -98,4 +97,16 @@ public class YogaConfig {
   public YogaLogger getLogger() {
     return mLogger;
   }
+
+  private native void jni_YGConfigSetHasCloneNodeFunc(long nativePointer, boolean hasClonedFunc);
+
+  public void setOnCloneNode(YogaNodeCloneFunction cloneYogaNodeFunction) {
+    mYogaNodeCloneFunction = cloneYogaNodeFunction;
+    jni_YGConfigSetHasCloneNodeFunc(mNativePointer, cloneYogaNodeFunction != null);
+  }
+
+  @DoNotStrip
+  private final YogaNode cloneNode(YogaNode oldNode, YogaNode parent, int childIndex) {
+    return mYogaNodeCloneFunction.cloneNode(oldNode, parent, childIndex);
+  }
 }

java/com/facebook/yoga/YogaConstants.java

@@ -1,24 +1,38 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ *  Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ *  This source code is licensed under the MIT license found in the LICENSE
+ *  file in the root directory of this source tree.
  *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
  */
 package com.facebook.yoga;
 
 public class YogaConstants {
 
-  public static final float UNDEFINED = Float.NaN;
+  /**
+   * Large positive number signifies that the property(float) is undefined. Earlier we used to have
+   * YGundefined as NAN, but the downside of this is that we can't use -ffast-math compiler flag as
+   * it assumes all floating-point calculation involve and result into finite numbers. For more
+   * information regarding -ffast-math compiler flag in clang, have a look at
+   * https://clang.llvm.org/docs/UsersManual.html#cmdoption-ffast-math
+   */
+  public static final float UNDEFINED = (float) (10E20);
 
   public static boolean isUndefined(float value) {
-    return Float.compare(value, UNDEFINED) == 0;
+    // Value of a float in the case of it being not defined is 10.1E20. Earlier it used to be NAN,
+    // the benefit of which
+    // was that if NAN is involved in any mathematical expression the result was NAN. But since we
+    // want to have `-ffast-math`
+    // flag being used by compiler which assumes that the floating point values are not NAN and Inf,
+    // we represent YGUndefined as 10.1E20.
+    // But now if YGUndefined is involved in any mathematical operations this value(10.1E20) would
+    // change.
+    // So the following check makes sure that if the value is outside a range (-10E8, 10E8) then it
+    // is undefined.
+    return (Float.compare(value, (float) 10E8) >= 0 || Float.compare(value, (float) -10E8) <= 0);
   }
 
   public static boolean isUndefined(YogaValue value) {
     return value.unit == YogaUnit.UNDEFINED;
   }
-
-  public static float getUndefined() {
-    return UNDEFINED;
-  }
 }

java/com/facebook/yoga/YogaDimension.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.

java/com/facebook/yoga/YogaDirection.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.

java/com/facebook/yoga/YogaDisplay.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.

java/com/facebook/yoga/YogaEdge.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.

java/com/facebook/yoga/YogaExperimentalFeature.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.

java/com/facebook/yoga/YogaFlexDirection.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.

java/com/facebook/yoga/YogaJNI.java

@@ -0,0 +1,30 @@
+/*
+ *  Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ *  This source code is licensed under the MIT license found in the LICENSE
+ *  file in the root directory of this source tree.
+ *
+ */
+package com.facebook.yoga;
+
+import com.facebook.soloader.SoLoader;
+
+public class YogaJNI {
+
+  // Known constants. 1-3 used in previous experiments. Do not reuse.
+  public static int JNI_FAST_CALLS = 4;
+
+  // set before loading any other Yoga code
+  public static boolean useFastCall = false;
+
+  private static native void jni_bindNativeMethods(boolean useFastCall);
+
+  static boolean init() {
+    if (SoLoader.loadLibrary("yoga")) {
+      jni_bindNativeMethods(useFastCall);
+      return true;
+    }
+
+    return false;
+  }
+}

java/com/facebook/yoga/YogaJustify.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.

java/com/facebook/yoga/YogaLogLevel.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.

java/com/facebook/yoga/YogaMeasureMode.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.

java/com/facebook/yoga/YogaNode.java

@@ -1,35 +1,255 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ *  Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ *  This source code is licensed under the MIT license found in the LICENSE
+ *  file in the root directory of this source tree.
  *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
  */
+
 package com.facebook.yoga;
 
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.soloader.SoLoader;
+import java.util.ArrayList;
+import java.util.List;
 import javax.annotation.Nullable;
 
-public abstract class YogaNode {
-  public static YogaNode create() {
-    return new YogaNodeJNI();
+@DoNotStrip
+public class YogaNode implements Cloneable {
+
+  static {
+      YogaJNI.init();
   }
 
-  public static YogaNode create(YogaConfig config) {
-    return new YogaNodeJNI(config);
+  /**
+   * Get native instance count. Useful for testing only.
+   */
+  static native int jni_YGNodeGetInstanceCount();
+
+  private YogaNode mOwner;
+  @Nullable private List<YogaNode> mChildren;
+  private YogaMeasureFunction mMeasureFunction;
+  private YogaBaselineFunction mBaselineFunction;
+  private long mNativePointer;
+  private Object mData;
+
+  /* Those flags needs be in sync with YGJNI.cpp */
+  private static final int MARGIN = 1;
+  private static final int PADDING = 2;
+  private static final int BORDER = 4;
+
+  @DoNotStrip
+  private int mEdgeSetFlag = 0;
+
+  private boolean mHasSetPosition = false;
+
+  @DoNotStrip
+  private float mWidth = YogaConstants.UNDEFINED;
+  @DoNotStrip
+  private float mHeight = YogaConstants.UNDEFINED;
+  @DoNotStrip
+  private float mTop = YogaConstants.UNDEFINED;
+  @DoNotStrip
+  private float mLeft = YogaConstants.UNDEFINED;
+  @DoNotStrip
+  private float mMarginLeft = 0;
+  @DoNotStrip
+  private float mMarginTop = 0;
+  @DoNotStrip
+  private float mMarginRight = 0;
+  @DoNotStrip
+  private float mMarginBottom = 0;
+  @DoNotStrip
+  private float mPaddingLeft = 0;
+  @DoNotStrip
+  private float mPaddingTop = 0;
+  @DoNotStrip
+  private float mPaddingRight = 0;
+  @DoNotStrip
+  private float mPaddingBottom = 0;
+  @DoNotStrip
+  private float mBorderLeft = 0;
+  @DoNotStrip
+  private float mBorderTop = 0;
+  @DoNotStrip
+  private float mBorderRight = 0;
+  @DoNotStrip
+  private float mBorderBottom = 0;
+  @DoNotStrip
+  private int mLayoutDirection = 0;
+  @DoNotStrip
+  private boolean mHasNewLayout = true;
+  @DoNotStrip private boolean mDoesLegacyStretchFlagAffectsLayout = false;
+
+  private native long jni_YGNodeNew();
+  public YogaNode() {
+    mNativePointer = jni_YGNodeNew();
+    if (mNativePointer == 0) {
+      throw new IllegalStateException("Failed to allocate native memory");
+    }
   }
 
-  public abstract void reset();
+  private native long jni_YGNodeNewWithConfig(long configPointer);
+  public YogaNode(YogaConfig config) {
+    mNativePointer = jni_YGNodeNewWithConfig(config.mNativePointer);
+    if (mNativePointer == 0) {
+      throw new IllegalStateException("Failed to allocate native memory");
+    }
+  }
 
-  public abstract int getChildCount();
+  @Override
+  protected void finalize() throws Throwable {
+    try {
+      freeNatives();
+    } finally {
+      super.finalize();
+    }
+  }
 
-  public abstract YogaNode getChildAt(int i);
+  private static native void jni_YGNodeFree(long nativePointer);
 
-  public abstract void addChildAt(YogaNode child, int i);
+  /* frees the native underlying YGNode. Useful for testing. */
+  public void freeNatives() {
+    if (mNativePointer > 0) {
+      long nativePointer = mNativePointer;
+      mNativePointer = 0;
+      jni_YGNodeFree(nativePointer);
+    }
+  }
 
-  public abstract void setIsReferenceBaseline(boolean isReferenceBaseline);
+  private static native void jni_YGNodeReset(long nativePointer);
+  public void reset() {
+    mEdgeSetFlag = 0;
+    mHasSetPosition = false;
+    mHasNewLayout = true;
 
-  public abstract boolean isReferenceBaseline();
+    mWidth = YogaConstants.UNDEFINED;
+    mHeight = YogaConstants.UNDEFINED;
+    mTop = YogaConstants.UNDEFINED;
+    mLeft = YogaConstants.UNDEFINED;
+    mMarginLeft = 0;
+    mMarginTop = 0;
+    mMarginRight = 0;
+    mMarginBottom = 0;
+    mPaddingLeft = 0;
+    mPaddingTop = 0;
+    mPaddingRight = 0;
+    mPaddingBottom = 0;
+    mBorderLeft = 0;
+    mBorderTop = 0;
+    mBorderRight = 0;
+    mBorderBottom = 0;
+    mLayoutDirection = 0;
 
-  public abstract YogaNode removeChildAt(int i);
+    mMeasureFunction = null;
+    mBaselineFunction = null;
+    mData = null;
+    mDoesLegacyStretchFlagAffectsLayout = false;
+
+    jni_YGNodeReset(mNativePointer);
+  }
+
+  public int getChildCount() {
+    return mChildren == null ? 0 : mChildren.size();
+  }
+
+  public YogaNode getChildAt(int i) {
+    if (mChildren == null) {
+      throw new IllegalStateException("YogaNode does not have children");
+    }
+    return mChildren.get(i);
+  }
+
+  private static native void jni_YGNodeInsertChild(long nativePointer, long childPointer, int index);
+  public void addChildAt(YogaNode child, int i) {
+    if (child.mOwner != null) {
+      throw new IllegalStateException("Child already has a parent, it must be removed first.");
+    }
+
+    if (mChildren == null) {
+      mChildren = new ArrayList<>(4);
+    }
+    mChildren.add(i, child);
+    child.mOwner = this;
+    jni_YGNodeInsertChild(mNativePointer, child.mNativePointer, i);
+  }
+
+  private static native void jni_YGNodeInsertSharedChild(long nativePointer, long childPointer, int index);
+
+  public void addSharedChildAt(YogaNode child, int i) {
+    if (mChildren == null) {
+      mChildren = new ArrayList<>(4);
+    }
+    mChildren.add(i, child);
+    child.mOwner = null;
+    jni_YGNodeInsertSharedChild(mNativePointer, child.mNativePointer, i);
+  }
+
+  private static native void jni_YGNodeSetOwner(long nativePointer, long newOwnerNativePointer);
+
+  private native long jni_YGNodeClone(long nativePointer, Object newNode);
+
+  @Override
+  public YogaNode clone() {
+    try {
+      YogaNode clonedYogaNode = (YogaNode) super.clone();
+      long clonedNativePointer = jni_YGNodeClone(mNativePointer, clonedYogaNode);
+
+      if (mChildren != null) {
+        for (YogaNode child : mChildren) {
+          YogaNode.jni_YGNodeSetOwner(child.mNativePointer, 0);
+          child.mOwner = null;
+        }
+      }
+
+      clonedYogaNode.mNativePointer = clonedNativePointer;
+      clonedYogaNode.mOwner = null;
+      clonedYogaNode.mChildren =
+          mChildren != null ? (List<YogaNode>) ((ArrayList) mChildren).clone() : null;
+      if (clonedYogaNode.mChildren != null) {
+        for (YogaNode child : clonedYogaNode.mChildren) {
+          child.mOwner = null;
+        }
+      }
+      return clonedYogaNode;
+    } catch (CloneNotSupportedException ex) {
+      // This class implements Cloneable, this should not happen
+      throw new RuntimeException(ex);
+    }
+  }
+
+  public YogaNode cloneWithNewChildren() {
+    try {
+      YogaNode clonedYogaNode = (YogaNode) super.clone();
+      long clonedNativePointer = jni_YGNodeClone(mNativePointer, clonedYogaNode);
+      clonedYogaNode.mOwner = null;
+      clonedYogaNode.mNativePointer = clonedNativePointer;
+      clonedYogaNode.clearChildren();
+      return clonedYogaNode;
+    } catch (CloneNotSupportedException ex) {
+      // This class implements Cloneable, this should not happen
+      throw new RuntimeException(ex);
+    }
+  }
+
+  private static native void jni_YGNodeClearChildren(long nativePointer);
+
+  private void clearChildren() {
+    mChildren = null;
+    jni_YGNodeClearChildren(mNativePointer);
+  }
+
+  private static native void jni_YGNodeRemoveChild(long nativePointer, long childPointer);
+  public YogaNode removeChildAt(int i) {
+    if (mChildren == null) {
+      throw new IllegalStateException(
+          "Trying to remove a child of a YogaNode that does not have children");
+    }
+    final YogaNode child = mChildren.remove(i);
+    child.mOwner = null;
+    jni_YGNodeRemoveChild(mNativePointer, child.mNativePointer);
+    return child;
+  }
 
   /**
    * @returns the {@link YogaNode} that owns this {@link YogaNode}.
@@ -40,182 +260,539 @@ public abstract class YogaNode {
    * {@link YogaNode} is shared between two or more YogaTrees.
    */
   @Nullable
-  public abstract YogaNode getOwner();
+  public YogaNode getOwner() {
+    return mOwner;
+  }
 
   /** @deprecated Use #getOwner() instead. This will be removed in the next version. */
   @Deprecated
   @Nullable
-  public abstract YogaNode getParent();
-
-  public abstract int indexOf(YogaNode child);
-
-  public abstract void calculateLayout(float width, float height);
-
-  public abstract boolean hasNewLayout();
-
-  public abstract void dirty();
-
-  public abstract boolean isDirty();
-
-  public abstract void copyStyle(YogaNode srcNode);
-
-  public abstract void markLayoutSeen();
-
-  public abstract YogaDirection getStyleDirection();
-
-  public abstract void setDirection(YogaDirection direction);
-
-  public abstract YogaFlexDirection getFlexDirection();
-
-  public abstract void setFlexDirection(YogaFlexDirection flexDirection);
-
-  public abstract YogaJustify getJustifyContent();
-
-  public abstract void setJustifyContent(YogaJustify justifyContent);
-
-  public abstract YogaAlign getAlignItems();
-
-  public abstract void setAlignItems(YogaAlign alignItems);
-
-  public abstract YogaAlign getAlignSelf();
-
-  public abstract void setAlignSelf(YogaAlign alignSelf);
-
-  public abstract YogaAlign getAlignContent();
-
-  public abstract void setAlignContent(YogaAlign alignContent);
-
-  public abstract YogaPositionType getPositionType();
-
-  public abstract void setPositionType(YogaPositionType positionType);
-
-  public abstract YogaWrap getWrap();
-
-  public abstract void setWrap(YogaWrap flexWrap);
-
-  public abstract YogaOverflow getOverflow();
-
-  public abstract void setOverflow(YogaOverflow overflow);
-
-  public abstract YogaDisplay getDisplay();
-
-  public abstract void setDisplay(YogaDisplay display);
-
-  public abstract float getFlex();
-
-  public abstract void setFlex(float flex);
-
-  public abstract float getFlexGrow();
-
-  public abstract void setFlexGrow(float flexGrow);
-
-  public abstract float getFlexShrink();
-
-  public abstract void setFlexShrink(float flexShrink);
-
-  public abstract YogaValue getFlexBasis();
-
-  public abstract void setFlexBasis(float flexBasis);
-
-  public abstract void setFlexBasisPercent(float percent);
-
-  public abstract void setFlexBasisAuto();
-
-  public abstract YogaValue getMargin(YogaEdge edge);
-
-  public abstract void setMargin(YogaEdge edge, float margin);
-
-  public abstract void setMarginPercent(YogaEdge edge, float percent);
-
-  public abstract void setMarginAuto(YogaEdge edge);
-
-  public abstract YogaValue getPadding(YogaEdge edge);
-
-  public abstract void setPadding(YogaEdge edge, float padding);
-
-  public abstract void setPaddingPercent(YogaEdge edge, float percent);
-
-  public abstract float getBorder(YogaEdge edge);
-
-  public abstract void setBorder(YogaEdge edge, float border);
-
-  public abstract YogaValue getPosition(YogaEdge edge);
-
-  public abstract void setPosition(YogaEdge edge, float position);
-
-  public abstract void setPositionPercent(YogaEdge edge, float percent);
-
-  public abstract YogaValue getWidth();
-
-  public abstract void setWidth(float width);
-
-  public abstract void setWidthPercent(float percent);
-
-  public abstract void setWidthAuto();
-
-  public abstract YogaValue getHeight();
-
-  public abstract void setHeight(float height);
-
-  public abstract void setHeightPercent(float percent);
-
-  public abstract void setHeightAuto();
-
-  public abstract YogaValue getMinWidth();
-
-  public abstract void setMinWidth(float minWidth);
-
-  public abstract void setMinWidthPercent(float percent);
-
-  public abstract YogaValue getMinHeight();
-
-  public abstract void setMinHeight(float minHeight);
-
-  public abstract void setMinHeightPercent(float percent);
-
-  public abstract YogaValue getMaxWidth();
-
-  public abstract void setMaxWidth(float maxWidth);
-
-  public abstract void setMaxWidthPercent(float percent);
-
-  public abstract YogaValue getMaxHeight();
-
-  public abstract void setMaxHeight(float maxheight);
-
-  public abstract void setMaxHeightPercent(float percent);
-
-  public abstract float getAspectRatio();
-
-  public abstract void setAspectRatio(float aspectRatio);
-
-  public abstract float getLayoutX();
-
-  public abstract float getLayoutY();
-
-  public abstract float getLayoutWidth();
-
-  public abstract float getLayoutHeight();
-
-  public abstract float getLayoutMargin(YogaEdge edge);
-
-  public abstract float getLayoutPadding(YogaEdge edge);
-
-  public abstract float getLayoutBorder(YogaEdge edge);
-
-  public abstract YogaDirection getLayoutDirection();
-
-  public abstract void setMeasureFunction(YogaMeasureFunction measureFunction);
-
-  public abstract void setBaselineFunction(YogaBaselineFunction baselineFunction);
-
-  public abstract boolean isMeasureDefined();
-
-  public abstract void setData(Object data);
-
-  public abstract Object getData();
-
-  public abstract void print();
-
-  public abstract void setStyleInputs(float[] styleInputs, int size);
+  public YogaNode getParent() {
+    return getOwner();
+  }
+
+  public int indexOf(YogaNode child) {
+    return mChildren == null ? -1 : mChildren.indexOf(child);
+  }
+
+  private static native void jni_YGNodeCalculateLayout(long nativePointer, float width, float height);
+  public void calculateLayout(float width, float height) {
+    jni_YGNodeCalculateLayout(mNativePointer, width, height);
+  }
+
+  public boolean hasNewLayout() {
+    return mHasNewLayout;
+  }
+
+  private static native void jni_YGNodeMarkDirty(long nativePointer);
+  public void dirty() {
+    jni_YGNodeMarkDirty(mNativePointer);
+  }
+
+  private static native void jni_YGNodeMarkDirtyAndPropogateToDescendants(long nativePointer);
+
+  public void dirtyAllDescendants() {
+    jni_YGNodeMarkDirtyAndPropogateToDescendants(mNativePointer);
+  }
+
+  private static native boolean jni_YGNodeIsDirty(long nativePointer);
+  public boolean isDirty() {
+    return jni_YGNodeIsDirty(mNativePointer);
+  }
+
+  private static native void jni_YGNodeCopyStyle(long dstNativePointer, long srcNativePointer);
+  public void copyStyle(YogaNode srcNode) {
+    jni_YGNodeCopyStyle(mNativePointer, srcNode.mNativePointer);
+  }
+
+  public void markLayoutSeen() {
+    mHasNewLayout = false;
+  }
+
+  private static native int jni_YGNodeStyleGetDirection(long nativePointer);
+  public YogaDirection getStyleDirection() {
+    return YogaDirection.fromInt(jni_YGNodeStyleGetDirection(mNativePointer));
+  }
+
+  private static native void jni_YGNodeStyleSetDirection(long nativePointer, int direction);
+  public void setDirection(YogaDirection direction) {
+    jni_YGNodeStyleSetDirection(mNativePointer, direction.intValue());
+  }
+
+  private static native int jni_YGNodeStyleGetFlexDirection(long nativePointer);
+  public YogaFlexDirection getFlexDirection() {
+    return YogaFlexDirection.fromInt(jni_YGNodeStyleGetFlexDirection(mNativePointer));
+  }
+
+  private static native void jni_YGNodeStyleSetFlexDirection(long nativePointer, int flexDirection);
+  public void setFlexDirection(YogaFlexDirection flexDirection) {
+    jni_YGNodeStyleSetFlexDirection(mNativePointer, flexDirection.intValue());
+  }
+
+  private static native int jni_YGNodeStyleGetJustifyContent(long nativePointer);
+  public YogaJustify getJustifyContent() {
+    return YogaJustify.fromInt(jni_YGNodeStyleGetJustifyContent(mNativePointer));
+  }
+
+  private static native void jni_YGNodeStyleSetJustifyContent(long nativePointer, int justifyContent);
+  public void setJustifyContent(YogaJustify justifyContent) {
+    jni_YGNodeStyleSetJustifyContent(mNativePointer, justifyContent.intValue());
+  }
+
+  private static native int jni_YGNodeStyleGetAlignItems(long nativePointer);
+  public YogaAlign getAlignItems() {
+    return YogaAlign.fromInt(jni_YGNodeStyleGetAlignItems(mNativePointer));
+  }
+
+  private static native void jni_YGNodeStyleSetAlignItems(long nativePointer, int alignItems);
+  public void setAlignItems(YogaAlign alignItems) {
+    jni_YGNodeStyleSetAlignItems(mNativePointer, alignItems.intValue());
+  }
+
+  private static native int jni_YGNodeStyleGetAlignSelf(long nativePointer);
+  public YogaAlign getAlignSelf() {
+    return YogaAlign.fromInt(jni_YGNodeStyleGetAlignSelf(mNativePointer));
+  }
+
+  private static native void jni_YGNodeStyleSetAlignSelf(long nativePointer, int alignSelf);
+  public void setAlignSelf(YogaAlign alignSelf) {
+    jni_YGNodeStyleSetAlignSelf(mNativePointer, alignSelf.intValue());
+  }
+
+  private static native int jni_YGNodeStyleGetAlignContent(long nativePointer);
+  public YogaAlign getAlignContent() {
+    return YogaAlign.fromInt(jni_YGNodeStyleGetAlignContent(mNativePointer));
+  }
+
+  private static native void jni_YGNodeStyleSetAlignContent(long nativePointer, int alignContent);
+  public void setAlignContent(YogaAlign alignContent) {
+    jni_YGNodeStyleSetAlignContent(mNativePointer, alignContent.intValue());
+  }
+
+  private static native int jni_YGNodeStyleGetPositionType(long nativePointer);
+  public YogaPositionType getPositionType() {
+    return YogaPositionType.fromInt(jni_YGNodeStyleGetPositionType(mNativePointer));
+  }
+
+  private static native void jni_YGNodeStyleSetPositionType(long nativePointer, int positionType);
+  public void setPositionType(YogaPositionType positionType) {
+    jni_YGNodeStyleSetPositionType(mNativePointer, positionType.intValue());
+  }
+
+  private static native void jni_YGNodeStyleSetFlexWrap(long nativePointer, int wrapType);
+  public void setWrap(YogaWrap flexWrap) {
+    jni_YGNodeStyleSetFlexWrap(mNativePointer, flexWrap.intValue());
+  }
+
+  private static native int jni_YGNodeStyleGetOverflow(long nativePointer);
+  public YogaOverflow getOverflow() {
+    return YogaOverflow.fromInt(jni_YGNodeStyleGetOverflow(mNativePointer));
+  }
+
+  private static native void jni_YGNodeStyleSetOverflow(long nativePointer, int overflow);
+  public void setOverflow(YogaOverflow overflow) {
+    jni_YGNodeStyleSetOverflow(mNativePointer, overflow.intValue());
+  }
+
+  private static native int jni_YGNodeStyleGetDisplay(long nativePointer);
+  public YogaDisplay getDisplay() {
+    return YogaDisplay.fromInt(jni_YGNodeStyleGetDisplay(mNativePointer));
+  }
+
+  private static native void jni_YGNodeStyleSetDisplay(long nativePointer, int display);
+  public void setDisplay(YogaDisplay display) {
+    jni_YGNodeStyleSetDisplay(mNativePointer, display.intValue());
+  }
+
+  private static native void jni_YGNodeStyleSetFlex(long nativePointer, float flex);
+  public void setFlex(float flex) {
+    jni_YGNodeStyleSetFlex(mNativePointer, flex);
+  }
+
+  private static native float jni_YGNodeStyleGetFlexGrow(long nativePointer);
+  public float getFlexGrow() {
+    return jni_YGNodeStyleGetFlexGrow(mNativePointer);
+  }
+
+  private static native void jni_YGNodeStyleSetFlexGrow(long nativePointer, float flexGrow);
+  public void setFlexGrow(float flexGrow) {
+    jni_YGNodeStyleSetFlexGrow(mNativePointer, flexGrow);
+  }
+
+  private static native float jni_YGNodeStyleGetFlexShrink(long nativePointer);
+  public float getFlexShrink() {
+    return jni_YGNodeStyleGetFlexShrink(mNativePointer);
+  }
+
+  private static native void jni_YGNodeStyleSetFlexShrink(long nativePointer, float flexShrink);
+  public void setFlexShrink(float flexShrink) {
+    jni_YGNodeStyleSetFlexShrink(mNativePointer, flexShrink);
+  }
+
+  private static native Object jni_YGNodeStyleGetFlexBasis(long nativePointer);
+  public YogaValue getFlexBasis() {
+    return (YogaValue) jni_YGNodeStyleGetFlexBasis(mNativePointer);
+  }
+
+  private static native void jni_YGNodeStyleSetFlexBasis(long nativePointer, float flexBasis);
+  public void setFlexBasis(float flexBasis) {
+    jni_YGNodeStyleSetFlexBasis(mNativePointer, flexBasis);
+  }
+
+  private static native void jni_YGNodeStyleSetFlexBasisPercent(long nativePointer, float percent);
+  public void setFlexBasisPercent(float percent) {
+    jni_YGNodeStyleSetFlexBasisPercent(mNativePointer, percent);
+  }
+
+  private static native void jni_YGNodeStyleSetFlexBasisAuto(long nativePointer);
+  public void setFlexBasisAuto() {
+    jni_YGNodeStyleSetFlexBasisAuto(mNativePointer);
+  }
+
+  private static native Object jni_YGNodeStyleGetMargin(long nativePointer, int edge);
+  public YogaValue getMargin(YogaEdge edge) {
+    if (!((mEdgeSetFlag & MARGIN) == MARGIN)) {
+      return YogaValue.UNDEFINED;
+    }
+    return (YogaValue) jni_YGNodeStyleGetMargin(mNativePointer, edge.intValue());
+  }
+
+  private static native void jni_YGNodeStyleSetMargin(long nativePointer, int edge, float margin);
+  public void setMargin(YogaEdge edge, float margin) {
+    mEdgeSetFlag |= MARGIN;
+    jni_YGNodeStyleSetMargin(mNativePointer, edge.intValue(), margin);
+  }
+
+  private static native void jni_YGNodeStyleSetMarginPercent(long nativePointer, int edge, float percent);
+  public void setMarginPercent(YogaEdge edge, float percent) {
+    mEdgeSetFlag |= MARGIN;
+    jni_YGNodeStyleSetMarginPercent(mNativePointer, edge.intValue(), percent);
+  }
+
+  private static native void jni_YGNodeStyleSetMarginAuto(long nativePointer, int edge);
+  public void setMarginAuto(YogaEdge edge) {
+    mEdgeSetFlag |= MARGIN;
+    jni_YGNodeStyleSetMarginAuto(mNativePointer, edge.intValue());
+  }
+
+  private static native Object jni_YGNodeStyleGetPadding(long nativePointer, int edge);
+  public YogaValue getPadding(YogaEdge edge) {
+    if (!((mEdgeSetFlag & PADDING) == PADDING)) {
+      return YogaValue.UNDEFINED;
+    }
+    return (YogaValue) jni_YGNodeStyleGetPadding(mNativePointer, edge.intValue());
+  }
+
+  private static native void jni_YGNodeStyleSetPadding(long nativePointer, int edge, float padding);
+  public void setPadding(YogaEdge edge, float padding) {
+    mEdgeSetFlag |= PADDING;
+    jni_YGNodeStyleSetPadding(mNativePointer, edge.intValue(), padding);
+  }
+
+  private static native void jni_YGNodeStyleSetPaddingPercent(long nativePointer, int edge, float percent);
+  public void setPaddingPercent(YogaEdge edge, float percent) {
+    mEdgeSetFlag |= PADDING;
+    jni_YGNodeStyleSetPaddingPercent(mNativePointer, edge.intValue(), percent);
+  }
+
+  private static native float jni_YGNodeStyleGetBorder(long nativePointer, int edge);
+  public float getBorder(YogaEdge edge) {
+    if (!((mEdgeSetFlag & BORDER) == BORDER)) {
+      return YogaConstants.UNDEFINED;
+    }
+    return jni_YGNodeStyleGetBorder(mNativePointer, edge.intValue());
+  }
+
+  private static native void jni_YGNodeStyleSetBorder(long nativePointer, int edge, float border);
+  public void setBorder(YogaEdge edge, float border) {
+    mEdgeSetFlag |= BORDER;
+    jni_YGNodeStyleSetBorder(mNativePointer, edge.intValue(), border);
+  }
+
+  private static native Object jni_YGNodeStyleGetPosition(long nativePointer, int edge);
+  public YogaValue getPosition(YogaEdge edge) {
+    if (!mHasSetPosition) {
+      return YogaValue.UNDEFINED;
+    }
+    return (YogaValue) jni_YGNodeStyleGetPosition(mNativePointer, edge.intValue());
+  }
+
+  private static native void jni_YGNodeStyleSetPosition(long nativePointer, int edge, float position);
+  public void setPosition(YogaEdge edge, float position) {
+    mHasSetPosition = true;
+    jni_YGNodeStyleSetPosition(mNativePointer, edge.intValue(), position);
+  }
+
+  private static native void jni_YGNodeStyleSetPositionPercent(long nativePointer, int edge, float percent);
+  public void setPositionPercent(YogaEdge edge, float percent) {
+    mHasSetPosition = true;
+    jni_YGNodeStyleSetPositionPercent(mNativePointer, edge.intValue(), percent);
+  }
+
+  private static native Object jni_YGNodeStyleGetWidth(long nativePointer);
+  public YogaValue getWidth() {
+    return (YogaValue) jni_YGNodeStyleGetWidth(mNativePointer);
+  }
+
+  private static native void jni_YGNodeStyleSetWidth(long nativePointer, float width);
+  public void setWidth(float width) {
+    jni_YGNodeStyleSetWidth(mNativePointer, width);
+  }
+
+  private static native void jni_YGNodeStyleSetWidthPercent(long nativePointer, float percent);
+  public void setWidthPercent(float percent) {
+    jni_YGNodeStyleSetWidthPercent(mNativePointer, percent);
+  }
+
+  private static native void jni_YGNodeStyleSetWidthAuto(long nativePointer);
+  public void setWidthAuto() {
+    jni_YGNodeStyleSetWidthAuto(mNativePointer);
+  }
+
+  private static native Object jni_YGNodeStyleGetHeight(long nativePointer);
+  public YogaValue getHeight() {
+    return (YogaValue) jni_YGNodeStyleGetHeight(mNativePointer);
+  }
+
+  private static native void jni_YGNodeStyleSetHeight(long nativePointer, float height);
+  public void setHeight(float height) {
+    jni_YGNodeStyleSetHeight(mNativePointer, height);
+  }
+
+  private static native void jni_YGNodeStyleSetHeightPercent(long nativePointer, float percent);
+  public void setHeightPercent(float percent) {
+    jni_YGNodeStyleSetHeightPercent(mNativePointer, percent);
+  }
+
+  private static native void jni_YGNodeStyleSetHeightAuto(long nativePointer);
+  public void setHeightAuto() {
+    jni_YGNodeStyleSetHeightAuto(mNativePointer);
+  }
+
+  private static native Object jni_YGNodeStyleGetMinWidth(long nativePointer);
+  public YogaValue getMinWidth() {
+    return (YogaValue) jni_YGNodeStyleGetMinWidth(mNativePointer);
+  }
+
+  private static native void jni_YGNodeStyleSetMinWidth(long nativePointer, float minWidth);
+  public void setMinWidth(float minWidth) {
+    jni_YGNodeStyleSetMinWidth(mNativePointer, minWidth);
+  }
+
+  private static native void jni_YGNodeStyleSetMinWidthPercent(long nativePointer, float percent);
+  public void setMinWidthPercent(float percent) {
+    jni_YGNodeStyleSetMinWidthPercent(mNativePointer, percent);
+  }
+
+  private static native Object jni_YGNodeStyleGetMinHeight(long nativePointer);
+  public YogaValue getMinHeight() {
+    return (YogaValue) jni_YGNodeStyleGetMinHeight(mNativePointer);
+  }
+
+  private static native void jni_YGNodeStyleSetMinHeight(long nativePointer, float minHeight);
+  public void setMinHeight(float minHeight) {
+    jni_YGNodeStyleSetMinHeight(mNativePointer, minHeight);
+  }
+
+  private static native void jni_YGNodeStyleSetMinHeightPercent(long nativePointer, float percent);
+  public void setMinHeightPercent(float percent) {
+    jni_YGNodeStyleSetMinHeightPercent(mNativePointer, percent);
+  }
+
+  private static native Object jni_YGNodeStyleGetMaxWidth(long nativePointer);
+  public YogaValue getMaxWidth() {
+    return (YogaValue) jni_YGNodeStyleGetMaxWidth(mNativePointer);
+  }
+
+  private static native void jni_YGNodeStyleSetMaxWidth(long nativePointer, float maxWidth);
+  public void setMaxWidth(float maxWidth) {
+    jni_YGNodeStyleSetMaxWidth(mNativePointer, maxWidth);
+  }
+
+  private static native void jni_YGNodeStyleSetMaxWidthPercent(long nativePointer, float percent);
+  public void setMaxWidthPercent(float percent) {
+    jni_YGNodeStyleSetMaxWidthPercent(mNativePointer, percent);
+  }
+
+  private static native Object jni_YGNodeStyleGetMaxHeight(long nativePointer);
+  public YogaValue getMaxHeight() {
+    return (YogaValue) jni_YGNodeStyleGetMaxHeight(mNativePointer);
+  }
+
+  private static native void jni_YGNodeStyleSetMaxHeight(long nativePointer, float maxheight);
+  public void setMaxHeight(float maxheight) {
+    jni_YGNodeStyleSetMaxHeight(mNativePointer, maxheight);
+  }
+
+  private static native void jni_YGNodeStyleSetMaxHeightPercent(long nativePointer, float percent);
+  public void setMaxHeightPercent(float percent) {
+    jni_YGNodeStyleSetMaxHeightPercent(mNativePointer, percent);
+  }
+
+  private static native float jni_YGNodeStyleGetAspectRatio(long nativePointer);
+  public float getAspectRatio() {
+    return jni_YGNodeStyleGetAspectRatio(mNativePointer);
+  }
+
+  private static native void jni_YGNodeStyleSetAspectRatio(long nativePointer, float aspectRatio);
+  public void setAspectRatio(float aspectRatio) {
+    jni_YGNodeStyleSetAspectRatio(mNativePointer, aspectRatio);
+  }
+
+  public float getLayoutX() {
+    return mLeft;
+  }
+
+  public float getLayoutY() {
+    return mTop;
+  }
+
+  public float getLayoutWidth() {
+    return mWidth;
+  }
+
+  public float getLayoutHeight() {
+    return mHeight;
+  }
+
+  public boolean getDoesLegacyStretchFlagAffectsLayout() {
+    return mDoesLegacyStretchFlagAffectsLayout;
+  }
+
+  public float getLayoutMargin(YogaEdge edge) {
+    switch (edge) {
+      case LEFT:
+        return mMarginLeft;
+      case TOP:
+        return mMarginTop;
+      case RIGHT:
+        return mMarginRight;
+      case BOTTOM:
+        return mMarginBottom;
+      case START:
+        return getLayoutDirection() == YogaDirection.RTL ? mMarginRight : mMarginLeft;
+      case END:
+        return getLayoutDirection() == YogaDirection.RTL ? mMarginLeft : mMarginRight;
+      default:
+        throw new IllegalArgumentException("Cannot get layout margins of multi-edge shorthands");
+    }
+  }
+
+  public float getLayoutPadding(YogaEdge edge) {
+    switch (edge) {
+      case LEFT:
+        return mPaddingLeft;
+      case TOP:
+        return mPaddingTop;
+      case RIGHT:
+        return mPaddingRight;
+      case BOTTOM:
+        return mPaddingBottom;
+      case START:
+        return getLayoutDirection() == YogaDirection.RTL ? mPaddingRight : mPaddingLeft;
+      case END:
+        return getLayoutDirection() == YogaDirection.RTL ? mPaddingLeft : mPaddingRight;
+      default:
+        throw new IllegalArgumentException("Cannot get layout paddings of multi-edge shorthands");
+    }
+  }
+
+  public float getLayoutBorder(YogaEdge edge) {
+    switch (edge) {
+      case LEFT:
+        return mBorderLeft;
+      case TOP:
+        return mBorderTop;
+      case RIGHT:
+        return mBorderRight;
+      case BOTTOM:
+        return mBorderBottom;
+      case START:
+        return getLayoutDirection() == YogaDirection.RTL ? mBorderRight : mBorderLeft;
+      case END:
+        return getLayoutDirection() == YogaDirection.RTL ? mBorderLeft : mBorderRight;
+      default:
+        throw new IllegalArgumentException("Cannot get layout border of multi-edge shorthands");
+    }
+  }
+
+  public YogaDirection getLayoutDirection() {
+    return YogaDirection.fromInt(mLayoutDirection);
+  }
+
+  private static native void jni_YGNodeSetHasMeasureFunc(long nativePointer, boolean hasMeasureFunc);
+  public void setMeasureFunction(YogaMeasureFunction measureFunction) {
+    mMeasureFunction = measureFunction;
+    jni_YGNodeSetHasMeasureFunc(mNativePointer, measureFunction != null);
+  }
+
+  // Implementation Note: Why this method needs to stay final
+  //
+  // We cache the jmethodid for this method in Yoga code. This means that even if a subclass
+  // were to override measure, we'd still call this implementation from layout code since the
+  // overriding method will have a different jmethodid. This is final to prevent that mistake.
+  @DoNotStrip
+  public final long measure(float width, int widthMode, float height, int heightMode) {
+    if (!isMeasureDefined()) {
+      throw new RuntimeException("Measure function isn't defined!");
+    }
+
+    return mMeasureFunction.measure(
+        this,
+        width,
+        YogaMeasureMode.fromInt(widthMode),
+        height,
+        YogaMeasureMode.fromInt(heightMode));
+  }
+
+  private static native void jni_YGNodeSetHasBaselineFunc(long nativePointer, boolean hasMeasureFunc);
+  public void setBaselineFunction(YogaBaselineFunction baselineFunction) {
+    mBaselineFunction = baselineFunction;
+    jni_YGNodeSetHasBaselineFunc(mNativePointer, baselineFunction != null);
+  }
+
+  @DoNotStrip
+  public final float baseline(float width, float height) {
+    return mBaselineFunction.baseline(this, width, height);
+  }
+
+  public boolean isMeasureDefined() {
+    return mMeasureFunction != null;
+  }
+
+  public void setData(Object data) {
+    mData = data;
+  }
+
+  public Object getData() {
+    return mData;
+  }
+
+  private static native void jni_YGNodePrint(long nativePointer);
+
+  /**
+   * Use the set logger (defaults to adb log) to print out the styles, children, and computed
+   * layout of the tree rooted at this node.
+   */
+  public void print() {
+    jni_YGNodePrint(mNativePointer);
+  }
+
+  /**
+   * This method replaces the child at childIndex position with the newNode received by parameter.
+   * This is different than calling removeChildAt and addChildAt because this method ONLY replaces
+   * the child in the mChildren datastructure. @DoNotStrip: called from JNI
+   *
+   * @return the nativePointer of the newNode {@linl YogaNode}
+   */
+  @DoNotStrip
+  private final long replaceChild(YogaNode newNode, int childIndex) {
+    if (mChildren == null) {
+      throw new IllegalStateException("Cannot replace child. YogaNode does not have children");
+    }
+    mChildren.remove(childIndex);
+    mChildren.add(childIndex, newNode);
+    newNode.mOwner = this;
+    return newNode.mNativePointer;
+  }
 }

java/com/facebook/yoga/YogaNodeJNI.java

@@ -1,766 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
- */
-package com.facebook.yoga;
-
-import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.soloader.SoLoader;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Nullable;
-
-@DoNotStrip
-public class YogaNodeJNI extends YogaNode {
-
-  static {
-    SoLoader.loadLibrary("yoga");
-  }
-
-  /**
-   * Get native instance count. Useful for testing only.
-   */
-  static native int jni_YGNodeGetInstanceCount();
-
-  private YogaNodeJNI mOwner;
-  @Nullable private List<YogaNodeJNI> mChildren;
-  private YogaMeasureFunction mMeasureFunction;
-  private YogaBaselineFunction mBaselineFunction;
-  private long mNativePointer;
-  private Object mData;
-
-  /* Those flags needs be in sync with YGJNI.cpp */
-  private static final int MARGIN = 1;
-  private static final int PADDING = 2;
-  private static final int BORDER = 4;
-
-  private final boolean mAvoidGlobalJNIRefs;
-
-  @DoNotStrip
-  private float mWidth = YogaConstants.UNDEFINED;
-  @DoNotStrip
-  private float mHeight = YogaConstants.UNDEFINED;
-  @DoNotStrip
-  private float mTop = YogaConstants.UNDEFINED;
-  @DoNotStrip
-  private float mLeft = YogaConstants.UNDEFINED;
-  @DoNotStrip
-  private float mMarginLeft = 0;
-  @DoNotStrip
-  private float mMarginTop = 0;
-  @DoNotStrip
-  private float mMarginRight = 0;
-  @DoNotStrip
-  private float mMarginBottom = 0;
-  @DoNotStrip
-  private float mPaddingLeft = 0;
-  @DoNotStrip
-  private float mPaddingTop = 0;
-  @DoNotStrip
-  private float mPaddingRight = 0;
-  @DoNotStrip
-  private float mPaddingBottom = 0;
-  @DoNotStrip
-  private float mBorderLeft = 0;
-  @DoNotStrip
-  private float mBorderTop = 0;
-  @DoNotStrip
-  private float mBorderRight = 0;
-  @DoNotStrip
-  private float mBorderBottom = 0;
-  @DoNotStrip
-  private int mLayoutDirection = 0;
-  @DoNotStrip
-  private boolean mHasNewLayout = true;
-  @DoNotStrip private boolean mDoesLegacyStretchFlagAffectsLayout = false;
-
-  private native long jni_YGNodeNew();
-  public YogaNodeJNI() {
-    mAvoidGlobalJNIRefs = false;
-    mNativePointer = jni_YGNodeNew();
-    if (mNativePointer == 0) {
-      throw new IllegalStateException("Failed to allocate native memory");
-    }
-  }
-
-  private native long jni_YGNodeNewWithConfig(long configPointer, boolean avoidGlobalJNIRefs);
-  public YogaNodeJNI(YogaConfig config) {
-    mAvoidGlobalJNIRefs = config.avoidGlobalJNIRefs;
-    mNativePointer = jni_YGNodeNewWithConfig(config.mNativePointer, mAvoidGlobalJNIRefs);
-    if (mNativePointer == 0) {
-      throw new IllegalStateException("Failed to allocate native memory");
-    }
-  }
-
-  @Override
-  protected void finalize() throws Throwable {
-    try {
-      freeNatives();
-    } finally {
-      super.finalize();
-    }
-  }
-
-  private static native void jni_YGNodeFree(long nativePointer);
-
-  /* frees the native underlying YGNode. Useful for testing. */
-  public void freeNatives() {
-    if (mNativePointer > 0) {
-      long nativePointer = mNativePointer;
-      mNativePointer = 0;
-      jni_YGNodeFree(nativePointer);
-    }
-  }
-
-  private static native void jni_YGNodeReset(long nativePointer);
-  public void reset() {
-    mHasNewLayout = true;
-
-    mWidth = YogaConstants.UNDEFINED;
-    mHeight = YogaConstants.UNDEFINED;
-    mTop = YogaConstants.UNDEFINED;
-    mLeft = YogaConstants.UNDEFINED;
-    mMarginLeft = 0;
-    mMarginTop = 0;
-    mMarginRight = 0;
-    mMarginBottom = 0;
-    mPaddingLeft = 0;
-    mPaddingTop = 0;
-    mPaddingRight = 0;
-    mPaddingBottom = 0;
-    mBorderLeft = 0;
-    mBorderTop = 0;
-    mBorderRight = 0;
-    mBorderBottom = 0;
-    mLayoutDirection = 0;
-
-    mMeasureFunction = null;
-    mBaselineFunction = null;
-    mData = null;
-    mDoesLegacyStretchFlagAffectsLayout = false;
-
-    jni_YGNodeReset(mNativePointer);
-  }
-
-  public int getChildCount() {
-    return mChildren == null ? 0 : mChildren.size();
-  }
-
-  public YogaNodeJNI getChildAt(int i) {
-    if (mChildren == null) {
-      throw new IllegalStateException("YogaNode does not have children");
-    }
-    return mChildren.get(i);
-  }
-
-  private static native void jni_YGNodeInsertChild(long nativePointer, long childPointer, int index);
-
-  public void addChildAt(YogaNode c, int i) {
-    YogaNodeJNI child = (YogaNodeJNI) c;
-    if (child.mOwner != null) {
-      throw new IllegalStateException("Child already has a parent, it must be removed first.");
-    }
-
-    if (mChildren == null) {
-      mChildren = new ArrayList<>(4);
-    }
-    mChildren.add(i, child);
-    child.mOwner = this;
-    jni_YGNodeInsertChild(mNativePointer, child.mNativePointer, i);
-  }
-
-  private static native void jni_YGNodeSetIsReferenceBaseline(long nativePointer, boolean isReferenceBaseline);
-
-  public void setIsReferenceBaseline(boolean isReferenceBaseline) {
-    jni_YGNodeSetIsReferenceBaseline(mNativePointer, isReferenceBaseline);
-  }
-
-  private static native boolean jni_YGNodeIsReferenceBaseline(long nativePointer);
-
-  public boolean isReferenceBaseline() {
-    return jni_YGNodeIsReferenceBaseline(mNativePointer);
-  }
-
-  private static native void jni_YGNodeClearChildren(long nativePointer);
-
-  private void clearChildren() {
-    mChildren = null;
-    jni_YGNodeClearChildren(mNativePointer);
-  }
-
-  private static native void jni_YGNodeRemoveChild(long nativePointer, long childPointer);
-  public YogaNodeJNI removeChildAt(int i) {
-    if (mChildren == null) {
-      throw new IllegalStateException(
-          "Trying to remove a child of a YogaNode that does not have children");
-    }
-    final YogaNodeJNI child = mChildren.remove(i);
-    child.mOwner = null;
-    jni_YGNodeRemoveChild(mNativePointer, child.mNativePointer);
-    return child;
-  }
-
-  /**
-   * @returns the {@link YogaNode} that owns this {@link YogaNode}.
-   * The owner is used to identify the YogaTree that a {@link YogaNode} belongs
-   * to.
-   * This method will return the parent of the {@link YogaNode} when the
-   * {@link YogaNode} only belongs to one YogaTree or null when the
-   * {@link YogaNode} is shared between two or more YogaTrees.
-   */
-  @Nullable
-  public YogaNodeJNI getOwner() {
-    return mOwner;
-  }
-
-  /** @deprecated Use #getOwner() instead. This will be removed in the next version. */
-  @Deprecated
-  @Nullable
-  public YogaNodeJNI getParent() {
-    return getOwner();
-  }
-
-  public int indexOf(YogaNode child) {
-    return mChildren == null ? -1 : mChildren.indexOf(child);
-  }
-
-  private static native void jni_YGNodeCalculateLayout(long nativePointer, float width, float height, long[] nativePointers, YogaNodeJNI[] nodes);
-  public void calculateLayout(float width, float height) {
-    long[] nativePointers = null;
-    YogaNodeJNI[] nodes = null;
-
-    if (mAvoidGlobalJNIRefs) {
-      ArrayList<YogaNodeJNI> n = new ArrayList<>();
-      n.add(this);
-      for (int i = 0; i < n.size(); ++i) {
-        List<YogaNodeJNI> children  = n.get(i).mChildren;
-        if (children != null) {
-          n.addAll(children);
-        }
-      }
-
-      nodes = n.toArray(new YogaNodeJNI[n.size()]);
-      nativePointers = new long[nodes.length];
-      for (int i = 0; i < nodes.length; ++i) {
-        nativePointers[i] = nodes[i].mNativePointer;
-      }
-    }
-
-    jni_YGNodeCalculateLayout(mNativePointer, width, height, nativePointers, nodes);
-  }
-
-  public boolean hasNewLayout() {
-    return mHasNewLayout;
-  }
-
-  private static native void jni_YGNodeMarkDirty(long nativePointer);
-  public void dirty() {
-    jni_YGNodeMarkDirty(mNativePointer);
-  }
-
-  private static native void jni_YGNodeMarkDirtyAndPropogateToDescendants(long nativePointer);
-
-  public void dirtyAllDescendants() {
-    jni_YGNodeMarkDirtyAndPropogateToDescendants(mNativePointer);
-  }
-
-  private static native boolean jni_YGNodeIsDirty(long nativePointer);
-  public boolean isDirty() {
-    return jni_YGNodeIsDirty(mNativePointer);
-  }
-
-  private static native void jni_YGNodeCopyStyle(long dstNativePointer, long srcNativePointer);
-  @Override
-  public void copyStyle(YogaNode srcNode) {
-    jni_YGNodeCopyStyle(mNativePointer, ((YogaNodeJNI) srcNode).mNativePointer);
-  }
-
-  public void markLayoutSeen() {
-    mHasNewLayout = false;
-  }
-
-  private static native int jni_YGNodeStyleGetDirection(long nativePointer);
-  public YogaDirection getStyleDirection() {
-    return YogaDirection.fromInt(jni_YGNodeStyleGetDirection(mNativePointer));
-  }
-
-  private static native void jni_YGNodeStyleSetDirection(long nativePointer, int direction);
-  public void setDirection(YogaDirection direction) {
-    jni_YGNodeStyleSetDirection(mNativePointer, direction.intValue());
-  }
-
-  private static native int jni_YGNodeStyleGetFlexDirection(long nativePointer);
-  public YogaFlexDirection getFlexDirection() {
-    return YogaFlexDirection.fromInt(jni_YGNodeStyleGetFlexDirection(mNativePointer));
-  }
-
-  private static native void jni_YGNodeStyleSetFlexDirection(long nativePointer, int flexDirection);
-  public void setFlexDirection(YogaFlexDirection flexDirection) {
-    jni_YGNodeStyleSetFlexDirection(mNativePointer, flexDirection.intValue());
-  }
-
-  private static native int jni_YGNodeStyleGetJustifyContent(long nativePointer);
-  public YogaJustify getJustifyContent() {
-    return YogaJustify.fromInt(jni_YGNodeStyleGetJustifyContent(mNativePointer));
-  }
-
-  private static native void jni_YGNodeStyleSetJustifyContent(long nativePointer, int justifyContent);
-  public void setJustifyContent(YogaJustify justifyContent) {
-    jni_YGNodeStyleSetJustifyContent(mNativePointer, justifyContent.intValue());
-  }
-
-  private static native int jni_YGNodeStyleGetAlignItems(long nativePointer);
-  public YogaAlign getAlignItems() {
-    return YogaAlign.fromInt(jni_YGNodeStyleGetAlignItems(mNativePointer));
-  }
-
-  private static native void jni_YGNodeStyleSetAlignItems(long nativePointer, int alignItems);
-  public void setAlignItems(YogaAlign alignItems) {
-    jni_YGNodeStyleSetAlignItems(mNativePointer, alignItems.intValue());
-  }
-
-  private static native int jni_YGNodeStyleGetAlignSelf(long nativePointer);
-  public YogaAlign getAlignSelf() {
-    return YogaAlign.fromInt(jni_YGNodeStyleGetAlignSelf(mNativePointer));
-  }
-
-  private static native void jni_YGNodeStyleSetAlignSelf(long nativePointer, int alignSelf);
-  public void setAlignSelf(YogaAlign alignSelf) {
-    jni_YGNodeStyleSetAlignSelf(mNativePointer, alignSelf.intValue());
-  }
-
-  private static native int jni_YGNodeStyleGetAlignContent(long nativePointer);
-  public YogaAlign getAlignContent() {
-    return YogaAlign.fromInt(jni_YGNodeStyleGetAlignContent(mNativePointer));
-  }
-
-  private static native void jni_YGNodeStyleSetAlignContent(long nativePointer, int alignContent);
-  public void setAlignContent(YogaAlign alignContent) {
-    jni_YGNodeStyleSetAlignContent(mNativePointer, alignContent.intValue());
-  }
-
-  private static native int jni_YGNodeStyleGetPositionType(long nativePointer);
-  public YogaPositionType getPositionType() {
-    return YogaPositionType.fromInt(jni_YGNodeStyleGetPositionType(mNativePointer));
-  }
-
-  private static native void jni_YGNodeStyleSetPositionType(long nativePointer, int positionType);
-  public void setPositionType(YogaPositionType positionType) {
-    jni_YGNodeStyleSetPositionType(mNativePointer, positionType.intValue());
-  }
-
-  private static native int jni_YGNodeStyleGetFlexWrap(long nativePointer);
-  public YogaWrap getWrap() {
-    return YogaWrap.fromInt(jni_YGNodeStyleGetFlexWrap(mNativePointer));
-  }
-
-  private static native void jni_YGNodeStyleSetFlexWrap(long nativePointer, int wrapType);
-  public void setWrap(YogaWrap flexWrap) {
-    jni_YGNodeStyleSetFlexWrap(mNativePointer, flexWrap.intValue());
-  }
-
-  private static native int jni_YGNodeStyleGetOverflow(long nativePointer);
-  public YogaOverflow getOverflow() {
-    return YogaOverflow.fromInt(jni_YGNodeStyleGetOverflow(mNativePointer));
-  }
-
-  private static native void jni_YGNodeStyleSetOverflow(long nativePointer, int overflow);
-  public void setOverflow(YogaOverflow overflow) {
-    jni_YGNodeStyleSetOverflow(mNativePointer, overflow.intValue());
-  }
-
-  private static native int jni_YGNodeStyleGetDisplay(long nativePointer);
-  public YogaDisplay getDisplay() {
-    return YogaDisplay.fromInt(jni_YGNodeStyleGetDisplay(mNativePointer));
-  }
-
-  private static native void jni_YGNodeStyleSetDisplay(long nativePointer, int display);
-  public void setDisplay(YogaDisplay display) {
-    jni_YGNodeStyleSetDisplay(mNativePointer, display.intValue());
-  }
-
-  private static native float jni_YGNodeStyleGetFlex(long nativePointer);
-  public float getFlex() {
-    return jni_YGNodeStyleGetFlex(mNativePointer);
-  }
-
-  private static native void jni_YGNodeStyleSetFlex(long nativePointer, float flex);
-  public void setFlex(float flex) {
-    jni_YGNodeStyleSetFlex(mNativePointer, flex);
-  }
-
-  private static native float jni_YGNodeStyleGetFlexGrow(long nativePointer);
-  public float getFlexGrow() {
-    return jni_YGNodeStyleGetFlexGrow(mNativePointer);
-  }
-
-  private static native void jni_YGNodeStyleSetFlexGrow(long nativePointer, float flexGrow);
-  public void setFlexGrow(float flexGrow) {
-    jni_YGNodeStyleSetFlexGrow(mNativePointer, flexGrow);
-  }
-
-  private static native float jni_YGNodeStyleGetFlexShrink(long nativePointer);
-  public float getFlexShrink() {
-    return jni_YGNodeStyleGetFlexShrink(mNativePointer);
-  }
-
-  private static native void jni_YGNodeStyleSetFlexShrink(long nativePointer, float flexShrink);
-  public void setFlexShrink(float flexShrink) {
-    jni_YGNodeStyleSetFlexShrink(mNativePointer, flexShrink);
-  }
-
-  private static native Object jni_YGNodeStyleGetFlexBasis(long nativePointer);
-  public YogaValue getFlexBasis() {
-    return (YogaValue) jni_YGNodeStyleGetFlexBasis(mNativePointer);
-  }
-
-  private static native void jni_YGNodeStyleSetFlexBasis(long nativePointer, float flexBasis);
-  public void setFlexBasis(float flexBasis) {
-    jni_YGNodeStyleSetFlexBasis(mNativePointer, flexBasis);
-  }
-
-  private static native void jni_YGNodeStyleSetFlexBasisPercent(long nativePointer, float percent);
-  public void setFlexBasisPercent(float percent) {
-    jni_YGNodeStyleSetFlexBasisPercent(mNativePointer, percent);
-  }
-
-  private static native void jni_YGNodeStyleSetFlexBasisAuto(long nativePointer);
-  public void setFlexBasisAuto() {
-    jni_YGNodeStyleSetFlexBasisAuto(mNativePointer);
-  }
-
-  private static native Object jni_YGNodeStyleGetMargin(long nativePointer, int edge);
-  public YogaValue getMargin(YogaEdge edge) {
-    return (YogaValue) jni_YGNodeStyleGetMargin(mNativePointer, edge.intValue());
-  }
-
-  private static native void jni_YGNodeStyleSetMargin(long nativePointer, int edge, float margin);
-  public void setMargin(YogaEdge edge, float margin) {
-    jni_YGNodeStyleSetMargin(mNativePointer, edge.intValue(), margin);
-  }
-
-  private static native void jni_YGNodeStyleSetMarginPercent(long nativePointer, int edge, float percent);
-  public void setMarginPercent(YogaEdge edge, float percent) {
-    jni_YGNodeStyleSetMarginPercent(mNativePointer, edge.intValue(), percent);
-  }
-
-  private static native void jni_YGNodeStyleSetMarginAuto(long nativePointer, int edge);
-  public void setMarginAuto(YogaEdge edge) {
-    jni_YGNodeStyleSetMarginAuto(mNativePointer, edge.intValue());
-  }
-
-  private static native Object jni_YGNodeStyleGetPadding(long nativePointer, int edge);
-  public YogaValue getPadding(YogaEdge edge) {
-    return (YogaValue) jni_YGNodeStyleGetPadding(mNativePointer, edge.intValue());
-  }
-
-  private static native void jni_YGNodeStyleSetPadding(long nativePointer, int edge, float padding);
-  public void setPadding(YogaEdge edge, float padding) {
-    jni_YGNodeStyleSetPadding(mNativePointer, edge.intValue(), padding);
-  }
-
-  private static native void jni_YGNodeStyleSetPaddingPercent(long nativePointer, int edge, float percent);
-  public void setPaddingPercent(YogaEdge edge, float percent) {
-    jni_YGNodeStyleSetPaddingPercent(mNativePointer, edge.intValue(), percent);
-  }
-
-  private static native float jni_YGNodeStyleGetBorder(long nativePointer, int edge);
-  public float getBorder(YogaEdge edge) {
-    return jni_YGNodeStyleGetBorder(mNativePointer, edge.intValue());
-  }
-
-  private static native void jni_YGNodeStyleSetBorder(long nativePointer, int edge, float border);
-  public void setBorder(YogaEdge edge, float border) {
-    jni_YGNodeStyleSetBorder(mNativePointer, edge.intValue(), border);
-  }
-
-  private static native Object jni_YGNodeStyleGetPosition(long nativePointer, int edge);
-  public YogaValue getPosition(YogaEdge edge) {
-    return (YogaValue) jni_YGNodeStyleGetPosition(mNativePointer, edge.intValue());
-  }
-
-  private static native void jni_YGNodeStyleSetPosition(long nativePointer, int edge, float position);
-  public void setPosition(YogaEdge edge, float position) {
-    jni_YGNodeStyleSetPosition(mNativePointer, edge.intValue(), position);
-  }
-
-  private static native void jni_YGNodeStyleSetPositionPercent(long nativePointer, int edge, float percent);
-  public void setPositionPercent(YogaEdge edge, float percent) {
-    jni_YGNodeStyleSetPositionPercent(mNativePointer, edge.intValue(), percent);
-  }
-
-  private static native Object jni_YGNodeStyleGetWidth(long nativePointer);
-  public YogaValue getWidth() {
-    return (YogaValue) jni_YGNodeStyleGetWidth(mNativePointer);
-  }
-
-  private static native void jni_YGNodeStyleSetWidth(long nativePointer, float width);
-  public void setWidth(float width) {
-    jni_YGNodeStyleSetWidth(mNativePointer, width);
-  }
-
-  private static native void jni_YGNodeStyleSetWidthPercent(long nativePointer, float percent);
-  public void setWidthPercent(float percent) {
-    jni_YGNodeStyleSetWidthPercent(mNativePointer, percent);
-  }
-
-  private static native void jni_YGNodeStyleSetWidthAuto(long nativePointer);
-  public void setWidthAuto() {
-    jni_YGNodeStyleSetWidthAuto(mNativePointer);
-  }
-
-  private static native Object jni_YGNodeStyleGetHeight(long nativePointer);
-  public YogaValue getHeight() {
-    return (YogaValue) jni_YGNodeStyleGetHeight(mNativePointer);
-  }
-
-  private static native void jni_YGNodeStyleSetHeight(long nativePointer, float height);
-  public void setHeight(float height) {
-    jni_YGNodeStyleSetHeight(mNativePointer, height);
-  }
-
-  private static native void jni_YGNodeStyleSetHeightPercent(long nativePointer, float percent);
-  public void setHeightPercent(float percent) {
-    jni_YGNodeStyleSetHeightPercent(mNativePointer, percent);
-  }
-
-  private static native void jni_YGNodeStyleSetHeightAuto(long nativePointer);
-  public void setHeightAuto() {
-    jni_YGNodeStyleSetHeightAuto(mNativePointer);
-  }
-
-  private static native Object jni_YGNodeStyleGetMinWidth(long nativePointer);
-  public YogaValue getMinWidth() {
-    return (YogaValue) jni_YGNodeStyleGetMinWidth(mNativePointer);
-  }
-
-  private static native void jni_YGNodeStyleSetMinWidth(long nativePointer, float minWidth);
-  public void setMinWidth(float minWidth) {
-    jni_YGNodeStyleSetMinWidth(mNativePointer, minWidth);
-  }
-
-  private static native void jni_YGNodeStyleSetMinWidthPercent(long nativePointer, float percent);
-  public void setMinWidthPercent(float percent) {
-    jni_YGNodeStyleSetMinWidthPercent(mNativePointer, percent);
-  }
-
-  private static native Object jni_YGNodeStyleGetMinHeight(long nativePointer);
-  public YogaValue getMinHeight() {
-    return (YogaValue) jni_YGNodeStyleGetMinHeight(mNativePointer);
-  }
-
-  private static native void jni_YGNodeStyleSetMinHeight(long nativePointer, float minHeight);
-  public void setMinHeight(float minHeight) {
-    jni_YGNodeStyleSetMinHeight(mNativePointer, minHeight);
-  }
-
-  private static native void jni_YGNodeStyleSetMinHeightPercent(long nativePointer, float percent);
-  public void setMinHeightPercent(float percent) {
-    jni_YGNodeStyleSetMinHeightPercent(mNativePointer, percent);
-  }
-
-  private static native Object jni_YGNodeStyleGetMaxWidth(long nativePointer);
-  public YogaValue getMaxWidth() {
-    return (YogaValue) jni_YGNodeStyleGetMaxWidth(mNativePointer);
-  }
-
-  private static native void jni_YGNodeStyleSetMaxWidth(long nativePointer, float maxWidth);
-  public void setMaxWidth(float maxWidth) {
-    jni_YGNodeStyleSetMaxWidth(mNativePointer, maxWidth);
-  }
-
-  private static native void jni_YGNodeStyleSetMaxWidthPercent(long nativePointer, float percent);
-  public void setMaxWidthPercent(float percent) {
-    jni_YGNodeStyleSetMaxWidthPercent(mNativePointer, percent);
-  }
-
-  private static native Object jni_YGNodeStyleGetMaxHeight(long nativePointer);
-  public YogaValue getMaxHeight() {
-    return (YogaValue) jni_YGNodeStyleGetMaxHeight(mNativePointer);
-  }
-
-  private static native void jni_YGNodeStyleSetMaxHeight(long nativePointer, float maxheight);
-  public void setMaxHeight(float maxheight) {
-    jni_YGNodeStyleSetMaxHeight(mNativePointer, maxheight);
-  }
-
-  private static native void jni_YGNodeStyleSetMaxHeightPercent(long nativePointer, float percent);
-  public void setMaxHeightPercent(float percent) {
-    jni_YGNodeStyleSetMaxHeightPercent(mNativePointer, percent);
-  }
-
-  private static native float jni_YGNodeStyleGetAspectRatio(long nativePointer);
-  public float getAspectRatio() {
-    return jni_YGNodeStyleGetAspectRatio(mNativePointer);
-  }
-
-  private static native void jni_YGNodeStyleSetAspectRatio(long nativePointer, float aspectRatio);
-  public void setAspectRatio(float aspectRatio) {
-    jni_YGNodeStyleSetAspectRatio(mNativePointer, aspectRatio);
-  }
-
-  public float getLayoutX() {
-    return mLeft;
-  }
-
-  public float getLayoutY() {
-    return mTop;
-  }
-
-  public float getLayoutWidth() {
-    return mWidth;
-  }
-
-  public float getLayoutHeight() {
-    return mHeight;
-  }
-
-  public boolean getDoesLegacyStretchFlagAffectsLayout() {
-    return mDoesLegacyStretchFlagAffectsLayout;
-  }
-
-  public float getLayoutMargin(YogaEdge edge) {
-    switch (edge) {
-      case LEFT:
-        return mMarginLeft;
-      case TOP:
-        return mMarginTop;
-      case RIGHT:
-        return mMarginRight;
-      case BOTTOM:
-        return mMarginBottom;
-      case START:
-        return getLayoutDirection() == YogaDirection.RTL ? mMarginRight : mMarginLeft;
-      case END:
-        return getLayoutDirection() == YogaDirection.RTL ? mMarginLeft : mMarginRight;
-      default:
-        throw new IllegalArgumentException("Cannot get layout margins of multi-edge shorthands");
-    }
-  }
-
-  public float getLayoutPadding(YogaEdge edge) {
-    switch (edge) {
-      case LEFT:
-        return mPaddingLeft;
-      case TOP:
-        return mPaddingTop;
-      case RIGHT:
-        return mPaddingRight;
-      case BOTTOM:
-        return mPaddingBottom;
-      case START:
-        return getLayoutDirection() == YogaDirection.RTL ? mPaddingRight : mPaddingLeft;
-      case END:
-        return getLayoutDirection() == YogaDirection.RTL ? mPaddingLeft : mPaddingRight;
-      default:
-        throw new IllegalArgumentException("Cannot get layout paddings of multi-edge shorthands");
-    }
-  }
-
-  public float getLayoutBorder(YogaEdge edge) {
-    switch (edge) {
-      case LEFT:
-        return mBorderLeft;
-      case TOP:
-        return mBorderTop;
-      case RIGHT:
-        return mBorderRight;
-      case BOTTOM:
-        return mBorderBottom;
-      case START:
-        return getLayoutDirection() == YogaDirection.RTL ? mBorderRight : mBorderLeft;
-      case END:
-        return getLayoutDirection() == YogaDirection.RTL ? mBorderLeft : mBorderRight;
-      default:
-        throw new IllegalArgumentException("Cannot get layout border of multi-edge shorthands");
-    }
-  }
-
-  public YogaDirection getLayoutDirection() {
-    return YogaDirection.fromInt(mLayoutDirection);
-  }
-
-  private static native void jni_YGNodeSetHasMeasureFunc(long nativePointer, boolean hasMeasureFunc);
-  public void setMeasureFunction(YogaMeasureFunction measureFunction) {
-    mMeasureFunction = measureFunction;
-    jni_YGNodeSetHasMeasureFunc(mNativePointer, measureFunction != null);
-  }
-
-  // Implementation Note: Why this method needs to stay final
-  //
-  // We cache the jmethodid for this method in Yoga code. This means that even if a subclass
-  // were to override measure, we'd still call this implementation from layout code since the
-  // overriding method will have a different jmethodid. This is final to prevent that mistake.
-  @DoNotStrip
-  public final long measure(float width, int widthMode, float height, int heightMode) {
-    if (!isMeasureDefined()) {
-      throw new RuntimeException("Measure function isn't defined!");
-    }
-
-    return mMeasureFunction.measure(
-        this,
-        width,
-        YogaMeasureMode.fromInt(widthMode),
-        height,
-        YogaMeasureMode.fromInt(heightMode));
-  }
-
-  private static native void jni_YGNodeSetHasBaselineFunc(long nativePointer, boolean hasMeasureFunc);
-  public void setBaselineFunction(YogaBaselineFunction baselineFunction) {
-    mBaselineFunction = baselineFunction;
-    jni_YGNodeSetHasBaselineFunc(mNativePointer, baselineFunction != null);
-  }
-
-  @DoNotStrip
-  public final float baseline(float width, float height) {
-    return mBaselineFunction.baseline(this, width, height);
-  }
-
-  public boolean isMeasureDefined() {
-    return mMeasureFunction != null;
-  }
-
-  public void setData(Object data) {
-    mData = data;
-  }
-
-  public Object getData() {
-    return mData;
-  }
-
-  private static native void jni_YGNodePrint(long nativePointer);
-
-  /**
-   * Use the set logger (defaults to adb log) to print out the styles, children, and computed
-   * layout of the tree rooted at this node.
-   */
-  public void print() {
-    jni_YGNodePrint(mNativePointer);
-  }
-
-  private static native void jni_YGNodeSetStyleInputs(long nativePointer, float[] styleInputsArray, int size);
-
-  public void setStyleInputs(float[] styleInputsArray, int size) {
-    jni_YGNodeSetStyleInputs(mNativePointer, styleInputsArray, size);
-  }
-
-  /**
-   * This method replaces the child at childIndex position with the newNode received by parameter.
-   * This is different than calling removeChildAt and addChildAt because this method ONLY replaces
-   * the child in the mChildren datastructure. @DoNotStrip: called from JNI
-   *
-   * @return the nativePointer of the newNode {@linl YogaNode}
-   */
-  @DoNotStrip
-  private final long replaceChild(YogaNodeJNI newNode, int childIndex) {
-    if (mChildren == null) {
-      throw new IllegalStateException("Cannot replace child. YogaNode does not have children");
-    }
-    mChildren.remove(childIndex);
-    mChildren.add(childIndex, newNode);
-    newNode.mOwner = this;
-    return newNode.mNativePointer;
-  }
-}

java/com/facebook/yoga/YogaNodeType.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.

java/com/facebook/yoga/YogaOverflow.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.

java/com/facebook/yoga/YogaPositionType.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.

java/com/facebook/yoga/YogaPrintOptions.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.

java/com/facebook/yoga/YogaStyleInputs.java

@@ -1,53 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
- */
-package com.facebook.yoga;
-
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
-public class YogaStyleInputs {
-  public static final short LAYOUT_DIRECTION = 0;
-  public static final short FLEX_DIRECTION = 1;
-  public static final short FLEX = 2;
-  public static final short FLEX_GROW = 3;
-  public static final short FLEX_SHRINK = 4;
-  public static final short FLEX_BASIS = 5;
-  public static final short FLEX_BASIS_PERCENT = 6;
-  public static final short FLEX_BASIS_AUTO = 7;
-  public static final short FLEX_WRAP = 8;
-  public static final short WIDTH = 9;
-  public static final short WIDTH_PERCENT = 10;
-  public static final short WIDTH_AUTO = 11;
-  public static final short MIN_WIDTH = 12;
-  public static final short MIN_WIDTH_PERCENT = 13;
-  public static final short MAX_WIDTH = 14;
-  public static final short MAX_WIDTH_PERCENT = 15;
-  public static final short HEIGHT = 16;
-  public static final short HEIGHT_PERCENT = 17;
-  public static final short HEIGHT_AUTO = 18;
-  public static final short MIN_HEIGHT = 19;
-  public static final short MIN_HEIGHT_PERCENT = 20;
-  public static final short MAX_HEIGHT = 21;
-  public static final short MAX_HEIGHT_PERCENT = 22;
-  public static final short JUSTIFY_CONTENT = 23;
-  public static final short ALIGN_ITEMS = 24;
-  public static final short ALIGN_SELF = 25;
-  public static final short ALIGN_CONTENT = 26;
-  public static final short POSITION_TYPE = 27;
-  public static final short ASPECT_RATIO = 28;
-  public static final short OVERFLOW = 29;
-  public static final short DISPLAY = 30;
-  public static final short MARGIN = 31;
-  public static final short MARGIN_PERCENT = 32;
-  public static final short MARGIN_AUTO = 33;
-  public static final short PADDING = 34;
-  public static final short PADDING_PERCENT = 35;
-  public static final short BORDER = 36;
-  public static final short POSITION = 37;
-  public static final short POSITION_PERCENT = 38;
-  public static final short IS_REFERENCE_BASELINE = 39;
-}

java/com/facebook/yoga/YogaUnit.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.

java/com/facebook/yoga/YogaValue.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.

java/com/facebook/yoga/YogaWrap.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *
  *  This source code is licensed under the MIT license found in the LICENSE
  *  file in the root directory of this source tree.

java/gradle.properties

@@ -1,10 +1,3 @@
-#
-#  Copyright (c) Facebook, Inc. and its affiliates.
-#
-#  This source code is licensed under the MIT license found in the LICENSE
-#  file in the root directory of this source tree.
-#
-
 GROUP=com.facebook.yoga
 POM_NAME=Yoga
 POM_DESCRIPTION=Java bindings to libyoga

java/jni/YGJTypes.cpp

@@ -1,44 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
- */
-#include "YGJTypes.h"
-
-using facebook::jni::alias_ref;
-using facebook::jni::local_ref;
-
-jfloat JYogaNode::baseline(jfloat width, jfloat height) {
-  static auto javaMethod =
-      javaClassLocal()->getMethod<jfloat(jfloat, jfloat)>("baseline");
-  return javaMethod(self(), width, height);
-}
-
-jlong JYogaNode::measure(
-    jfloat width,
-    jint widthMode,
-    jfloat height,
-    jint heightMode) {
-  static auto javaMethod =
-      javaClassLocal()->getMethod<jlong(jfloat, jint, jfloat, jint)>("measure");
-  return javaMethod(self(), width, widthMode, height, heightMode);
-}
-
-facebook::jni::local_ref<JYogaLogLevel> JYogaLogLevel::fromInt(jint logLevel) {
-  static auto javaMethod =
-      javaClassStatic()->getStaticMethod<alias_ref<JYogaLogLevel>(jint)>(
-          "fromInt");
-  return javaMethod(javaClassStatic(), logLevel);
-}
-
-void JYogaLogger::log(
-    facebook::jni::alias_ref<JYogaNode> node,
-    facebook::jni::alias_ref<JYogaLogLevel> logLevel,
-    jstring message) {
-  static auto javaMethod =
-      javaClassLocal()
-          ->getMethod<void(
-              alias_ref<JYogaNode>, alias_ref<JYogaLogLevel>, jstring)>("log");
-  javaMethod(self(), node, logLevel, message);
-}

java/jni/YGJTypes.h

@@ -1,42 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
- */
-#include <fb/fbjni.h>
-#include <yoga/YGValue.h>
-
-struct JYogaNode : public facebook::jni::JavaClass<JYogaNode> {
-  static constexpr auto kJavaDescriptor = "Lcom/facebook/yoga/YogaNodeJNI;";
-
-  jfloat baseline(jfloat width, jfloat height);
-  jlong measure(jfloat width, jint widthMode, jfloat height, jint heightMode);
-};
-
-struct JYogaConfig : public facebook::jni::JavaClass<JYogaConfig> {
-  static constexpr auto kJavaDescriptor = "Lcom/facebook/yoga/YogaConfig;";
-};
-
-struct JYogaLogLevel : public facebook::jni::JavaClass<JYogaLogLevel> {
-  static constexpr auto kJavaDescriptor = "Lcom/facebook/yoga/YogaLogLevel;";
-
-  static facebook::jni::local_ref<JYogaLogLevel> fromInt(jint);
-};
-
-struct JYogaLogger : public facebook::jni::JavaClass<JYogaLogger> {
-  static constexpr auto kJavaDescriptor = "Lcom/facebook/yoga/YogaLogger";
-
-  void log(
-      facebook::jni::alias_ref<JYogaNode>,
-      facebook::jni::alias_ref<JYogaLogLevel>,
-      jstring);
-};
-
-struct JYogaValue : public facebook::jni::JavaClass<JYogaValue> {
-  constexpr static auto kJavaDescriptor = "Lcom/facebook/yoga/YogaValue;";
-
-  static facebook::jni::local_ref<javaobject> create(YGValue value) {
-    return newInstance(value.value, static_cast<int>(value.unit));
-  }
-};

java/proguard-annotations/build.gradle

@@ -1,8 +1 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 apply plugin: 'java'

java/tests/com/facebook/yoga/BatchingAPITests.java

@@ -1,500 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
- */
-package com.facebook.yoga;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import static org.junit.Assert.assertEquals;
-
-@RunWith(Parameterized.class)
-public class BatchingAPITests {
-
-  @Parameterized.Parameters(name = "{0}")
-  public static Iterable<TestParametrization.NodeFactory> nodeFactories() {
-    return TestParametrization.nodeFactories();
-  }
-
-  @Parameterized.Parameter public TestParametrization.NodeFactory mNodeFactory;
-
-  @Test
-  public void testStyleInputLayoutDirection() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.LAYOUT_DIRECTION, YogaDirection.LTR.intValue()};
-    root.setStyleInputs(arr, 2);
-    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
-    assertEquals(root.getLayoutDirection(), YogaDirection.LTR);
-  }
-
-  @Test
-  public void testStyleInputFlexDirection() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.FLEX_DIRECTION, YogaFlexDirection.ROW.intValue()};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getFlexDirection(), YogaFlexDirection.ROW);
-  }
-
-  @Test
-  public void testStyleInputFlex() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.FLEX, 5f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getFlex(), 5f, 0.0f);
-  }
-
-  @Test
-  public void testStyleInputFlexGrow() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.FLEX_GROW, 5f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getFlexGrow(), 5f, 0.0f);
-  }
-
-  @Test
-  public void testStyleInputFlexShrink() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.FLEX_SHRINK, 5f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getFlexShrink(), 5f, 0.0f);
-  }
-
-  @Test
-  public void testStyleInputFlexBasis() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.FLEX_BASIS, 5f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getFlexBasis(), new YogaValue(5f, YogaUnit.POINT));
-  }
-
-  @Test
-  public void testStyleInputFlexBasisPercent() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.FLEX_BASIS_PERCENT, 5f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getFlexBasis(), new YogaValue(5f, YogaUnit.PERCENT));
-  }
-
-  @Test
-  public void testStyleInputFlexBasisAuto() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.FLEX_BASIS_AUTO};
-    root.setStyleInputs(arr, 1);
-    assertEquals(root.getFlexBasis(), YogaValue.AUTO);
-  }
-
-  @Test
-  public void testStyleInputFlexWrap() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.FLEX_WRAP, YogaWrap.WRAP.intValue()};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getWrap(), YogaWrap.WRAP);
-  }
-
-  @Test
-  public void testStyleInputWidth() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.WIDTH, 50f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getWidth(), new YogaValue(50f, YogaUnit.POINT));
-  }
-
-  @Test
-  public void testStyleInputWidthPercent() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.WIDTH_PERCENT, 5f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getWidth(), new YogaValue(5f, YogaUnit.PERCENT));
-  }
-
-  @Test
-  public void testStyleInputWidthAuto() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.WIDTH_AUTO};
-    root.setStyleInputs(arr, 1);
-    assertEquals(root.getWidth(), YogaValue.AUTO);
-  }
-
-  @Test
-  public void testStyleInputMinWidth() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.MIN_WIDTH, 50f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getMinWidth(), new YogaValue(50f, YogaUnit.POINT));
-  }
-
-  @Test
-  public void testStyleInputMinWidthPercent() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.MIN_WIDTH_PERCENT, 5f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getMinWidth(), new YogaValue(5f, YogaUnit.PERCENT));
-  }
-
-  @Test
-  public void testStyleInputMaxWidth() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.MAX_WIDTH, 50f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getMaxWidth(), new YogaValue(50f, YogaUnit.POINT));
-  }
-
-  @Test
-  public void testStyleInputMaxWidthPercent() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.MAX_WIDTH_PERCENT, 5f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getMaxWidth(), new YogaValue(5f, YogaUnit.PERCENT));
-  }
-
-  @Test
-  public void testStyleInputHeight() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.HEIGHT, 50f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getHeight(), new YogaValue(50f, YogaUnit.POINT));
-  }
-
-  @Test
-  public void testStyleInputHeightPercent() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.HEIGHT_PERCENT, 5f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getHeight(), new YogaValue(5f, YogaUnit.PERCENT));
-  }
-
-  @Test
-  public void testStyleInputHeightAuto() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.HEIGHT_AUTO};
-    root.setStyleInputs(arr, 1);
-    assertEquals(root.getHeight(), YogaValue.AUTO);
-  }
-
-  @Test
-  public void testStyleInputMinHeight() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.MIN_HEIGHT, 50f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getMinHeight(), new YogaValue(50f, YogaUnit.POINT));
-  }
-
-  @Test
-  public void testStyleInputMinHeightPercent() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.MIN_HEIGHT_PERCENT, 5f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getMinHeight(), new YogaValue(5f, YogaUnit.PERCENT));
-  }
-
-  @Test
-  public void testStyleInputMaxHeight() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.MAX_HEIGHT, 50f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getMaxHeight(), new YogaValue(50f, YogaUnit.POINT));
-  }
-
-  @Test
-  public void testStyleInputMaxHeightPercent() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.MAX_HEIGHT_PERCENT, 5f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getMaxHeight(), new YogaValue(5f, YogaUnit.PERCENT));
-  }
-
-  @Test
-  public void testStyleInputJustiyContent() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.JUSTIFY_CONTENT, YogaJustify.CENTER.intValue()};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getJustifyContent(), YogaJustify.CENTER);
-  }
-
-  @Test
-  public void testStyleInputAlignItems() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.ALIGN_ITEMS, YogaAlign.BASELINE.intValue()};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getAlignItems(), YogaAlign.BASELINE);
-  }
-
-  @Test
-  public void testStyleInputAlignSelf() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.ALIGN_SELF, YogaAlign.BASELINE.intValue()};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getAlignSelf(), YogaAlign.BASELINE);
-  }
-
-  @Test
-  public void testStyleInputAlignContent() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.ALIGN_CONTENT, YogaAlign.BASELINE.intValue()};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getAlignContent(), YogaAlign.BASELINE);
-  }
-
-  @Test
-  public void testStyleInputPositionType() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.POSITION_TYPE, YogaPositionType.ABSOLUTE.intValue()};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getPositionType(), YogaPositionType.ABSOLUTE);
-  }
-
-  @Test
-  public void testStyleInputAspectRatio() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.ASPECT_RATIO, 2f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getAspectRatio(), 2f, 0.0f);
-  }
-
-  @Test
-  public void testStyleInputOverflow() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.OVERFLOW, YogaOverflow.HIDDEN.intValue()};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getOverflow(), YogaOverflow.HIDDEN);
-  }
-
-  @Test
-  public void testStyleInputDisplay() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.DISPLAY, YogaDisplay.NONE.intValue()};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getDisplay(), YogaDisplay.NONE);
-  }
-
-  @Test
-  public void testStyleInputMargin() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.MARGIN, YogaEdge.LEFT.intValue(), 12f};
-    root.setStyleInputs(arr, 3);
-    assertEquals(root.getMargin(YogaEdge.LEFT), new YogaValue(12f, YogaUnit.POINT));
-  }
-
-  @Test
-  public void testStyleInputMarginPercent() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.MARGIN_PERCENT, YogaEdge.LEFT.intValue(), 12f};
-    root.setStyleInputs(arr, 3);
-    assertEquals(root.getMargin(YogaEdge.LEFT), new YogaValue(12f, YogaUnit.PERCENT));
-  }
-
-  @Test
-  public void testStyleInputMarginAuto() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.MARGIN_AUTO, YogaEdge.LEFT.intValue()};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.getMargin(YogaEdge.LEFT), YogaValue.AUTO);
-  }
-
-  @Test
-  public void testStyleInputPadding() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.PADDING, YogaEdge.LEFT.intValue(), 12f};
-    root.setStyleInputs(arr, 3);
-    assertEquals(root.getPadding(YogaEdge.LEFT), new YogaValue(12f, YogaUnit.POINT));
-  }
-
-  @Test
-  public void testStyleInputPaddingPercent() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.PADDING_PERCENT, YogaEdge.LEFT.intValue(), 12f};
-    root.setStyleInputs(arr, 3);
-    assertEquals(root.getPadding(YogaEdge.LEFT), new YogaValue(12f, YogaUnit.PERCENT));
-  }
-
-  @Test
-  public void testStyleInputBorder() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.BORDER, YogaEdge.LEFT.intValue(), 12f};
-    root.setStyleInputs(arr, 3);
-    assertEquals(root.getBorder(YogaEdge.LEFT), 12f, 0.0f);
-  }
-
-  @Test
-  public void testStyleInputPosition() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.POSITION, YogaEdge.LEFT.intValue(), 12f};
-    root.setStyleInputs(arr, 3);
-    assertEquals(root.getPosition(YogaEdge.LEFT), new YogaValue(12f, YogaUnit.POINT));
-  }
-
-  @Test
-  public void testStyleInputPositionPercent() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.POSITION_PERCENT, YogaEdge.LEFT.intValue(), 12f};
-    root.setStyleInputs(arr, 3);
-    assertEquals(root.getPosition(YogaEdge.LEFT), new YogaValue(12f, YogaUnit.PERCENT));
-  }
-
-  @Test
-  public void testStyleInputIsReferenceBaseline() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    float[] arr = new float[]{YogaStyleInputs.IS_REFERENCE_BASELINE, 1f};
-    root.setStyleInputs(arr, 2);
-    assertEquals(root.isReferenceBaseline(), true);
-  }
-
-  @Test
-  public void testStyleInputs() {
-    YogaConfig config = new YogaConfig();
-    final YogaNode root = createNode(config);
-    int count = 0;
-    float[] arr = new float[100];
-    arr[count++] = YogaStyleInputs.FLEX_DIRECTION;
-    arr[count++] = YogaFlexDirection.ROW.intValue();
-
-    arr[count++] = YogaStyleInputs.FLEX;
-    arr[count++] = 5f;
-
-    arr[count++] = YogaStyleInputs.FLEX_GROW;
-    arr[count++] = 5f;
-
-    arr[count++] = YogaStyleInputs.FLEX_SHRINK;
-    arr[count++] = 5f;
-
-    arr[count++] = YogaStyleInputs.FLEX_BASIS_AUTO;
-
-    arr[count++] = YogaStyleInputs.FLEX_WRAP;
-    arr[count++] = YogaWrap.WRAP.intValue();
-
-    arr[count++] = YogaStyleInputs.WIDTH;
-    arr[count++] = 50f;
-
-    arr[count++] = YogaStyleInputs.MIN_WIDTH;
-    arr[count++] = 50f;
-
-    arr[count++] = YogaStyleInputs.MAX_WIDTH;
-    arr[count++] = 50f;
-
-    arr[count++] = YogaStyleInputs.HEIGHT;
-    arr[count++] = 5f;
-
-    arr[count++] = YogaStyleInputs.MIN_HEIGHT;
-    arr[count++] = 50f;
-
-    arr[count++] = YogaStyleInputs.MAX_HEIGHT;
-    arr[count++] = 50f;
-
-    arr[count++] = YogaStyleInputs.JUSTIFY_CONTENT;
-    arr[count++] = YogaJustify.CENTER.intValue();
-
-    arr[count++] = YogaStyleInputs.ALIGN_ITEMS;
-    arr[count++] = YogaAlign.BASELINE.intValue();
-
-    arr[count++] = YogaStyleInputs.ALIGN_SELF;
-    arr[count++] = YogaAlign.BASELINE.intValue();
-
-    arr[count++] = YogaStyleInputs.ALIGN_CONTENT;
-    arr[count++] = YogaAlign.BASELINE.intValue();
-
-    arr[count++] = YogaStyleInputs.POSITION_TYPE;
-    arr[count++] = YogaPositionType.ABSOLUTE.intValue();
-
-    arr[count++] = YogaStyleInputs.ASPECT_RATIO;
-    arr[count++] = 2f;
-
-    arr[count++] = YogaStyleInputs.OVERFLOW;
-    arr[count++] = YogaOverflow.HIDDEN.intValue();
-
-    arr[count++] = YogaStyleInputs.DISPLAY;
-    arr[count++] = YogaDisplay.NONE.intValue();
-
-    arr[count++] = YogaStyleInputs.MARGIN_AUTO;
-    arr[count++] = YogaEdge.LEFT.intValue();
-
-    arr[count++] = YogaStyleInputs.PADDING;
-    arr[count++] = YogaEdge.LEFT.intValue();
-    arr[count++] = 12f;
-
-    arr[count++] = YogaStyleInputs.BORDER;
-    arr[count++] = YogaEdge.LEFT.intValue();
-    arr[count++] = 12f;
-
-    arr[count++] = YogaStyleInputs.POSITION_PERCENT;
-    arr[count++] = YogaEdge.LEFT.intValue();
-    arr[count++] = 12f;
-
-    arr[count++] = YogaStyleInputs.IS_REFERENCE_BASELINE;
-    arr[count++] = 1f;
-
-    root.setStyleInputs(arr, count);
-
-    assertEquals(root.getFlexDirection(), YogaFlexDirection.ROW);
-    assertEquals(root.getFlex(), 5f, 0.0f);
-    assertEquals(root.getFlexGrow(), 5f, 0.0f);
-    assertEquals(root.getFlexShrink(), 5f, 0.0f);
-    assertEquals(root.getFlexBasis(), YogaValue.AUTO);
-    assertEquals(root.getWrap(), YogaWrap.WRAP);
-    assertEquals(root.getWidth(), new YogaValue(50f, YogaUnit.POINT));
-    assertEquals(root.getMinWidth(), new YogaValue(50f, YogaUnit.POINT));
-    assertEquals(root.getMaxWidth(), new YogaValue(50f, YogaUnit.POINT));
-    assertEquals(root.getHeight(), new YogaValue(5f, YogaUnit.POINT));
-    assertEquals(root.getMinHeight(), new YogaValue(50f, YogaUnit.POINT));
-    assertEquals(root.getMaxHeight(), new YogaValue(50f, YogaUnit.POINT));
-    assertEquals(root.getJustifyContent(), YogaJustify.CENTER);
-    assertEquals(root.getAlignItems(), YogaAlign.BASELINE);
-    assertEquals(root.getAlignSelf(), YogaAlign.BASELINE);
-    assertEquals(root.getAlignContent(), YogaAlign.BASELINE);
-    assertEquals(root.getPositionType(), YogaPositionType.ABSOLUTE);
-    assertEquals(root.getAspectRatio(), 2f, 0.0f);
-    assertEquals(root.getOverflow(), YogaOverflow.HIDDEN);
-    assertEquals(root.getDisplay(), YogaDisplay.NONE);
-    assertEquals(root.getMargin(YogaEdge.LEFT), YogaValue.AUTO);
-    assertEquals(root.getPadding(YogaEdge.LEFT), new YogaValue(12f, YogaUnit.POINT));
-    assertEquals(root.getBorder(YogaEdge.LEFT), 12f, 0.0f);
-    assertEquals(root.getPosition(YogaEdge.LEFT), new YogaValue(12f, YogaUnit.PERCENT));
-    assertEquals(root.isReferenceBaseline(), true);
-  }
-
-  private YogaNode createNode(YogaConfig config) {
-    return mNodeFactory.create(config);
-  }
-}

java/tests/com/facebook/yoga/TestParametrization.java

@@ -15,12 +15,12 @@ public class TestParametrization {
     NodeFactory nodeFactory = new NodeFactory() {
       @Override
       public YogaNode create() {
-        return YogaNode.create();
+        return new YogaNode();
       }
 
       @Override
       public YogaNode create(YogaConfig config) {
-        return YogaNode.create(config);
+        return new YogaNode(config);
       }
 
       @Override

java/tests/com/facebook/yoga/YGAlignBaselineTest.java

@@ -1,122 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-package com.facebook.yoga;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class YGAlignBaselineTest {
-  @Parameterized.Parameters(name = "{0}")
-  public static Iterable<TestParametrization.NodeFactory> nodeFactories() {
-    return TestParametrization.nodeFactories();
-  }
-
-  @Parameterized.Parameter public TestParametrization.NodeFactory mNodeFactory;
-
-  private YogaBaselineFunction getBaselineFunc() {
-    return new YogaBaselineFunction() {
-      @Override
-      public float baseline(YogaNode node, float width, float height) {
-        return height / 2;
-      }
-    };
-  }
-
-  @Test
-  public void test_align_baseline_parent_using_child_in_column_as_reference() {
-    YogaConfig config = new YogaConfig();
-
-    final YogaNode root = createYGNode(config, YogaFlexDirection.ROW, 1000f, 1000f, true);
-
-    final YogaNode root_child0 = createYGNode(config, YogaFlexDirection.COLUMN, 500f, 600f, false);
-    root.addChildAt(root_child0, 0);
-
-    final YogaNode root_child1 = createYGNode(config, YogaFlexDirection.COLUMN, 500f, 800f, false);
-    root.addChildAt(root_child1, 1);
-
-    final YogaNode root_child1_child0 =
-        createYGNode(config, YogaFlexDirection.COLUMN, 500f, 300f, false);
-    root_child1.addChildAt(root_child1_child0, 0);
-
-    final YogaNode root_child1_child1 =
-        createYGNode(config, YogaFlexDirection.COLUMN, 500f, 400f, false);
-    root_child1_child1.setBaselineFunction(getBaselineFunc());
-    root_child1_child1.setIsReferenceBaseline(true);
-    root_child1.addChildAt(root_child1_child1, 1);
-
-    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
-
-    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
-
-    assertEquals(500f, root_child1.getLayoutX(), 0.0f);
-    assertEquals(100f, root_child1.getLayoutY(), 0.0f);
-
-    assertEquals(0f, root_child1_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child1_child0.getLayoutY(), 0.0f);
-
-    assertEquals(0f, root_child1_child1.getLayoutX(), 0.0f);
-    assertEquals(300f, root_child1_child1.getLayoutY(), 0.0f);
-  }
-
-  @Test
-  public void test_align_baseline_parent_using_child_in_row_as_reference() {
-    YogaConfig config = new YogaConfig();
-
-    final YogaNode root = createYGNode(config, YogaFlexDirection.ROW, 1000f, 1000f, true);
-
-    final YogaNode root_child0 = createYGNode(config, YogaFlexDirection.COLUMN, 500f, 600f, false);
-    root.addChildAt(root_child0, 0);
-
-    final YogaNode root_child1 = createYGNode(config, YogaFlexDirection.ROW, 500f, 800f, true);
-    root.addChildAt(root_child1, 1);
-
-    final YogaNode root_child1_child0 =
-        createYGNode(config, YogaFlexDirection.COLUMN, 500f, 500f, false);
-    root_child1.addChildAt(root_child1_child0, 0);
-
-    final YogaNode root_child1_child1 =
-        createYGNode(config, YogaFlexDirection.COLUMN, 500f, 400f, false);
-    root_child1_child1.setBaselineFunction(getBaselineFunc());
-    root_child1_child1.setIsReferenceBaseline(true);
-    root_child1.addChildAt(root_child1_child1, 1);
-
-    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
-
-    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
-
-    assertEquals(500f, root_child1.getLayoutX(), 0.0f);
-    assertEquals(100f, root_child1.getLayoutY(), 0.0f);
-
-    assertEquals(0f, root_child1_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child1_child0.getLayoutY(), 0.0f);
-
-    assertEquals(500f, root_child1_child1.getLayoutX(), 0.0f);
-    assertEquals(300f, root_child1_child1.getLayoutY(), 0.0f);
-  }
-
-  private YogaNode createYGNode(
-      YogaConfig config,
-      YogaFlexDirection flexDirection,
-      float width,
-      float height,
-      boolean alignBaseline) {
-    YogaNode node = mNodeFactory.create(config);
-    node.setFlexDirection(flexDirection);
-    node.setWidth(width);
-    node.setHeight(height);
-    if (alignBaseline) {
-      node.setAlignItems(YogaAlign.BASELINE);
-    }
-    return node;
-  }
-}

java/tests/com/facebook/yoga/YGFlexTest.java

@@ -4,6 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGFlexTest.html
 
 package com.facebook.yoga;
@@ -76,121 +77,6 @@ public class YGFlexTest {
     assertEquals(25f, root_child1.getLayoutHeight(), 0.0f);
   }
 
-  @Test
-  public void test_flex_shrink_flex_grow_row() {
-    YogaConfig config = new YogaConfig();
-
-    final YogaNode root = createNode(config);
-    root.setFlexDirection(YogaFlexDirection.ROW);
-    root.setWidth(500f);
-    root.setHeight(500f);
-
-    final YogaNode root_child0 = createNode(config);
-    root_child0.setFlexShrink(1f);
-    root_child0.setWidth(500f);
-    root_child0.setHeight(100f);
-    root.addChildAt(root_child0, 0);
-
-    final YogaNode root_child1 = createNode(config);
-    root_child1.setFlexShrink(1f);
-    root_child1.setWidth(500f);
-    root_child1.setHeight(100f);
-    root.addChildAt(root_child1, 1);
-    root.setDirection(YogaDirection.LTR);
-    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
-
-    assertEquals(0f, root.getLayoutX(), 0.0f);
-    assertEquals(0f, root.getLayoutY(), 0.0f);
-    assertEquals(500f, root.getLayoutWidth(), 0.0f);
-    assertEquals(500f, root.getLayoutHeight(), 0.0f);
-
-    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
-    assertEquals(250f, root_child0.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child0.getLayoutHeight(), 0.0f);
-
-    assertEquals(250f, root_child1.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child1.getLayoutY(), 0.0f);
-    assertEquals(250f, root_child1.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child1.getLayoutHeight(), 0.0f);
-
-    root.setDirection(YogaDirection.RTL);
-    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
-
-    assertEquals(0f, root.getLayoutX(), 0.0f);
-    assertEquals(0f, root.getLayoutY(), 0.0f);
-    assertEquals(500f, root.getLayoutWidth(), 0.0f);
-    assertEquals(500f, root.getLayoutHeight(), 0.0f);
-
-    assertEquals(250f, root_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
-    assertEquals(250f, root_child0.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child0.getLayoutHeight(), 0.0f);
-
-    assertEquals(0f, root_child1.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child1.getLayoutY(), 0.0f);
-    assertEquals(250f, root_child1.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child1.getLayoutHeight(), 0.0f);
-  }
-
-  @Test
-  public void test_flex_shrink_flex_grow_child_flex_shrink_other_child() {
-    YogaConfig config = new YogaConfig();
-
-    final YogaNode root = createNode(config);
-    root.setFlexDirection(YogaFlexDirection.ROW);
-    root.setWidth(500f);
-    root.setHeight(500f);
-
-    final YogaNode root_child0 = createNode(config);
-    root_child0.setFlexShrink(1f);
-    root_child0.setWidth(500f);
-    root_child0.setHeight(100f);
-    root.addChildAt(root_child0, 0);
-
-    final YogaNode root_child1 = createNode(config);
-    root_child1.setFlexGrow(1f);
-    root_child1.setFlexShrink(1f);
-    root_child1.setWidth(500f);
-    root_child1.setHeight(100f);
-    root.addChildAt(root_child1, 1);
-    root.setDirection(YogaDirection.LTR);
-    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
-
-    assertEquals(0f, root.getLayoutX(), 0.0f);
-    assertEquals(0f, root.getLayoutY(), 0.0f);
-    assertEquals(500f, root.getLayoutWidth(), 0.0f);
-    assertEquals(500f, root.getLayoutHeight(), 0.0f);
-
-    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
-    assertEquals(250f, root_child0.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child0.getLayoutHeight(), 0.0f);
-
-    assertEquals(250f, root_child1.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child1.getLayoutY(), 0.0f);
-    assertEquals(250f, root_child1.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child1.getLayoutHeight(), 0.0f);
-
-    root.setDirection(YogaDirection.RTL);
-    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
-
-    assertEquals(0f, root.getLayoutX(), 0.0f);
-    assertEquals(0f, root.getLayoutY(), 0.0f);
-    assertEquals(500f, root.getLayoutWidth(), 0.0f);
-    assertEquals(500f, root.getLayoutHeight(), 0.0f);
-
-    assertEquals(250f, root_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
-    assertEquals(250f, root_child0.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child0.getLayoutHeight(), 0.0f);
-
-    assertEquals(0f, root_child1.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child1.getLayoutY(), 0.0f);
-    assertEquals(250f, root_child1.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child1.getLayoutHeight(), 0.0f);
-  }
-
   @Test
   public void test_flex_basis_flex_grow_row() {
     YogaConfig config = new YogaConfig();

java/tests/com/facebook/yoga/YGJustifyContentTest.java

@@ -4,6 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGJustifyContentTest.html
 
 package com.facebook.yoga;
@@ -995,158 +996,6 @@ public class YGJustifyContentTest {
     assertEquals(10f, root_child2.getLayoutHeight(), 0.0f);
   }
 
-  @Test
-  public void test_justify_content_min_width_with_padding_child_width_greater_than_parent() {
-    YogaConfig config = new YogaConfig();
-
-    final YogaNode root = createNode(config);
-    root.setAlignContent(YogaAlign.STRETCH);
-    root.setWidth(1000f);
-    root.setHeight(1584f);
-
-    final YogaNode root_child0 = createNode(config);
-    root_child0.setFlexDirection(YogaFlexDirection.ROW);
-    root_child0.setAlignContent(YogaAlign.STRETCH);
-    root.addChildAt(root_child0, 0);
-
-    final YogaNode root_child0_child0 = createNode(config);
-    root_child0_child0.setFlexDirection(YogaFlexDirection.ROW);
-    root_child0_child0.setJustifyContent(YogaJustify.CENTER);
-    root_child0_child0.setAlignContent(YogaAlign.STRETCH);
-    root_child0_child0.setPadding(YogaEdge.LEFT, 100);
-    root_child0_child0.setPadding(YogaEdge.RIGHT, 100);
-    root_child0_child0.setMinWidth(400f);
-    root_child0.addChildAt(root_child0_child0, 0);
-
-    final YogaNode root_child0_child0_child0 = createNode(config);
-    root_child0_child0_child0.setFlexDirection(YogaFlexDirection.ROW);
-    root_child0_child0_child0.setAlignContent(YogaAlign.STRETCH);
-    root_child0_child0_child0.setWidth(300f);
-    root_child0_child0_child0.setHeight(100f);
-    root_child0_child0.addChildAt(root_child0_child0_child0, 0);
-    root.setDirection(YogaDirection.LTR);
-    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
-
-    assertEquals(0f, root.getLayoutX(), 0.0f);
-    assertEquals(0f, root.getLayoutY(), 0.0f);
-    assertEquals(1000f, root.getLayoutWidth(), 0.0f);
-    assertEquals(1584f, root.getLayoutHeight(), 0.0f);
-
-    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
-    assertEquals(1000f, root_child0.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child0.getLayoutHeight(), 0.0f);
-
-    assertEquals(0f, root_child0_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0_child0.getLayoutY(), 0.0f);
-    assertEquals(500f, root_child0_child0.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child0_child0.getLayoutHeight(), 0.0f);
-
-    assertEquals(100f, root_child0_child0_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0_child0_child0.getLayoutY(), 0.0f);
-    assertEquals(300f, root_child0_child0_child0.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child0_child0_child0.getLayoutHeight(), 0.0f);
-
-    root.setDirection(YogaDirection.RTL);
-    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
-
-    assertEquals(0f, root.getLayoutX(), 0.0f);
-    assertEquals(0f, root.getLayoutY(), 0.0f);
-    assertEquals(1000f, root.getLayoutWidth(), 0.0f);
-    assertEquals(1584f, root.getLayoutHeight(), 0.0f);
-
-    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
-    assertEquals(1000f, root_child0.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child0.getLayoutHeight(), 0.0f);
-
-    assertEquals(500f, root_child0_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0_child0.getLayoutY(), 0.0f);
-    assertEquals(500f, root_child0_child0.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child0_child0.getLayoutHeight(), 0.0f);
-
-    assertEquals(100f, root_child0_child0_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0_child0_child0.getLayoutY(), 0.0f);
-    assertEquals(300f, root_child0_child0_child0.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child0_child0_child0.getLayoutHeight(), 0.0f);
-  }
-
-  @Test
-  public void test_justify_content_min_width_with_padding_child_width_lower_than_parent() {
-    YogaConfig config = new YogaConfig();
-
-    final YogaNode root = createNode(config);
-    root.setAlignContent(YogaAlign.STRETCH);
-    root.setWidth(1080f);
-    root.setHeight(1584f);
-
-    final YogaNode root_child0 = createNode(config);
-    root_child0.setFlexDirection(YogaFlexDirection.ROW);
-    root_child0.setAlignContent(YogaAlign.STRETCH);
-    root.addChildAt(root_child0, 0);
-
-    final YogaNode root_child0_child0 = createNode(config);
-    root_child0_child0.setFlexDirection(YogaFlexDirection.ROW);
-    root_child0_child0.setJustifyContent(YogaJustify.CENTER);
-    root_child0_child0.setAlignContent(YogaAlign.STRETCH);
-    root_child0_child0.setPadding(YogaEdge.LEFT, 100);
-    root_child0_child0.setPadding(YogaEdge.RIGHT, 100);
-    root_child0_child0.setMinWidth(400f);
-    root_child0.addChildAt(root_child0_child0, 0);
-
-    final YogaNode root_child0_child0_child0 = createNode(config);
-    root_child0_child0_child0.setFlexDirection(YogaFlexDirection.ROW);
-    root_child0_child0_child0.setAlignContent(YogaAlign.STRETCH);
-    root_child0_child0_child0.setWidth(199f);
-    root_child0_child0_child0.setHeight(100f);
-    root_child0_child0.addChildAt(root_child0_child0_child0, 0);
-    root.setDirection(YogaDirection.LTR);
-    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
-
-    assertEquals(0f, root.getLayoutX(), 0.0f);
-    assertEquals(0f, root.getLayoutY(), 0.0f);
-    assertEquals(1080f, root.getLayoutWidth(), 0.0f);
-    assertEquals(1584f, root.getLayoutHeight(), 0.0f);
-
-    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
-    assertEquals(1080f, root_child0.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child0.getLayoutHeight(), 0.0f);
-
-    assertEquals(0f, root_child0_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0_child0.getLayoutY(), 0.0f);
-    assertEquals(400f, root_child0_child0.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child0_child0.getLayoutHeight(), 0.0f);
-
-    assertEquals(101f, root_child0_child0_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0_child0_child0.getLayoutY(), 0.0f);
-    assertEquals(199f, root_child0_child0_child0.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child0_child0_child0.getLayoutHeight(), 0.0f);
-
-    root.setDirection(YogaDirection.RTL);
-    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
-
-    assertEquals(0f, root.getLayoutX(), 0.0f);
-    assertEquals(0f, root.getLayoutY(), 0.0f);
-    assertEquals(1080f, root.getLayoutWidth(), 0.0f);
-    assertEquals(1584f, root.getLayoutHeight(), 0.0f);
-
-    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
-    assertEquals(1080f, root_child0.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child0.getLayoutHeight(), 0.0f);
-
-    assertEquals(680f, root_child0_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0_child0.getLayoutY(), 0.0f);
-    assertEquals(400f, root_child0_child0.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child0_child0.getLayoutHeight(), 0.0f);
-
-    assertEquals(101f, root_child0_child0_child0.getLayoutX(), 0.0f);
-    assertEquals(0f, root_child0_child0_child0.getLayoutY(), 0.0f);
-    assertEquals(199f, root_child0_child0_child0.getLayoutWidth(), 0.0f);
-    assertEquals(100f, root_child0_child0_child0.getLayoutHeight(), 0.0f);
-  }
-
   private YogaNode createNode(YogaConfig config) {
     return mNodeFactory.create(config);
   }

java/tests/com/facebook/yoga/YogaNodeTest.java

@@ -1,8 +1,9 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ *  Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ *  This source code is licensed under the MIT license found in the LICENSE
+ *  file in the root directory of this source tree.
  *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
  */
 package com.facebook.yoga;
 
@@ -30,9 +31,9 @@ public class YogaNodeTest {
 
   @Test
   public void testInit() {
-    final int refCount = YogaNodeJNI.jni_YGNodeGetInstanceCount();
+    final int refCount = YogaNode.jni_YGNodeGetInstanceCount();
     final YogaNode node = createNode();
-    assertEquals(refCount + 1, YogaNodeJNI.jni_YGNodeGetInstanceCount());
+    assertEquals(refCount + 1, YogaNode.jni_YGNodeGetInstanceCount());
   }
 
   @Test
@@ -233,6 +234,135 @@ public class YogaNodeTest {
     }
   }
 
+  @Test
+  public void testCloneNode() throws Exception {
+    YogaConfig config = new YogaConfig();
+    YogaNode root = createNode(config);
+    YogaNode child = createNode(config);
+    YogaNode grandChild = createNode(config);
+    root.addChildAt(child, 0);
+    child.addChildAt(grandChild, 0);
+    child.setFlexDirection(YogaFlexDirection.ROW);
+
+    YogaNode clonedChild = child.clone();
+
+    assertNotSame(clonedChild, child);
+
+    assertEquals(YogaFlexDirection.ROW, child.getFlexDirection());
+    assertEquals(child.getFlexDirection(), clonedChild.getFlexDirection());
+
+    // Verify the cloning is shallow on the List of children
+    assertEquals(1, child.getChildCount());
+    assertEquals(child.getChildCount(), clonedChild.getChildCount());
+    assertEquals(child.getChildAt(0), clonedChild.getChildAt(0));
+
+    child.removeChildAt(0);
+    assertEquals(0, child.getChildCount());
+    assertEquals(1, clonedChild.getChildCount());
+  }
+
+  @Test
+  public void testCloneWithNewChildren() throws Exception {
+    YogaConfig config = new YogaConfig();
+    YogaNode root = createNode(config);
+    YogaNode child = createNode(config);
+    YogaNode grandChild = createNode(config);
+    root.addChildAt(child, 0);
+    child.addChildAt(grandChild, 0);
+    child.setFlexDirection(YogaFlexDirection.ROW);
+
+    YogaNode clonedChild = child.cloneWithNewChildren();
+
+    assertNotSame(clonedChild, child);
+    assertEquals(YogaFlexDirection.ROW, clonedChild.getFlexDirection());
+    assertEquals(child.getFlexDirection(), clonedChild.getFlexDirection());
+    assertEquals(0, clonedChild.getChildCount());
+    assertEquals(1, child.getChildCount());
+  }
+
+  @Test
+  public void testAddSharedChildCloneWithNewChildren() throws Exception {
+    YogaConfig config = new YogaConfig();
+    YogaNode root = createNode(config);
+    YogaNode child = createNode(config);
+    YogaNode grandChild = createNode(config);
+    root.addChildAt(child, 0);
+    child.addChildAt(grandChild, 0);
+    child.setFlexDirection(YogaFlexDirection.ROW);
+
+    YogaNode clonedChild = child.cloneWithNewChildren();
+
+    assertNotSame(clonedChild, child);
+    assertEquals(YogaFlexDirection.ROW, clonedChild.getFlexDirection());
+    assertEquals(child.getFlexDirection(), clonedChild.getFlexDirection());
+    assertEquals(0, clonedChild.getChildCount());
+    assertEquals(1, child.getChildCount());
+
+    clonedChild.addSharedChildAt(grandChild, 0);
+    assertEquals(1, clonedChild.getChildCount());
+    assertNull(grandChild.getOwner());
+  }
+
+  @Test
+  public void testCloneNodeListener() throws Exception {
+    final AtomicBoolean onNodeClonedExecuted = new AtomicBoolean(false);
+    YogaConfig config = new YogaConfig();
+    config.setOnCloneNode(
+        new YogaNodeCloneFunction() {
+          @Override
+          public YogaNode cloneNode(YogaNode oldNode, YogaNode owner, int childIndex) {
+            onNodeClonedExecuted.set(true);
+            return oldNode.clone();
+          }
+        });
+    YogaNode root = createNode(config);
+    root.setWidth(100f);
+    root.setHeight(100f);
+    YogaNode child0 = createNode(config);
+    root.addChildAt(child0, 0);
+    child0.setWidth(50f);
+    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
+
+    // Force a clone to happen.
+    final YogaNode root2 = root.clone();
+    root2.setWidth(200f);
+    root2.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
+
+    assertTrue(onNodeClonedExecuted.get());
+    assertEquals(1, root2.getChildCount());
+    YogaNode clonedNode = root2.getChildAt(0);
+    assertNotSame(child0, clonedNode);
+    assertEquals(child0.getWidth(), clonedNode.getWidth());
+    assertEquals(50f, clonedNode.getWidth().value, 0.01f);
+  }
+
+  @Test
+  public void testOnNodeClonedLeak() throws Exception {
+    YogaConfig config = new YogaConfig();
+    config.setOnCloneNode(
+        new YogaNodeCloneFunction() {
+          @Override
+          public YogaNode cloneNode(YogaNode oldNode, YogaNode owner, int childIndex) {
+            return oldNode.clone();
+          }
+        });
+    config.setOnCloneNode(null);
+    WeakReference<Object> ref = new WeakReference<Object>(config);
+    // noinspection UnusedAssignment
+    config = null;
+    // try and free for the next 5 seconds, usually it works after the
+    // first GC attempt.
+    for (int i = 0; i < 50; i++) {
+      System.gc();
+      if (ref.get() == null) {
+        // free successfully
+        return;
+      }
+      Thread.sleep(100);
+    }
+    fail("YogaConfig leaked");
+  }
+
   @Test
   public void testFlagShouldDiffLayoutWithoutLegacyStretchBehaviour() throws Exception {
     YogaConfig config = new YogaConfig();
@@ -253,63 +383,7 @@ public class YogaNodeTest {
     root_child0_child0_child0.setFlexShrink(1);
     root_child0_child0.addChildAt(root_child0_child0_child0, 0);
     root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
-    assertFalse(((YogaNodeJNI) root).getDoesLegacyStretchFlagAffectsLayout());
-  }
-
-  @Test
-  public void initiallyHasNewLayout() {
-    YogaNode root = createNode();
-    assertTrue(root.hasNewLayout());
-  }
-
-  @Test
-  public void initialLayoutCanBeMarkedSeen() {
-    YogaNode root = createNode();
-    root.markLayoutSeen();
-    assertFalse(root.hasNewLayout());
-  }
-
-  @Test
-  public void calculatingLayoutMarksLayoutAsUnseen() {
-    YogaNode root = createNode();
-    root.markLayoutSeen();
-    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
-    assertTrue(root.hasNewLayout());
-  }
-
-  @Test
-  public void calculatedLayoutCanBeMarkedSeen() {
-    YogaNode root = createNode();
-    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
-    root.markLayoutSeen();
-    assertFalse(root.hasNewLayout());
-  }
-
-  @Test
-  public void recalculatingLayoutDoesMarkAsUnseen() {
-    YogaNode root = createNode();
-    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
-    root.markLayoutSeen();
-    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
-    assertTrue(root.hasNewLayout());
-  }
-
-  @Test
-  public void resetAlsoResetsLayoutSeen() {
-    YogaNode root = createNode();
-    root.markLayoutSeen();
-    root.reset();
-    assertTrue(root.hasNewLayout());
-  }
-
-  @Test
-  public void directionIsPassedThrough() {
-    YogaNode root = createNode();
-
-    root.setDirection(YogaDirection.RTL);
-    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
-
-    assertEquals(root.getLayoutDirection(), YogaDirection.RTL);
+    assertFalse(root.getDoesLegacyStretchFlagAffectsLayout());
   }
 
   private YogaNode createNode() {

javascript/sources/Config.cc

@@ -1,9 +1,10 @@
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #include <yoga/Yoga.h>
 
 #include "./Config.hh"

javascript/sources/Node.cc

@@ -1,9 +1,10 @@
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #include <algorithm>
 
 #include <yoga/Yoga.h>
@@ -23,13 +24,6 @@ static YGSize globalMeasureFunc(YGNodeRef nodeRef, float width, YGMeasureMode wi
     return ygSize;
 }
 
-static void globalDirtiedFunc(YGNodeRef nodeRef)
-{
-    Node const & node = *reinterpret_cast<Node const *>(YGNodeGetContext(nodeRef));
-
-    node.callDirtiedFunc();
-}
-
 /* static */ Node * Node::createDefault(void)
 {
     return new Node(nullptr);
@@ -53,7 +47,6 @@ static void globalDirtiedFunc(YGNodeRef nodeRef)
 Node::Node(Config * config)
 : m_node(config != nullptr ? YGNodeNewWithConfig(config->m_config) : YGNodeNew())
 , m_measureFunc(nullptr)
-, m_dirtiedFunc(nullptr)
 {
     YGNodeSetContext(m_node, reinterpret_cast<void *>(this));
 }
@@ -66,7 +59,6 @@ Node::~Node(void)
 void Node::reset(void)
 {
     m_measureFunc.reset(nullptr);
-    m_dirtiedFunc.reset(nullptr);
 
     YGNodeReset(m_node);
 }
@@ -261,10 +253,6 @@ void Node::setPaddingPercent(int edge, double padding)
     YGNodeStyleSetPaddingPercent(m_node, static_cast<YGEdge>(edge), padding);
 }
 
-void Node::setIsReferenceBaseline(bool isReferenceBaseline) {
-  YGNodeSetIsReferenceBaseline(m_node, isReferenceBaseline);
-}
-
 int Node::getPositionType(void) const
 {
     return YGNodeStyleGetPositionType(m_node);
@@ -380,10 +368,6 @@ Value Node::getPadding(int edge) const
     return Value::fromYGValue(YGNodeStyleGetPadding(m_node, static_cast<YGEdge>(edge)));
 }
 
-bool Node::isReferenceBaseline() {
-  return YGNodeIsReferenceBaseline(m_node);
-}
-
 void Node::insertChild(Node * child, unsigned index)
 {
     YGNodeInsertChild(m_node, child->m_node, index);
@@ -438,24 +422,6 @@ Size Node::callMeasureFunc(double width, int widthMode, double height, int heigh
     return m_measureFunc->call<Size>(width, widthMode, height, heightMode);
 }
 
-void Node::setDirtiedFunc(nbind::cbFunction & dirtiedFunc)
-{
-    m_dirtiedFunc.reset(new nbind::cbFunction(dirtiedFunc));
-
-    YGNodeSetDirtiedFunc(m_node, &globalDirtiedFunc);
-}
-
-void Node::unsetDirtiedFunc(void) {
-    m_dirtiedFunc.reset(nullptr);
-
-    YGNodeSetDirtiedFunc(m_node, nullptr);
-}
-
-void Node::callDirtiedFunc(void) const
-{
-    m_dirtiedFunc->call<void>();
-}
-
 void Node::markDirty(void)
 {
     YGNodeMarkDirty(m_node);

javascript/sources/Node.hh

@@ -161,15 +161,6 @@ class Node {
 
     Size callMeasureFunc(double width, int widthMode, double height, int heightMode) const;
 
- public: // Dirtied func mutators
-
-   void setDirtiedFunc(nbind::cbFunction & dirtiedFunc);
-   void unsetDirtiedFunc(void);
-
- public: // Dirtied func inspectors
-
-    void callDirtiedFunc(void) const;
-
  public: // Dirtiness accessors
 
     void markDirty(void);
@@ -196,12 +187,10 @@ class Node {
     double getComputedBorder(int edge) const;
     double getComputedPadding(int edge) const;
 
-   public:
-    void setIsReferenceBaseline(bool isReferenceBaseline);
-    bool isReferenceBaseline();
+ private:
 
     YGNodeRef m_node;
 
     std::unique_ptr<nbind::cbFunction> m_measureFunc;
-    std::unique_ptr<nbind::cbFunction> m_dirtiedFunc;
+
 };

javascript/sources/Value.hh

@@ -1,10 +1,3 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 #pragma once
 
 #include <yoga/Yoga.h>

javascript/sources/global.cc

@@ -1,9 +1,10 @@
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #include <yoga/Yoga.h>
 
 #include "./global.hh"

javascript/sources/nbind.cc

@@ -1,9 +1,10 @@
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
- * file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #include <yoga/Yoga.h>
 
 #include "./Node.hh"
@@ -149,15 +150,9 @@ NBIND_CLASS(Node)
     method(getParent);
     method(getChild);
 
-    method(isReferenceBaseline);
-    method(setIsReferenceBaseline);
-
     method(setMeasureFunc);
     method(unsetMeasureFunc);
 
-    method(setDirtiedFunc);
-    method(unsetDirtiedFunc);
-
     method(markDirty);
     method(isDirty);
 

javascript/tests/Facebook.Yoga/YGAlignBaselineTest.js

@@ -1,156 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
-
-it("align_baseline_parent_using_child_in_column_as_reference", function () {
-  var config = Yoga.Config.create();
-
-  try {
-    var root = Yoga.Node.create(config);
-    root.setFlexDirection(Yoga.FLEX_DIRECTION_ROW);
-    root.setWidth(1000);
-    root.setHeight(1000);
-    root.setAlignItems(Yoga.ALIGN_BASELINE);
-
-    var root_child0 = Yoga.Node.create(config);
-    root_child0.setFlexDirection(Yoga.FLEX_DIRECTION_COLUMN);
-    root_child0.setWidth(500);
-    root_child0.setHeight(600);
-    root.insertChild(root_child0, 0);
-
-    var root_child1 = Yoga.Node.create(config);
-    root_child1.setFlexDirection(Yoga.FLEX_DIRECTION_COLUMN);
-    root_child1.setWidth(500);
-    root_child1.setHeight(800);
-    root.insertChild(root_child1, 1);
-
-    var root_child1_child0 = Yoga.Node.create(config);
-    root_child1_child0.setFlexDirection(Yoga.FLEX_DIRECTION_COLUMN);
-    root_child1_child0.setWidth(500);
-    root_child1_child0.setHeight(300);
-    root_child1.insertChild(root_child1_child0, 0);
-
-    var root_child1_child1 = Yoga.Node.create(config);
-    root_child1_child1.setFlexDirection(Yoga.FLEX_DIRECTION_COLUMN);
-    root_child1_child1.setWidth(500);
-    root_child1_child1.setHeight(400);
-    root_child1_child1.setIsReferenceBaseline(true);
-    root_child1.insertChild(root_child1_child1, 1);
-
-    root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_LTR);
-
-    console.assert(0 === root_child0.getComputedLeft(),
-        "0 === root_child0.getComputedLeft() (" +
-        root_child0.getComputedLeft() + ")");
-    console.assert(100 === root_child0.getComputedTop(),
-        "100 === root_child0.getComputedTop() (" +
-        root_child0.getComputedTop() + ")");
-
-    console.assert(500 === root_child1.getComputedLeft(),
-        "500 === root_child1.getComputedLeft() (" +
-        root_child1.getComputedLeft() + ")");
-    console.assert(0 === root_child1.getComputedTop(),
-        "0 === root_child1.getComputedTop() (" +
-        root_child1.getComputedTop() + ")");
-
-    console.assert(0 === root_child1_child0.getComputedLeft(),
-        "0 === root_child1_child0.getComputedLeft() (" +
-        root_child1_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child1_child0.getComputedTop(),
-        "0 === root_child1_child0.getComputedTop() (" +
-        root_child1_child0.getComputedTop() + ")");
-
-    console.assert(0 === root_child1_child1.getComputedLeft(),
-        "0 === root_child1_child1.getComputedLeft() (" +
-        root_child1_child1.getComputedLeft() + ")");
-    console.assert(300 === root_child1_child1.getComputedTop(),
-        "300 === root_child1_child1.getComputedTop() (" +
-        root_child1_child1.getComputedTop() + ")");
-
-  } finally {
-    if (typeof root !== "undefined") {
-      root.freeRecursive();
-    }
-
-    config.free();
-  }
-});
-
-it("align_baseline_parent_using_child_in_row_as_reference", function () {
-  var config = Yoga.Config.create();
-
-  try {
-    var root = Yoga.Node.create(config);
-    root.setFlexDirection(Yoga.FLEX_DIRECTION_ROW);
-    root.setWidth(1000);
-    root.setHeight(1000);
-    root.setAlignItems(Yoga.ALIGN_BASELINE);
-
-    var root_child0 = Yoga.Node.create(config);
-    root_child0.setFlexDirection(Yoga.FLEX_DIRECTION_COLUMN);
-    root_child0.setWidth(500);
-    root_child0.setHeight(600);
-    root.insertChild(root_child0, 0);
-
-    var root_child1 = Yoga.Node.create(config);
-    root_child1.setFlexDirection(Yoga.FLEX_DIRECTION_ROW);
-    root_child1.setWidth(500);
-    root_child1.setHeight(800);
-    root.insertChild(root_child1, 1);
-
-    var root_child1_child0 = Yoga.Node.create(config);
-    root_child1_child0.setFlexDirection(Yoga.FLEX_DIRECTION_COLUMN);
-    root_child1_child0.setWidth(500);
-    root_child1_child0.setHeight(500);
-    root_child1.insertChild(root_child1_child0, 0);
-
-    var root_child1_child1 = Yoga.Node.create(config);
-    root_child1_child1.setFlexDirection(Yoga.FLEX_DIRECTION_COLUMN);
-    root_child1_child1.setWidth(500);
-    root_child1_child1.setHeight(400);
-    root_child1_child1.setIsReferenceBaseline(true);
-    root_child1.insertChild(root_child1_child1, 1);
-
-    root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_LTR);
-
-    console.assert(0 === root_child0.getComputedLeft(),
-        "0 === root_child0.getComputedLeft() (" +
-        root_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child0.getComputedTop(),
-        "0 === root_child0.getComputedTop() (" +
-        root_child0.getComputedTop() + ")");
-
-    console.assert(500 === root_child1.getComputedLeft(),
-        "500 === root_child1.getComputedLeft() (" +
-        root_child1.getComputedLeft() + ")");
-    console.assert(200 === root_child1.getComputedTop(),
-        "200 === root_child1.getComputedTop() (" +
-        root_child1.getComputedTop() + ")");
-
-    console.assert(0 === root_child1_child0.getComputedLeft(),
-        "0 === root_child1_child0.getComputedLeft() (" +
-        root_child1_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child1_child0.getComputedTop(),
-        "0 === root_child1_child0.getComputedTop() (" +
-        root_child1_child0.getComputedTop() + ")");
-
-    console.assert(500 === root_child1_child1.getComputedLeft(),
-        "500 === root_child1_child1.getComputedLeft() (" +
-        root_child1_child1.getComputedLeft() + ")");
-    console.assert(0 === root_child1_child1.getComputedTop(),
-        "0 === root_child1_child1.getComputedTop() (" +
-        root_child1_child1.getComputedTop() + ")");
-
-  } finally {
-    if (typeof root !== "undefined") {
-      root.freeRecursive();
-    }
-
-    config.free();
-  }
-});

javascript/tests/Facebook.Yoga/YGDirtiedTest.js

@@ -1,168 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
-
-it("dirtied", function() {
-  var root = Yoga.Node.create();
-  root.setAlignItems(Yoga.ALIGN_FLEX_START);
-  root.setWidth(100);
-  root.setHeight(100);
-
-  root.calculateLayout(undefined, undefined, Yoga.DIRECTION_LTR);
-
-  let dirtied = 0;
-  root.setDirtiedFunc(function() { dirtied++; });
-  // only nodes with a measure function can be marked dirty
-  root.setMeasureFunc(function() {});
-
-  console.assert(0 === dirtied, "0 === dirtied");
-
-  // dirtied func MUST be called in case of explicit dirtying.
-  root.markDirty();
-  console.assert(1 === dirtied, "1 === dirtied");
-
-  // dirtied func MUST be called ONCE.
-  root.markDirty();
-  console.assert(1 === dirtied, "1 === dirtied");
-
-  if (typeof root !== "undefined")
-    root.freeRecursive();
-
-  typeof gc !== "undefined" && gc();
-  console.assert(0 === Yoga.getInstanceCount(), "0 === Yoga.getInstanceCount() (" + Yoga.getInstanceCount() + ")");
-});
-
-it("dirtied_propagation", function() {
-  var root = Yoga.Node.create();
-  root.setAlignItems(Yoga.ALIGN_FLEX_START);
-  root.setWidth(100);
-  root.setHeight(100);
-
-  var root_child0 = Yoga.Node.create();
-  root_child0.setAlignItems(Yoga.ALIGN_FLEX_START);
-  root_child0.setWidth(50);
-  root_child0.setHeight(20);
-  root_child0.setMeasureFunc(function() {});
-  root.insertChild(root_child0, 0);
-
-  var root_child1 = Yoga.Node.create();
-  root_child1.setAlignItems(Yoga.ALIGN_FLEX_START);
-  root_child1.setWidth(50);
-  root_child1.setHeight(20);
-  root.insertChild(root_child1, 0);
-
-  root.calculateLayout(undefined, undefined, Yoga.DIRECTION_LTR);
-
-  let dirtied = 0;
-  root.setDirtiedFunc(function() { dirtied++; });
-
-  console.assert(0 === dirtied, "0 === dirtied");
-
-  // dirtied func MUST be called for the first time.
-  root_child0.markDirty();
-  console.assert(1 === dirtied, "1 === dirtied");
-
-  // dirtied func must NOT be called for the second time.
-  root_child0.markDirty();
-  console.assert(1 === dirtied, "1 === dirtied");
-
-  if (typeof root !== "undefined")
-    root.freeRecursive();
-
-  typeof gc !== "undefined" && gc();
-  console.assert(0 === Yoga.getInstanceCount(), "0 === Yoga.getInstanceCount() (" + Yoga.getInstanceCount() + ")");
-});
-
-it("dirtied_hierarchy", function() {
-  var root = Yoga.Node.create();
-  root.setAlignItems(Yoga.ALIGN_FLEX_START);
-  root.setWidth(100);
-  root.setHeight(100);
-
-  var root_child0 = Yoga.Node.create();
-  root_child0.setAlignItems(Yoga.ALIGN_FLEX_START);
-  root_child0.setWidth(50);
-  root_child0.setHeight(20);
-  root_child0.setMeasureFunc(function() {});
-  root.insertChild(root_child0, 0);
-
-  var root_child1 = Yoga.Node.create();
-  root_child1.setAlignItems(Yoga.ALIGN_FLEX_START);
-  root_child1.setWidth(50);
-  root_child1.setHeight(20);
-  root_child1.setMeasureFunc(function() {});
-  root.insertChild(root_child1, 0);
-
-  root.calculateLayout(undefined, undefined, Yoga.DIRECTION_LTR);
-
-  let dirtied = 0;
-  root_child0.setDirtiedFunc(function() {
-    dirtied++;
-  });
-
-  console.assert(0 === dirtied, "0 === dirtied");
-
-  // dirtied func must NOT be called for descendants.
-  // NOTE: nodes without a measure function cannot be marked dirty manually,
-  // but nodes with a measure function can not have children.
-  // Update the width to dirty the node instead.
-  root.setWidth(110);
-  console.assert(0 === dirtied, "0 === dirtied");
-
-  // dirtied func MUST be called in case of explicit dirtying.
-  root_child0.markDirty();
-  console.assert(1 === dirtied, "1 === dirtied");
-
-  if (typeof root !== "undefined")
-    root.freeRecursive();
-
-  typeof gc !== "undefined" && gc();
-  console.assert(0 === Yoga.getInstanceCount(), "0 === Yoga.getInstanceCount() (" + Yoga.getInstanceCount() + ")");
-});
-
-it("dirtied_reset", function() {
-  var root = Yoga.Node.create();
-  root.setAlignItems(Yoga.ALIGN_FLEX_START);
-  root.setWidth(100);
-  root.setHeight(100);
-  root.setMeasureFunc(function() {});
-
-  root.calculateLayout(undefined, undefined, Yoga.DIRECTION_LTR);
-
-  let dirtied = 0;
-  root.setDirtiedFunc(function() {
-    dirtied++;
-  });
-
-  console.assert(0 === dirtied, "0 === dirtied");
-
-  // dirtied func MUST be called in case of explicit dirtying.
-  root.markDirty();
-  console.assert(1 === dirtied, "1 === dirtied");
-
-  // recalculate so the root is no longer dirty
-  root.calculateLayout(undefined, undefined, Yoga.DIRECTION_LTR);
-
-  root.reset();
-  root.setAlignItems(Yoga.ALIGN_FLEX_START);
-  root.setWidth(100);
-  root.setHeight(100);
-  root.setMeasureFunc(function() {});
-
-  root.markDirty();
-
-  // dirtied func must NOT be called after reset.
-  root.markDirty();
-  console.assert(1 === dirtied, "1 === dirtied");
-
-  if (typeof root !== "undefined")
-    root.freeRecursive();
-
-  typeof gc !== "undefined" && gc();
-  console.assert(0 === Yoga.getInstanceCount(), "0 === Yoga.getInstanceCount() (" + Yoga.getInstanceCount() + ")");
-});

javascript/tests/Facebook.Yoga/YGFlexTest.js

@@ -66,129 +66,6 @@ it("flex_basis_flex_grow_column", function () {
     config.free();
   }
 });
-it("flex_shrink_flex_grow_row", function () {
-  var config = Yoga.Config.create();
-
-  try {
-    var root = Yoga.Node.create(config);
-    root.setFlexDirection(Yoga.FLEX_DIRECTION_ROW);
-    root.setWidth(500);
-    root.setHeight(500);
-
-    var root_child0 = Yoga.Node.create(config);
-    root_child0.setFlexShrink(1);
-    root_child0.setWidth(500);
-    root_child0.setHeight(100);
-    root.insertChild(root_child0, 0);
-
-    var root_child1 = Yoga.Node.create(config);
-    root_child1.setFlexShrink(1);
-    root_child1.setWidth(500);
-    root_child1.setHeight(100);
-    root.insertChild(root_child1, 1);
-    root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_LTR);
-
-    console.assert(0 === root.getComputedLeft(), "0 === root.getComputedLeft() (" + root.getComputedLeft() + ")");
-    console.assert(0 === root.getComputedTop(), "0 === root.getComputedTop() (" + root.getComputedTop() + ")");
-    console.assert(500 === root.getComputedWidth(), "500 === root.getComputedWidth() (" + root.getComputedWidth() + ")");
-    console.assert(500 === root.getComputedHeight(), "500 === root.getComputedHeight() (" + root.getComputedHeight() + ")");
-
-    console.assert(0 === root_child0.getComputedLeft(), "0 === root_child0.getComputedLeft() (" + root_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child0.getComputedTop(), "0 === root_child0.getComputedTop() (" + root_child0.getComputedTop() + ")");
-    console.assert(250 === root_child0.getComputedWidth(), "250 === root_child0.getComputedWidth() (" + root_child0.getComputedWidth() + ")");
-    console.assert(100 === root_child0.getComputedHeight(), "100 === root_child0.getComputedHeight() (" + root_child0.getComputedHeight() + ")");
-
-    console.assert(250 === root_child1.getComputedLeft(), "250 === root_child1.getComputedLeft() (" + root_child1.getComputedLeft() + ")");
-    console.assert(0 === root_child1.getComputedTop(), "0 === root_child1.getComputedTop() (" + root_child1.getComputedTop() + ")");
-    console.assert(250 === root_child1.getComputedWidth(), "250 === root_child1.getComputedWidth() (" + root_child1.getComputedWidth() + ")");
-    console.assert(100 === root_child1.getComputedHeight(), "100 === root_child1.getComputedHeight() (" + root_child1.getComputedHeight() + ")");
-
-    root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_RTL);
-
-    console.assert(0 === root.getComputedLeft(), "0 === root.getComputedLeft() (" + root.getComputedLeft() + ")");
-    console.assert(0 === root.getComputedTop(), "0 === root.getComputedTop() (" + root.getComputedTop() + ")");
-    console.assert(500 === root.getComputedWidth(), "500 === root.getComputedWidth() (" + root.getComputedWidth() + ")");
-    console.assert(500 === root.getComputedHeight(), "500 === root.getComputedHeight() (" + root.getComputedHeight() + ")");
-
-    console.assert(250 === root_child0.getComputedLeft(), "250 === root_child0.getComputedLeft() (" + root_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child0.getComputedTop(), "0 === root_child0.getComputedTop() (" + root_child0.getComputedTop() + ")");
-    console.assert(250 === root_child0.getComputedWidth(), "250 === root_child0.getComputedWidth() (" + root_child0.getComputedWidth() + ")");
-    console.assert(100 === root_child0.getComputedHeight(), "100 === root_child0.getComputedHeight() (" + root_child0.getComputedHeight() + ")");
-
-    console.assert(0 === root_child1.getComputedLeft(), "0 === root_child1.getComputedLeft() (" + root_child1.getComputedLeft() + ")");
-    console.assert(0 === root_child1.getComputedTop(), "0 === root_child1.getComputedTop() (" + root_child1.getComputedTop() + ")");
-    console.assert(250 === root_child1.getComputedWidth(), "250 === root_child1.getComputedWidth() (" + root_child1.getComputedWidth() + ")");
-    console.assert(100 === root_child1.getComputedHeight(), "100 === root_child1.getComputedHeight() (" + root_child1.getComputedHeight() + ")");
-  } finally {
-    if (typeof root !== "undefined") {
-      root.freeRecursive();
-    }
-
-    config.free();
-  }
-});
-it("flex_shrink_flex_grow_child_flex_shrink_other_child", function () {
-  var config = Yoga.Config.create();
-
-  try {
-    var root = Yoga.Node.create(config);
-    root.setFlexDirection(Yoga.FLEX_DIRECTION_ROW);
-    root.setWidth(500);
-    root.setHeight(500);
-
-    var root_child0 = Yoga.Node.create(config);
-    root_child0.setFlexShrink(1);
-    root_child0.setWidth(500);
-    root_child0.setHeight(100);
-    root.insertChild(root_child0, 0);
-
-    var root_child1 = Yoga.Node.create(config);
-    root_child1.setFlexGrow(1);
-    root_child1.setFlexShrink(1);
-    root_child1.setWidth(500);
-    root_child1.setHeight(100);
-    root.insertChild(root_child1, 1);
-    root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_LTR);
-
-    console.assert(0 === root.getComputedLeft(), "0 === root.getComputedLeft() (" + root.getComputedLeft() + ")");
-    console.assert(0 === root.getComputedTop(), "0 === root.getComputedTop() (" + root.getComputedTop() + ")");
-    console.assert(500 === root.getComputedWidth(), "500 === root.getComputedWidth() (" + root.getComputedWidth() + ")");
-    console.assert(500 === root.getComputedHeight(), "500 === root.getComputedHeight() (" + root.getComputedHeight() + ")");
-
-    console.assert(0 === root_child0.getComputedLeft(), "0 === root_child0.getComputedLeft() (" + root_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child0.getComputedTop(), "0 === root_child0.getComputedTop() (" + root_child0.getComputedTop() + ")");
-    console.assert(250 === root_child0.getComputedWidth(), "250 === root_child0.getComputedWidth() (" + root_child0.getComputedWidth() + ")");
-    console.assert(100 === root_child0.getComputedHeight(), "100 === root_child0.getComputedHeight() (" + root_child0.getComputedHeight() + ")");
-
-    console.assert(250 === root_child1.getComputedLeft(), "250 === root_child1.getComputedLeft() (" + root_child1.getComputedLeft() + ")");
-    console.assert(0 === root_child1.getComputedTop(), "0 === root_child1.getComputedTop() (" + root_child1.getComputedTop() + ")");
-    console.assert(250 === root_child1.getComputedWidth(), "250 === root_child1.getComputedWidth() (" + root_child1.getComputedWidth() + ")");
-    console.assert(100 === root_child1.getComputedHeight(), "100 === root_child1.getComputedHeight() (" + root_child1.getComputedHeight() + ")");
-
-    root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_RTL);
-
-    console.assert(0 === root.getComputedLeft(), "0 === root.getComputedLeft() (" + root.getComputedLeft() + ")");
-    console.assert(0 === root.getComputedTop(), "0 === root.getComputedTop() (" + root.getComputedTop() + ")");
-    console.assert(500 === root.getComputedWidth(), "500 === root.getComputedWidth() (" + root.getComputedWidth() + ")");
-    console.assert(500 === root.getComputedHeight(), "500 === root.getComputedHeight() (" + root.getComputedHeight() + ")");
-
-    console.assert(250 === root_child0.getComputedLeft(), "250 === root_child0.getComputedLeft() (" + root_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child0.getComputedTop(), "0 === root_child0.getComputedTop() (" + root_child0.getComputedTop() + ")");
-    console.assert(250 === root_child0.getComputedWidth(), "250 === root_child0.getComputedWidth() (" + root_child0.getComputedWidth() + ")");
-    console.assert(100 === root_child0.getComputedHeight(), "100 === root_child0.getComputedHeight() (" + root_child0.getComputedHeight() + ")");
-
-    console.assert(0 === root_child1.getComputedLeft(), "0 === root_child1.getComputedLeft() (" + root_child1.getComputedLeft() + ")");
-    console.assert(0 === root_child1.getComputedTop(), "0 === root_child1.getComputedTop() (" + root_child1.getComputedTop() + ")");
-    console.assert(250 === root_child1.getComputedWidth(), "250 === root_child1.getComputedWidth() (" + root_child1.getComputedWidth() + ")");
-    console.assert(100 === root_child1.getComputedHeight(), "100 === root_child1.getComputedHeight() (" + root_child1.getComputedHeight() + ")");
-  } finally {
-    if (typeof root !== "undefined") {
-      root.freeRecursive();
-    }
-
-    config.free();
-  }
-});
 it("flex_basis_flex_grow_row", function () {
   var config = Yoga.Config.create();
 

javascript/tests/Facebook.Yoga/YGJustifyContentTest.js

@@ -1045,163 +1045,3 @@ it("justify_content_row_space_evenly", function () {
     config.free();
   }
 });
-it("justify_content_min_width_with_padding_child_width_greater_than_parent", function () {
-  var config = Yoga.Config.create();
-
-  try {
-    var root = Yoga.Node.create(config);
-    root.setAlignContent(Yoga.ALIGN_STRETCH);
-    root.setWidth(1000);
-    root.setHeight(1584);
-
-    var root_child0 = Yoga.Node.create(config);
-    root_child0.setFlexDirection(Yoga.FLEX_DIRECTION_ROW);
-    root_child0.setAlignContent(Yoga.ALIGN_STRETCH);
-    root.insertChild(root_child0, 0);
-
-    var root_child0_child0 = Yoga.Node.create(config);
-    root_child0_child0.setFlexDirection(Yoga.FLEX_DIRECTION_ROW);
-    root_child0_child0.setJustifyContent(Yoga.JUSTIFY_CENTER);
-    root_child0_child0.setAlignContent(Yoga.ALIGN_STRETCH);
-    root_child0_child0.setPadding(Yoga.EDGE_LEFT, 100);
-    root_child0_child0.setPadding(Yoga.EDGE_RIGHT, 100);
-    root_child0_child0.setMinWidth(400);
-    root_child0.insertChild(root_child0_child0, 0);
-
-    var root_child0_child0_child0 = Yoga.Node.create(config);
-    root_child0_child0_child0.setFlexDirection(Yoga.FLEX_DIRECTION_ROW);
-    root_child0_child0_child0.setAlignContent(Yoga.ALIGN_STRETCH);
-    root_child0_child0_child0.setWidth(300);
-    root_child0_child0_child0.setHeight(100);
-    root_child0_child0.insertChild(root_child0_child0_child0, 0);
-    root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_LTR);
-
-    console.assert(0 === root.getComputedLeft(), "0 === root.getComputedLeft() (" + root.getComputedLeft() + ")");
-    console.assert(0 === root.getComputedTop(), "0 === root.getComputedTop() (" + root.getComputedTop() + ")");
-    console.assert(1000 === root.getComputedWidth(), "1000 === root.getComputedWidth() (" + root.getComputedWidth() + ")");
-    console.assert(1584 === root.getComputedHeight(), "1584 === root.getComputedHeight() (" + root.getComputedHeight() + ")");
-
-    console.assert(0 === root_child0.getComputedLeft(), "0 === root_child0.getComputedLeft() (" + root_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child0.getComputedTop(), "0 === root_child0.getComputedTop() (" + root_child0.getComputedTop() + ")");
-    console.assert(1000 === root_child0.getComputedWidth(), "1000 === root_child0.getComputedWidth() (" + root_child0.getComputedWidth() + ")");
-    console.assert(100 === root_child0.getComputedHeight(), "100 === root_child0.getComputedHeight() (" + root_child0.getComputedHeight() + ")");
-
-    console.assert(0 === root_child0_child0.getComputedLeft(), "0 === root_child0_child0.getComputedLeft() (" + root_child0_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child0_child0.getComputedTop(), "0 === root_child0_child0.getComputedTop() (" + root_child0_child0.getComputedTop() + ")");
-    console.assert(500 === root_child0_child0.getComputedWidth(), "500 === root_child0_child0.getComputedWidth() (" + root_child0_child0.getComputedWidth() + ")");
-    console.assert(100 === root_child0_child0.getComputedHeight(), "100 === root_child0_child0.getComputedHeight() (" + root_child0_child0.getComputedHeight() + ")");
-
-    console.assert(100 === root_child0_child0_child0.getComputedLeft(), "100 === root_child0_child0_child0.getComputedLeft() (" + root_child0_child0_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child0_child0_child0.getComputedTop(), "0 === root_child0_child0_child0.getComputedTop() (" + root_child0_child0_child0.getComputedTop() + ")");
-    console.assert(300 === root_child0_child0_child0.getComputedWidth(), "300 === root_child0_child0_child0.getComputedWidth() (" + root_child0_child0_child0.getComputedWidth() + ")");
-    console.assert(100 === root_child0_child0_child0.getComputedHeight(), "100 === root_child0_child0_child0.getComputedHeight() (" + root_child0_child0_child0.getComputedHeight() + ")");
-
-    root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_RTL);
-
-    console.assert(0 === root.getComputedLeft(), "0 === root.getComputedLeft() (" + root.getComputedLeft() + ")");
-    console.assert(0 === root.getComputedTop(), "0 === root.getComputedTop() (" + root.getComputedTop() + ")");
-    console.assert(1000 === root.getComputedWidth(), "1000 === root.getComputedWidth() (" + root.getComputedWidth() + ")");
-    console.assert(1584 === root.getComputedHeight(), "1584 === root.getComputedHeight() (" + root.getComputedHeight() + ")");
-
-    console.assert(0 === root_child0.getComputedLeft(), "0 === root_child0.getComputedLeft() (" + root_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child0.getComputedTop(), "0 === root_child0.getComputedTop() (" + root_child0.getComputedTop() + ")");
-    console.assert(1000 === root_child0.getComputedWidth(), "1000 === root_child0.getComputedWidth() (" + root_child0.getComputedWidth() + ")");
-    console.assert(100 === root_child0.getComputedHeight(), "100 === root_child0.getComputedHeight() (" + root_child0.getComputedHeight() + ")");
-
-    console.assert(500 === root_child0_child0.getComputedLeft(), "500 === root_child0_child0.getComputedLeft() (" + root_child0_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child0_child0.getComputedTop(), "0 === root_child0_child0.getComputedTop() (" + root_child0_child0.getComputedTop() + ")");
-    console.assert(500 === root_child0_child0.getComputedWidth(), "500 === root_child0_child0.getComputedWidth() (" + root_child0_child0.getComputedWidth() + ")");
-    console.assert(100 === root_child0_child0.getComputedHeight(), "100 === root_child0_child0.getComputedHeight() (" + root_child0_child0.getComputedHeight() + ")");
-
-    console.assert(100 === root_child0_child0_child0.getComputedLeft(), "100 === root_child0_child0_child0.getComputedLeft() (" + root_child0_child0_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child0_child0_child0.getComputedTop(), "0 === root_child0_child0_child0.getComputedTop() (" + root_child0_child0_child0.getComputedTop() + ")");
-    console.assert(300 === root_child0_child0_child0.getComputedWidth(), "300 === root_child0_child0_child0.getComputedWidth() (" + root_child0_child0_child0.getComputedWidth() + ")");
-    console.assert(100 === root_child0_child0_child0.getComputedHeight(), "100 === root_child0_child0_child0.getComputedHeight() (" + root_child0_child0_child0.getComputedHeight() + ")");
-  } finally {
-    if (typeof root !== "undefined") {
-      root.freeRecursive();
-    }
-
-    config.free();
-  }
-});
-it("justify_content_min_width_with_padding_child_width_lower_than_parent", function () {
-  var config = Yoga.Config.create();
-
-  try {
-    var root = Yoga.Node.create(config);
-    root.setAlignContent(Yoga.ALIGN_STRETCH);
-    root.setWidth(1080);
-    root.setHeight(1584);
-
-    var root_child0 = Yoga.Node.create(config);
-    root_child0.setFlexDirection(Yoga.FLEX_DIRECTION_ROW);
-    root_child0.setAlignContent(Yoga.ALIGN_STRETCH);
-    root.insertChild(root_child0, 0);
-
-    var root_child0_child0 = Yoga.Node.create(config);
-    root_child0_child0.setFlexDirection(Yoga.FLEX_DIRECTION_ROW);
-    root_child0_child0.setJustifyContent(Yoga.JUSTIFY_CENTER);
-    root_child0_child0.setAlignContent(Yoga.ALIGN_STRETCH);
-    root_child0_child0.setPadding(Yoga.EDGE_LEFT, 100);
-    root_child0_child0.setPadding(Yoga.EDGE_RIGHT, 100);
-    root_child0_child0.setMinWidth(400);
-    root_child0.insertChild(root_child0_child0, 0);
-
-    var root_child0_child0_child0 = Yoga.Node.create(config);
-    root_child0_child0_child0.setFlexDirection(Yoga.FLEX_DIRECTION_ROW);
-    root_child0_child0_child0.setAlignContent(Yoga.ALIGN_STRETCH);
-    root_child0_child0_child0.setWidth(199);
-    root_child0_child0_child0.setHeight(100);
-    root_child0_child0.insertChild(root_child0_child0_child0, 0);
-    root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_LTR);
-
-    console.assert(0 === root.getComputedLeft(), "0 === root.getComputedLeft() (" + root.getComputedLeft() + ")");
-    console.assert(0 === root.getComputedTop(), "0 === root.getComputedTop() (" + root.getComputedTop() + ")");
-    console.assert(1080 === root.getComputedWidth(), "1080 === root.getComputedWidth() (" + root.getComputedWidth() + ")");
-    console.assert(1584 === root.getComputedHeight(), "1584 === root.getComputedHeight() (" + root.getComputedHeight() + ")");
-
-    console.assert(0 === root_child0.getComputedLeft(), "0 === root_child0.getComputedLeft() (" + root_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child0.getComputedTop(), "0 === root_child0.getComputedTop() (" + root_child0.getComputedTop() + ")");
-    console.assert(1080 === root_child0.getComputedWidth(), "1080 === root_child0.getComputedWidth() (" + root_child0.getComputedWidth() + ")");
-    console.assert(100 === root_child0.getComputedHeight(), "100 === root_child0.getComputedHeight() (" + root_child0.getComputedHeight() + ")");
-
-    console.assert(0 === root_child0_child0.getComputedLeft(), "0 === root_child0_child0.getComputedLeft() (" + root_child0_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child0_child0.getComputedTop(), "0 === root_child0_child0.getComputedTop() (" + root_child0_child0.getComputedTop() + ")");
-    console.assert(400 === root_child0_child0.getComputedWidth(), "400 === root_child0_child0.getComputedWidth() (" + root_child0_child0.getComputedWidth() + ")");
-    console.assert(100 === root_child0_child0.getComputedHeight(), "100 === root_child0_child0.getComputedHeight() (" + root_child0_child0.getComputedHeight() + ")");
-
-    console.assert(101 === root_child0_child0_child0.getComputedLeft(), "101 === root_child0_child0_child0.getComputedLeft() (" + root_child0_child0_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child0_child0_child0.getComputedTop(), "0 === root_child0_child0_child0.getComputedTop() (" + root_child0_child0_child0.getComputedTop() + ")");
-    console.assert(199 === root_child0_child0_child0.getComputedWidth(), "199 === root_child0_child0_child0.getComputedWidth() (" + root_child0_child0_child0.getComputedWidth() + ")");
-    console.assert(100 === root_child0_child0_child0.getComputedHeight(), "100 === root_child0_child0_child0.getComputedHeight() (" + root_child0_child0_child0.getComputedHeight() + ")");
-
-    root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_RTL);
-
-    console.assert(0 === root.getComputedLeft(), "0 === root.getComputedLeft() (" + root.getComputedLeft() + ")");
-    console.assert(0 === root.getComputedTop(), "0 === root.getComputedTop() (" + root.getComputedTop() + ")");
-    console.assert(1080 === root.getComputedWidth(), "1080 === root.getComputedWidth() (" + root.getComputedWidth() + ")");
-    console.assert(1584 === root.getComputedHeight(), "1584 === root.getComputedHeight() (" + root.getComputedHeight() + ")");
-
-    console.assert(0 === root_child0.getComputedLeft(), "0 === root_child0.getComputedLeft() (" + root_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child0.getComputedTop(), "0 === root_child0.getComputedTop() (" + root_child0.getComputedTop() + ")");
-    console.assert(1080 === root_child0.getComputedWidth(), "1080 === root_child0.getComputedWidth() (" + root_child0.getComputedWidth() + ")");
-    console.assert(100 === root_child0.getComputedHeight(), "100 === root_child0.getComputedHeight() (" + root_child0.getComputedHeight() + ")");
-
-    console.assert(680 === root_child0_child0.getComputedLeft(), "680 === root_child0_child0.getComputedLeft() (" + root_child0_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child0_child0.getComputedTop(), "0 === root_child0_child0.getComputedTop() (" + root_child0_child0.getComputedTop() + ")");
-    console.assert(400 === root_child0_child0.getComputedWidth(), "400 === root_child0_child0.getComputedWidth() (" + root_child0_child0.getComputedWidth() + ")");
-    console.assert(100 === root_child0_child0.getComputedHeight(), "100 === root_child0_child0.getComputedHeight() (" + root_child0_child0.getComputedHeight() + ")");
-
-    console.assert(101 === root_child0_child0_child0.getComputedLeft(), "101 === root_child0_child0_child0.getComputedLeft() (" + root_child0_child0_child0.getComputedLeft() + ")");
-    console.assert(0 === root_child0_child0_child0.getComputedTop(), "0 === root_child0_child0_child0.getComputedTop() (" + root_child0_child0_child0.getComputedTop() + ")");
-    console.assert(199 === root_child0_child0_child0.getComputedWidth(), "199 === root_child0_child0_child0.getComputedWidth() (" + root_child0_child0_child0.getComputedWidth() + ")");
-    console.assert(100 === root_child0_child0_child0.getComputedHeight(), "100 === root_child0_child0_child0.getComputedHeight() (" + root_child0_child0_child0.getComputedHeight() + ")");
-  } finally {
-    if (typeof root !== "undefined") {
-      root.freeRecursive();
-    }
-
-    config.free();
-  }
-});

lib/appcompat/BUCK

@@ -3,10 +3,9 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
 load("//tools/build_defs/oss:yoga_defs.bzl", "YOGA_ROOTS")
 
-fb_native.android_prebuilt_aar(
+android_prebuilt_aar(
     name = "appcompat",
     aar = "appcompat-v7-24.2.1.aar",
     visibility = YOGA_ROOTS,

lib/fb/build.gradle

@@ -1,10 +1,3 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 apply plugin: 'com.android.library'
 
 android {