C++ Cleanup 3/N: Reorganize YGNode (#1350)
Summary: X-link: https://github.com/facebook/react-native/pull/39219 Pull Request resolved: https://github.com/facebook/yoga/pull/1350 X-link: https://github.com/facebook/react-native/pull/39170 ## This diff This diff adds a top level `node` directory for code related to Yoga nodes and data structures on them (inc moving `YGLayout` to `LayoutResults`). The public API for config handles is `YGNodeRef`, which is forward declared to be a pointer to a struct named `YGNode`. The existing `YGNode` is split into `yoga::Node`, as the private C++ implementation, inheriting from `YGNode`, a marker type represented as an empty struct. The public API continues to accept `YGNodeRef`, which continues to be `YGNode *`, but it must be cast to its concrete internal representation at the API boundary before doing work on it. This change ends up needing to touch quite a bit, due to the amount of code that mixed and matched private and public APIs. Don't be scared though, because these changes are very mechanical, and Phabricator's line-count is 3x the actual amount due to mirrors and dirsyncs. ## This stack The organization of the C++ internals of Yoga are in need of attention. 1. Some of the C++ internals are namespaced, but others not. 2. Some of the namespaces include `detail`, but are meant to be used outside of the translation unit (FB Clang Tidy rules warn on any usage of these) 2. Most of the files are in a flat hierarchy, except for event tracing in its own folder 3. Some files and functions begin with YG, others don’t 4. Some functions are uppercase, others are not 5. Almost all of the interesting logic is in Yoga.cpp, and the file is too large to reason about 6. There are multiple grab bag files where folks put random functions they need in (Utils, BitUtils, Yoga-Internal.h) 7. There is no clear indication from file structure or type naming what is private vs not 8. Handles like `YGNodeRef` and `YGConfigRef` can be used to access internals just by importing headers This stack does some much needed spring cleaning: 1. All non-public headers and C++ implementation details are in separate folders from the root level `yoga`. This will give us room to split up logic and add more files without too large a flat hierarchy 3. All private C++ internals are under the `facebook::yoga` namespace. Details namespaces are only ever used within the same header, as they are intended 4. Utils files are split 5. Most C++ internals drop the YG prefix 6. Most C++ internal function names are all lower camel case 7. We start to split up Yoga.cpp 8. Every header beginning with YG or at the top-level directory is public and C only, with the exception of Yoga-Internal.h which has non-public functions for bindings 9. It is not possible to use private APIs without static casting handles to internal classes This will give us more leeway to continue splitting monolithic files, and consistent guidelines for style in new files as well. These changes should not be breaking to any project using only public Yoga headers. This includes every usage of Yoga in fbsource except for RN Fabric which is currently tied to internals. This refactor should make that boundary clearer. Changelog: [Internal] bypass-github-export-checks Reviewed By: shwanton Differential Revision: D48847258 fbshipit-source-id: fc560893533b55a5c2d52c37d8e9a59f7369f174
This commit is contained in:
committed by
Facebook GitHub Bot
parent
f82babba8a
commit
992f073746
@@ -17,7 +17,7 @@
|
||||
|
||||
// TODO: Reconcile missing layoutContext functionality from callbacks in the C
|
||||
// API and use that
|
||||
#include <yoga/YGNode.h>
|
||||
#include <yoga/node/Node.h>
|
||||
|
||||
using namespace facebook;
|
||||
using namespace facebook::yoga;
|
||||
@@ -688,7 +688,7 @@ static void jni_YGNodeSetHasMeasureFuncJNI(
|
||||
jobject /*obj*/,
|
||||
jlong nativePointer,
|
||||
jboolean hasMeasureFunc) {
|
||||
_jlong2YGNodeRef(nativePointer)
|
||||
static_cast<yoga::Node*>(_jlong2YGNodeRef(nativePointer))
|
||||
->setMeasureFunc(hasMeasureFunc ? YGJNIMeasureFunc : nullptr);
|
||||
}
|
||||
|
||||
@@ -715,7 +715,7 @@ static void jni_YGNodeSetHasBaselineFuncJNI(
|
||||
jobject /*obj*/,
|
||||
jlong nativePointer,
|
||||
jboolean hasBaselineFunc) {
|
||||
_jlong2YGNodeRef(nativePointer)
|
||||
static_cast<yoga::Node*>(_jlong2YGNodeRef(nativePointer))
|
||||
->setBaselineFunc(hasBaselineFunc ? YGJNIBaselineFunc : nullptr);
|
||||
}
|
||||
|
||||
|
@@ -14,11 +14,12 @@
|
||||
#include "jni.h"
|
||||
|
||||
class PtrJNodeMapVanilla {
|
||||
std::map<YGNodeRef, size_t> ptrsToIdxs_;
|
||||
jobjectArray javaNodes_;
|
||||
std::map<YGNodeConstRef, size_t> ptrsToIdxs_{};
|
||||
jobjectArray javaNodes_{};
|
||||
|
||||
public:
|
||||
PtrJNodeMapVanilla() : ptrsToIdxs_{}, javaNodes_{} {}
|
||||
PtrJNodeMapVanilla() = default;
|
||||
|
||||
PtrJNodeMapVanilla(jlongArray javaNativePointers, jobjectArray javaNodes)
|
||||
: javaNodes_{javaNodes} {
|
||||
using namespace facebook::yoga::vanillajni;
|
||||
@@ -30,11 +31,11 @@ public:
|
||||
javaNativePointers, 0, nativePointersSize, nativePointers.data());
|
||||
|
||||
for (size_t i = 0; i < nativePointersSize; ++i) {
|
||||
ptrsToIdxs_[(YGNodeRef) nativePointers[i]] = i;
|
||||
ptrsToIdxs_[(YGNodeConstRef) nativePointers[i]] = i;
|
||||
}
|
||||
}
|
||||
|
||||
facebook::yoga::vanillajni::ScopedLocalRef<jobject> ref(YGNodeRef node) {
|
||||
facebook::yoga::vanillajni::ScopedLocalRef<jobject> ref(YGNodeConstRef node) {
|
||||
using namespace facebook::yoga::vanillajni;
|
||||
|
||||
JNIEnv* env = getCurrentEnv();
|
||||
|
Reference in New Issue
Block a user