From be72b8e8aaaa9cb4b2164d22577b0acc17f0ff4a Mon Sep 17 00:00:00 2001 From: Joe Vilches Date: Tue, 26 Nov 2024 22:48:24 -0800 Subject: [PATCH] Align order of params between calculateLayoutInternal and calculateLayoutImpl (#1755) Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/1755 X-link: https://github.com/facebook/react-native/pull/47975 I've been working with callsites here and its annoying if you switch these that you need to move these params around too. Let's just make them the same order Changelog: [Internal] Reviewed By: NickGerleman Differential Revision: D66519836 fbshipit-source-id: 2e98e671270a053c6e62372e2003f1ca67774ec9 --- yoga/algorithm/CalculateLayout.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yoga/algorithm/CalculateLayout.cpp b/yoga/algorithm/CalculateLayout.cpp index a10b2215..f9e6f6e8 100644 --- a/yoga/algorithm/CalculateLayout.cpp +++ b/yoga/algorithm/CalculateLayout.cpp @@ -1213,10 +1213,10 @@ static void calculateLayoutImpl( const float ownerWidth, const float ownerHeight, const bool performLayout, + const LayoutPassReason reason, LayoutData& layoutMarkerData, const uint32_t depth, - const uint32_t generationCount, - const LayoutPassReason reason) { + const uint32_t generationCount) { yoga::assertFatalWithNode( node, yoga::isUndefined(availableWidth) @@ -2268,10 +2268,10 @@ bool calculateLayoutInternal( ownerWidth, ownerHeight, performLayout, + reason, layoutMarkerData, depth, - generationCount, - reason); + generationCount); layout->lastOwnerDirection = ownerDirection; layout->configVersion = node->getConfig()->getVersion();