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

Extract abstract class YogaNode

Browse Source 
Summary:
@public

Here, we extract an abstract class from `YogaNode`, in order to allow for experimentation with different implementations.

The reason for not choosing an interface is to keep ABI compatibility for `YogaNode.create()`.

Reviewed By: pasqualeanatriello

Differential Revision: D14044990

fbshipit-source-id: f8eb246338b55f34f0401198c0655abfcb7c9f37
This commit is contained in:
David Aurelio
2019-02-19 11:15:11 -08:00
committed by Facebook Github Bot
parent 016a10df26
commit 2643b96589
5 changed files with 996 additions and 787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/jni/YGJNI.cpp
View File

@@ -15,7 +15,7 @@ using namespace std;
using facebook::yoga::detail::Log;
struct JYogaNode : public JavaClass<JYogaNode> {
static constexpr auto kJavaDescriptor = "Lcom/facebook/yoga/YogaNode;";
static constexpr auto kJavaDescriptor = "Lcom/facebook/yoga/YogaNodeJNI;";
};
struct JYogaConfig : public JavaClass<JYogaConfig> {
@@ -98,7 +98,7 @@ static void YGTransferLayoutOutputsRecursive(YGNodeRef root) {
static auto doesLegacyStretchBehaviour = obj->getClass()->getField<jboolean>(
"mDoesLegacyStretchFlagAffectsLayout");
/* Those flags needs be in sync with YogaNode.java */
/* Those flags needs be in sync with YogaNodeJNI.java */
const int MARGIN = 1;
const int PADDING = 2;
const int BORDER = 4;
@@ -168,7 +168,7 @@ static void YGPrint(YGNodeRef node) {
static float YGJNIBaselineFunc(YGNodeRef node, float width, float height) {
if (auto obj = YGNodeJobject(node)->lockLocal()) {
static auto baselineFunc =
findClassStatic("com/facebook/yoga/YogaNode")
findClassStatic("com/facebook/yoga/YogaNodeJNI")
->getMethod<jfloat(jfloat, jfloat)>("baseline");
return baselineFunc(obj, width, height);
} else {
@@ -208,7 +208,7 @@ static YGNodeRef YGJNIOnNodeClonedFunc(
childIndex);
static auto replaceChild =
findClassStatic("com/facebook/yoga/YogaNode")
findClassStatic("com/facebook/yoga/YogaNodeJNI")
->getMethod<jlong(local_ref<JYogaNode>, jint)>("replaceChild");
jlong newNodeNativePointer =
@@ -225,7 +225,7 @@ static YGSize YGJNIMeasureFunc(
YGMeasureMode heightMode) {
if (auto obj = YGNodeJobject(node)->lockLocal()) {
static auto measureFunc =
findClassStatic("com/facebook/yoga/YogaNode")
findClassStatic("com/facebook/yoga/YogaNodeJNI")
->getMethod<jlong(jfloat, jint, jfloat, jint)>("measure");
YGTransferLayoutDirection(node, obj);
@@ -661,7 +661,7 @@ jint jni_YGNodeGetInstanceCount() {
jint JNI_OnLoad(JavaVM* vm, void*) {
return initialize(vm, [] {
registerNatives(
"com/facebook/yoga/YogaNode",
"com/facebook/yoga/YogaNodeJNI",
{
YGMakeNativeMethod(jni_YGNodeNew),
YGMakeNativeMethod(jni_YGNodeNewWithConfig),