From 0e43f57001730200ca24a13dd7af2f6ffd5ee8b2 Mon Sep 17 00:00:00 2001 From: Nick Gerleman Date: Fri, 3 Nov 2023 14:59:24 -0700 Subject: [PATCH] Remove `YGNodeMarkDirtyAndPropagateToDescendants` (#1448) Summary: This should not be part of Yoga's API. If benchmarks want to do this, they still can (though I don't know the ones we have for it are super valuable). Reviewed By: javache Differential Revision: D50963933 --- java/com/facebook/yoga/YogaNative.java | 1 - java/com/facebook/yoga/YogaNodeJNIBase.java | 4 ---- java/jni/YGJNIVanilla.cpp | 10 ---------- yoga/Yoga.cpp | 4 ---- yoga/Yoga.h | 6 ------ yoga/node/Node.cpp | 7 ------- yoga/node/Node.h | 1 - 7 files changed, 33 deletions(-) diff --git a/java/com/facebook/yoga/YogaNative.java b/java/com/facebook/yoga/YogaNative.java index 89e3cde6b0..6ae00f0f2e 100644 --- a/java/com/facebook/yoga/YogaNative.java +++ b/java/com/facebook/yoga/YogaNative.java @@ -41,7 +41,6 @@ public class YogaNative { static native void jni_YGNodeRemoveChildJNI(long nativePointer, long childPointer); static native void jni_YGNodeCalculateLayoutJNI(long nativePointer, float width, float height, long[] nativePointers, YogaNodeJNIBase[] nodes); static native void jni_YGNodeMarkDirtyJNI(long nativePointer); - static native void jni_YGNodeMarkDirtyAndPropagateToDescendantsJNI(long nativePointer); static native boolean jni_YGNodeIsDirtyJNI(long nativePointer); static native void jni_YGNodeCopyStyleJNI(long dstNativePointer, long srcNativePointer); static native int jni_YGNodeStyleGetDirectionJNI(long nativePointer); diff --git a/java/com/facebook/yoga/YogaNodeJNIBase.java b/java/com/facebook/yoga/YogaNodeJNIBase.java index 9100e64c81..dbe3fd8a77 100644 --- a/java/com/facebook/yoga/YogaNodeJNIBase.java +++ b/java/com/facebook/yoga/YogaNodeJNIBase.java @@ -231,10 +231,6 @@ public void dirty() { YogaNative.jni_YGNodeMarkDirtyJNI(mNativePointer); } - public void dirtyAllDescendants() { - YogaNative.jni_YGNodeMarkDirtyAndPropagateToDescendantsJNI(mNativePointer); - } - public boolean isDirty() { return YogaNative.jni_YGNodeIsDirtyJNI(mNativePointer); } diff --git a/java/jni/YGJNIVanilla.cpp b/java/jni/YGJNIVanilla.cpp index 9e69b7b70a..e01aa24875 100644 --- a/java/jni/YGJNIVanilla.cpp +++ b/java/jni/YGJNIVanilla.cpp @@ -385,13 +385,6 @@ jni_YGNodeMarkDirtyJNI(JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer) { YGNodeMarkDirty(_jlong2YGNodeRef(nativePointer)); } -static void jni_YGNodeMarkDirtyAndPropagateToDescendantsJNI( - JNIEnv* /*env*/, - jobject /*obj*/, - jlong nativePointer) { - YGNodeMarkDirtyAndPropagateToDescendants(_jlong2YGNodeRef(nativePointer)); -} - static jboolean jni_YGNodeIsDirtyJNI(JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer) { return (jboolean)YGNodeIsDirty(_jlong2YGNodeRef(nativePointer)); @@ -776,9 +769,6 @@ static JNINativeMethod methods[] = { "(JFF[J[Lcom/facebook/yoga/YogaNodeJNIBase;)V", (void*)jni_YGNodeCalculateLayoutJNI}, {"jni_YGNodeMarkDirtyJNI", "(J)V", (void*)jni_YGNodeMarkDirtyJNI}, - {"jni_YGNodeMarkDirtyAndPropagateToDescendantsJNI", - "(J)V", - (void*)jni_YGNodeMarkDirtyAndPropagateToDescendantsJNI}, {"jni_YGNodeIsDirtyJNI", "(J)Z", (void*)jni_YGNodeIsDirtyJNI}, {"jni_YGNodeCopyStyleJNI", "(JJ)V", (void*)jni_YGNodeCopyStyleJNI}, {"jni_YGNodeStyleGetDirectionJNI", diff --git a/yoga/Yoga.cpp b/yoga/Yoga.cpp index ee14372bf1..5109223fe3 100644 --- a/yoga/Yoga.cpp +++ b/yoga/Yoga.cpp @@ -92,10 +92,6 @@ bool YGNodeIsDirty(YGNodeConstRef node) { return resolveRef(node)->isDirty(); } -void YGNodeMarkDirtyAndPropagateToDescendants(const YGNodeRef node) { - return resolveRef(node)->markDirtyAndPropagateDownwards(); -} - YGNodeRef YGNodeNewWithConfig(const YGConfigConstRef config) { auto* node = new yoga::Node{resolveRef(config)}; yoga::assertFatal( diff --git a/yoga/Yoga.h b/yoga/Yoga.h index cafbadb66e..86f09fa0c4 100644 --- a/yoga/Yoga.h +++ b/yoga/Yoga.h @@ -94,12 +94,6 @@ YG_EXPORT void YGNodeCalculateLayout( // this dirty marking manually. YG_EXPORT void YGNodeMarkDirty(YGNodeRef node); -// Marks the current node and all its descendants as dirty. -// -// Intended to be used for Yoga benchmarks. Don't use in production, as calling -// `YGCalculateLayout` will cause the recalculation of each and every node. -YG_EXPORT void YGNodeMarkDirtyAndPropagateToDescendants(YGNodeRef node); - YG_EXPORT void YGNodePrint(YGNodeConstRef node, YGPrintOptions options); YG_EXPORT bool YGFloatIsUndefined(float value); diff --git a/yoga/node/Node.cpp b/yoga/node/Node.cpp index 257aa3ce0d..d85ec61f43 100644 --- a/yoga/node/Node.cpp +++ b/yoga/node/Node.cpp @@ -586,13 +586,6 @@ void Node::markDirtyAndPropagate() { } } -void Node::markDirtyAndPropagateDownwards() { - isDirty_ = true; - for_each(children_.begin(), children_.end(), [](Node* childNode) { - childNode->markDirtyAndPropagateDownwards(); - }); -} - float Node::resolveFlexGrow() const { // Root nodes flexGrow should always be 0 if (owner_ == nullptr) { diff --git a/yoga/node/Node.h b/yoga/node/Node.h index 005459434d..0a317c38ab 100644 --- a/yoga/node/Node.h +++ b/yoga/node/Node.h @@ -335,7 +335,6 @@ class YG_EXPORT Node : public ::YGNode { const float mainSize, const float crossSize, const float ownerWidth); - void markDirtyAndPropagateDownwards(); // Other methods YGValue getFlexStartMarginValue(FlexDirection axis) const;