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

Add boolean flag to decide whether to use fbjni or jni

Browse Source 
Summary:
Adds a flag useVanillaJNI in YogaConfig to determine whether to use FbJNI or JNI.
Currently default is set to false.

We will experiment based on this flag once all code have been migrated.

Reviewed By: Andrey-Mishanin

Differential Revision: D17601703

fbshipit-source-id: 377a5bd2a6f8a7584e84932e87fa7044d8165efd
This commit is contained in:
Sidharth Guglani
2019-09-26 17:30:28 -07:00
committed by Facebook Github Bot
parent b29e144649
commit 0875b6b542
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/facebook/yoga/YogaConfig.java
View File

@@ -37,4 +37,8 @@ public abstract class YogaConfig {
public abstract YogaLogger getLogger(); public abstract YogaLogger getLogger();
abstract long getNativePointer(); abstract long getNativePointer();
public abstract void setUseVanillaJNI(boolean useVanillaJNI);
public abstract boolean useVanillaJNI();
} }

11
java/com/facebook/yoga/YogaConfigJNIBase.java
View File

@@ -10,6 +10,7 @@ public abstract class YogaConfigJNIBase extends YogaConfig {
long mNativePointer; long mNativePointer;
private YogaLogger mLogger; private YogaLogger mLogger;
private boolean useVanillaJNI = false;
private YogaConfigJNIBase(long nativePointer) { private YogaConfigJNIBase(long nativePointer) {
if (nativePointer == 0) { if (nativePointer == 0) {
@@ -70,4 +71,14 @@ public abstract class YogaConfigJNIBase extends YogaConfig {
long getNativePointer() { long getNativePointer() {
return mNativePointer; return mNativePointer;
} }
@Override
public void setUseVanillaJNI(boolean useVanillaJNI) {
this.useVanillaJNI = useVanillaJNI;
}
@Override
public boolean useVanillaJNI() {
return this.useVanillaJNI;
}
} }

9
java/com/facebook/yoga/YogaNodeJNIBase.java
View File

@@ -46,6 +46,8 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
private boolean mHasNewLayout = true; private boolean mHasNewLayout = true;
private boolean useVanillaJNI = false;
private YogaNodeJNIBase(long nativePointer) { private YogaNodeJNIBase(long nativePointer) {
if (nativePointer == 0) { if (nativePointer == 0) {
throw new IllegalStateException("Failed to allocate native memory"); throw new IllegalStateException("Failed to allocate native memory");
@@ -59,6 +61,7 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
YogaNodeJNIBase(YogaConfig config) { YogaNodeJNIBase(YogaConfig config) {
this(YogaNative.jni_YGNodeNewWithConfig(((YogaConfigJNIBase)config).mNativePointer)); this(YogaNative.jni_YGNodeNewWithConfig(((YogaConfigJNIBase)config).mNativePointer));
this.useVanillaJNI = config.useVanillaJNI();
} }
public void reset() { public void reset() {
@@ -284,7 +287,11 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
} }
public void setFlex(float flex) { public void setFlex(float flex) {
YogaNative.jni_YGNodeStyleSetFlex(mNativePointer, flex); if (useVanillaJNI) {
YogaNative.jni_YGNodeStyleSetFlexJNI(mNativePointer, flex);
} else {
YogaNative.jni_YGNodeStyleSetFlex(mNativePointer, flex);
}
} }
public float getFlexGrow() { public float getFlexGrow() {