From 93df73975e8c9a9bb5a4a0b57a378e1b59954020 Mon Sep 17 00:00:00 2001 From: Sidharth Guglani Date: Fri, 11 Oct 2019 02:01:56 -0700 Subject: [PATCH] useVanilla flag for measure and baseline methods as well Summary: UseVanillaJNI flag was missing for measure and baseline functions Reviewed By: amir-shalem Differential Revision: D17868201 fbshipit-source-id: 95d6843d643e90157a51550d6efbf059f0ca2c39 --- .../main/java/com/facebook/yoga/YogaNodeJNIBase.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java index d648c72f5ac..3a889bec94f 100644 --- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java +++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java @@ -610,7 +610,10 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable { public void setMeasureFunction(YogaMeasureFunction measureFunction) { mMeasureFunction = measureFunction; - YogaNative.jni_YGNodeSetHasMeasureFunc(mNativePointer, measureFunction != null); + if (useVanillaJNI) + YogaNative.jni_YGNodeSetHasMeasureFuncJNI(mNativePointer, measureFunction != null); + else + YogaNative.jni_YGNodeSetHasMeasureFunc(mNativePointer, measureFunction != null); } // Implementation Note: Why this method needs to stay final @@ -634,7 +637,10 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable { public void setBaselineFunction(YogaBaselineFunction baselineFunction) { mBaselineFunction = baselineFunction; - YogaNative.jni_YGNodeSetHasBaselineFunc(mNativePointer, baselineFunction != null); + if (useVanillaJNI) + YogaNative.jni_YGNodeSetHasBaselineFuncJNI(mNativePointer, baselineFunction != null); + else + YogaNative.jni_YGNodeSetHasBaselineFunc(mNativePointer, baselineFunction != null); } @DoNotStrip