Remove layoutContext Drilling (#39401)

Summary: Pull Request resolved: #39401 X-link: facebook/yoga#1376 kill_with_fire_flamethrower Reviewed By: rshest Differential Revision: D49179244 fbshipit-source-id: 9a827e1bd29205254fee5725449191726d6bcf5a
facebook · Sep 13, 2023 · b955d8d · b955d8d
1 parent 733c928
commit b955d8d
Show file tree

Hide file tree

Showing 14 changed files with 78 additions and 287 deletions.
diff --git a/packages/react-native/ReactCommon/yoga/yoga/Yoga-internal.h b/packages/react-native/ReactCommon/yoga/yoga/Yoga-internal.h
@@ -15,13 +15,6 @@
 
 YG_EXTERN_C_BEGIN
 
-YG_EXPORT void YGNodeCalculateLayoutWithContext(
-    YGNodeRef node,
-    float availableWidth,
-    float availableHeight,
-    YGDirection ownerDirection,
-    void* layoutContext);
-
 // Deallocates a Yoga Node. Unlike YGNodeFree, does not remove the node from
 // its parent or children.
 YG_EXPORT void YGNodeDeallocate(YGNodeRef node);

diff --git a/packages/react-native/ReactCommon/yoga/yoga/Yoga.cpp b/packages/react-native/ReactCommon/yoga/yoga/Yoga.cpp
@@ -57,7 +57,7 @@ void YGNodeSetBaselineFunc(YGNodeRef node, YGBaselineFunc baselineFunc) {
 }
 
 YGDirtiedFunc YGNodeGetDirtiedFunc(YGNodeConstRef node) {
-  return resolveRef(node)->getDirtied();
+  return resolveRef(node)->getDirtiedFunc();
 }
 
 void YGNodeSetDirtiedFunc(YGNodeRef node, YGDirtiedFunc dirtiedFunc) {
@@ -805,7 +805,7 @@ void YGNodePrint(const YGNodeConstRef nodeRef, const YGPrintOptions options) {
   const auto node = resolveRef(nodeRef);
   std::string str;
   yoga::nodeToString(str, node, options, 0);
-  yoga::log(node, YGLogLevelDebug, nullptr, str.c_str());
+  yoga::log(node, YGLogLevelDebug, str.c_str());
 }
 #endif
 
@@ -927,16 +927,6 @@ void YGNodeCalculateLayout(
     const float ownerWidth,
     const float ownerHeight,
     const YGDirection ownerDirection) {
-  YGNodeCalculateLayoutWithContext(
-      node, ownerWidth, ownerHeight, ownerDirection, nullptr);
-}
-
-void YGNodeCalculateLayoutWithContext(
-    const YGNodeRef node,
-    const float ownerWidth,
-    const float ownerHeight,
-    const YGDirection ownerDirection,
-    void* layoutContext) {
   yoga::calculateLayout(
-      resolveRef(node), ownerWidth, ownerHeight, ownerDirection, layoutContext);
+      resolveRef(node), ownerWidth, ownerHeight, ownerDirection);
 }
diff --git a/packages/react-native/ReactCommon/yoga/yoga/algorithm/Baseline.cpp b/packages/react-native/ReactCommon/yoga/yoga/algorithm/Baseline.cpp
@@ -14,15 +14,14 @@
 
 namespace facebook::yoga {
 
-float calculateBaseline(const yoga::Node* node, void* layoutContext) {
+float calculateBaseline(const yoga::Node* node) {
   if (node->hasBaselineFunc()) {
 
     Event::publish<Event::NodeBaselineStart>(node);
 
     const float baseline = node->baseline(
         node->getLayout().measuredDimensions[YGDimensionWidth],
-        node->getLayout().measuredDimensions[YGDimensionHeight],
-        layoutContext);
+        node->getLayout().measuredDimensions[YGDimensionHeight]);
 
     Event::publish<Event::NodeBaselineEnd>(node);
 
@@ -58,7 +57,7 @@ float calculateBaseline(const yoga::Node* node, void* layoutContext) {
     return node->getLayout().measuredDimensions[YGDimensionHeight];
   }
 
-  const float baseline = calculateBaseline(baselineChild, layoutContext);
+  const float baseline = calculateBaseline(baselineChild);
   return baseline + baselineChild->getLayout().position[YGEdgeTop];
 }
 

diff --git a/packages/react-native/ReactCommon/yoga/yoga/algorithm/Baseline.h b/packages/react-native/ReactCommon/yoga/yoga/algorithm/Baseline.h
@@ -13,7 +13,7 @@
 namespace facebook::yoga {
 
 // Calculate baseline represented as an offset from the top edge of the node.
-float calculateBaseline(const yoga::Node* node, void* layoutContext);
+float calculateBaseline(const yoga::Node* node);
 
 // Whether any of the children of this node participate in baseline alignment
 bool isBaselineLayout(const yoga::Node* node);