diff --git a/java/jni/YGJNI.cpp b/java/jni/YGJNI.cpp index c0b0dd49..72e704c8 100644 --- a/java/jni/YGJNI.cpp +++ b/java/jni/YGJNI.cpp @@ -24,12 +24,6 @@ static void YGTransferLayoutDirection(YGNodeRef node, alias_ref javaNod } static void YGTransferLayoutOutputsRecursive(YGNodeRef root) { - // If the node is using a cached layout it means we have already - // transfered it to java. - if (YGNodeIsUsingCachedLayout(root)) { - return; - } - if (auto obj = YGNodeJobject(root)->lockLocal()) { static auto widthField = obj->getClass()->getField("mWidth"); static auto heightField = obj->getClass()->getField("mHeight"); diff --git a/yoga/Yoga.c b/yoga/Yoga.c index 1b3961c9..65a3ba46 100644 --- a/yoga/Yoga.c +++ b/yoga/Yoga.c @@ -459,18 +459,6 @@ void YGNodeCopyStyle(const YGNodeRef dstNode, const YGNodeRef srcNode) { } } -static int YGNodeRootGenerationCount(const YGNodeRef node) { - if (node->parent) { - return YGNodeRootGenerationCount(node->parent); - } else { - return node->layout.generationCount; - } -} - -bool YGNodeIsUsingCachedLayout(const YGNodeRef node) { - return node->layout.generationCount != YGNodeRootGenerationCount(node); -} - static inline float YGResolveFlexGrow(const YGNodeRef node) { if (!YGFloatIsUndefined(node->style.flexGrow)) { return node->style.flexGrow; @@ -1823,7 +1811,6 @@ static void YGZeroOutLayoutRecursivly(const YGNodeRef node) { node->layout.cachedLayout.widthMeasureMode = YGMeasureModeExactly; node->layout.cachedLayout.computedWidth = 0; node->layout.cachedLayout.computedHeight = 0; - node->layout.generationCount = gCurrentGenerationCount; const uint32_t childCount = YGNodeGetChildCount(node); for (uint32_t i = 0; i < childCount; i++) { const YGNodeRef child = YGNodeListGet(node->children, i); diff --git a/yoga/Yoga.h b/yoga/Yoga.h index 054b5dc5..d5c5258a 100644 --- a/yoga/Yoga.h +++ b/yoga/Yoga.h @@ -218,8 +218,6 @@ YG_NODE_LAYOUT_EDGE_PROPERTY(float, Margin); YG_NODE_LAYOUT_EDGE_PROPERTY(float, Border); YG_NODE_LAYOUT_EDGE_PROPERTY(float, Padding); -bool YGNodeIsUsingCachedLayout(const YGNodeRef node); - WIN_EXPORT void YGSetLogger(YGLogger logger); WIN_EXPORT void YGLog(YGLogLevel level, const char *message, ...);