Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove use of type alias from Differentiator (#46762)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/46762

changelog: [internal]

Typealias NonOwningList obscures the underlaying type and provides limited benefit. Using std::vector<ShadowViewNodePair*> is more readable.

Reviewed By: NickGerleman

Differential Revision: D63396285

fbshipit-source-id: 70cda3f33a7649cabbf5888fbefe0610d2c002b3
This commit is contained in:
Samuel Susla
2024-10-01 17:31:46 -07:00
committed by Facebook GitHub Bot
parent ebc699ce7f
commit d19a2178b6
3 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.cpp
+14 -17
View File
@@ -195,7 +195,7 @@ static bool shouldFirstPairComesBeforeSecondOne(
* Reorders pairs in-place based on `orderIndex` using a stable sort algorithm.
*/
static void reorderInPlaceIfNeeded(
ShadowViewNodePair::NonOwningList& pairs) noexcept {
std::vector<ShadowViewNodePair*>& pairs) noexcept {
if (pairs.size() < 2) {
return;
}
@@ -217,7 +217,7 @@ static void reorderInPlaceIfNeeded(
}
static void sliceChildShadowNodeViewPairsRecursively(
ShadowViewNodePair::NonOwningList& pairList,
std::vector<ShadowViewNodePair*>& pairList,
size_t& startOfStaticIndex,
ViewNodePairScope& scope,
Point layoutOffset,
@@ -284,13 +284,13 @@ static void sliceChildShadowNodeViewPairsRecursively(
}
}
ShadowViewNodePair::NonOwningList sliceChildShadowNodeViewPairs(
std::vector<ShadowViewNodePair*> sliceChildShadowNodeViewPairs(
const ShadowViewNodePair& shadowNodePair,
ViewNodePairScope& scope,
bool allowFlattened,
Point layoutOffset) {
const auto& shadowNode = *shadowNodePair.shadowNode;
auto pairList = ShadowViewNodePair::NonOwningList{};
auto pairList = std::vector<ShadowViewNodePair*>{};
if (shadowNodePair.flattened && shadowNodePair.isConcreteView &&
!allowFlattened) {
@@ -319,7 +319,7 @@ ShadowViewNodePair::NonOwningList sliceChildShadowNodeViewPairs(
* possible. This can account for adding parent LayoutMetrics that are
* important to take into account, but tricky, in (un)flattening cases.
*/
static ShadowViewNodePair::NonOwningList
static std::vector<ShadowViewNodePair*>
sliceChildShadowNodeViewPairsFromViewNodePair(
const ShadowViewNodePair& shadowViewNodePair,
ViewNodePairScope& scope,
@@ -345,8 +345,8 @@ static_assert(
std::is_move_constructible<ShadowViewNodePair>::value,
"`ShadowViewNodePair` must be `move constructible`.");
static_assert(
std::is_move_constructible<ShadowViewNodePair::NonOwningList>::value,
"`ShadowViewNodePair::NonOwningList` must be `move constructible`.");
std::is_move_constructible<std::vector<ShadowViewNodePair*>>::value,
"`std::vector<ShadowViewNodePair*>` must be `move constructible`.");
static_assert(
std::is_move_assignable<ShadowViewMutation>::value,
@@ -357,16 +357,13 @@ static_assert(
static_assert(
std::is_move_assignable<ShadowViewNodePair>::value,
"`ShadowViewNodePair` must be `move assignable`.");
static_assert(
std::is_move_assignable<ShadowViewNodePair::NonOwningList>::value,
"`ShadowViewNodePair::NonOwningList` must be `move assignable`.");
static void calculateShadowViewMutations(
ViewNodePairScope& scope,
ShadowViewMutation::List& mutations,
const ShadowView& parentShadowView,
ShadowViewNodePair::NonOwningList&& oldChildPairs,
ShadowViewNodePair::NonOwningList&& newChildPairs);
std::vector<ShadowViewNodePair*>&& oldChildPairs,
std::vector<ShadowViewNodePair*>&& newChildPairs);
struct OrderedMutationInstructionContainer {
ShadowViewMutation::List createMutations{};
@@ -382,7 +379,7 @@ static void updateMatchedPairSubtrees(
ViewNodePairScope& scope,
OrderedMutationInstructionContainer& mutationContainer,
TinyMap<Tag, ShadowViewNodePair*>& newRemainingPairs,
ShadowViewNodePair::NonOwningList& oldChildPairs,
std::vector<ShadowViewNodePair*>& oldChildPairs,
const ShadowView& parentShadowView,
const ShadowViewNodePair& oldPair,
const ShadowViewNodePair& newPair);
@@ -417,7 +414,7 @@ static void updateMatchedPairSubtrees(
ViewNodePairScope& scope,
OrderedMutationInstructionContainer& mutationContainer,
TinyMap<Tag, ShadowViewNodePair*>& newRemainingPairs,
ShadowViewNodePair::NonOwningList& oldChildPairs,
std::vector<ShadowViewNodePair*>& oldChildPairs,
const ShadowView& parentShadowView,
const ShadowViewNodePair& oldPair,
const ShadowViewNodePair& newPair) {
@@ -638,7 +635,7 @@ static void calculateShadowViewMutationsFlattener(
});
// Step 1: iterate through entire tree
ShadowViewNodePair::NonOwningList treeChildren =
std::vector<ShadowViewNodePair*> treeChildren =
sliceChildShadowNodeViewPairsFromViewNodePair(node, scope);
DEBUG_LOGS({
@@ -1054,8 +1051,8 @@ static void calculateShadowViewMutations(
ViewNodePairScope& scope,
ShadowViewMutation::List& mutations,
const ShadowView& parentShadowView,
ShadowViewNodePair::NonOwningList&& oldChildPairs,
ShadowViewNodePair::NonOwningList&& newChildPairs) {
std::vector<ShadowViewNodePair*>&& oldChildPairs,
std::vector<ShadowViewNodePair*>&& newChildPairs) {
if (oldChildPairs.empty() && newChildPairs.empty()) {
return;
}
packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.h
+1 -3
View File
@@ -19,8 +19,6 @@ namespace facebook::react {
* This is not exposed to the mounting layer.
*/
struct ShadowViewNodePair final {
using NonOwningList = std::vector<ShadowViewNodePair*>;
ShadowView shadowView;
const ShadowNode* shadowNode;
@@ -94,7 +92,7 @@ ShadowViewMutation::List calculateShadowViewMutations(
* flattened view hierarchy. The V2 version preserves nodes even if they do
* not form views and their children are flattened.
*/
ShadowViewNodePair::NonOwningList sliceChildShadowNodeViewPairs(
std::vector<ShadowViewNodePair*> sliceChildShadowNodeViewPairs(
const ShadowViewNodePair& shadowNodePair,
ViewNodePairScope& viewNodePairScope,
bool allowFlattened = false,
packages/react-native/ReactCommon/react/renderer/mounting/stubs/stubs.cpp
+1 -1
View File
@@ -43,7 +43,7 @@ static void calculateShadowViewMutationsForNewTree(
ShadowViewMutation::List& mutations,
ViewNodePairScope& scope,
const ShadowView& parentShadowView,
ShadowViewNodePair::NonOwningList newChildPairs) {
std::vector<ShadowViewNodePair*> newChildPairs) {
// Sorting pairs based on `orderIndex` if needed.
reorderInPlaceIfNeeded(newChildPairs);