From 094876367f2821edce16331f5a30f9edb303dbe9 Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Tue, 1 Apr 2025 19:49:45 -0700 Subject: [PATCH] Delete RCTComputeScreenScale Summary: This method is redundant. You could just call RCTScreenScale() Changelog: [iOS][Removed] Delete RCTComputeScreenScale Reviewed By: philIip Differential Revision: D72258778 fbshipit-source-id: 0b469169efc4f2def85b2e6b736f3c4570e6b428 --- packages/react-native/React/Base/RCTUtils.h | 3 --- packages/react-native/React/Base/RCTUtils.m | 13 +++---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/packages/react-native/React/Base/RCTUtils.h b/packages/react-native/React/Base/RCTUtils.h index 9156f761a3e..d65ccba909e 100644 --- a/packages/react-native/React/Base/RCTUtils.h +++ b/packages/react-native/React/Base/RCTUtils.h @@ -46,9 +46,6 @@ RCT_EXTERN void RCTExecuteOnMainQueue(dispatch_block_t block); // Please do not use this unless you know what you're doing. RCT_EXTERN void RCTUnsafeExecuteOnMainQueueSync(dispatch_block_t block); -// Get screen scale, can be only used on main -RCT_EXTERN void RCTComputeScreenScale(void); - // Get screen metrics in a thread-safe way RCT_EXTERN CGFloat RCTScreenScale(void); RCT_EXTERN CGFloat RCTFontSizeMultiplier(void); diff --git a/packages/react-native/React/Base/RCTUtils.m b/packages/react-native/React/Base/RCTUtils.m index d477c396240..1e496625889 100644 --- a/packages/react-native/React/Base/RCTUtils.m +++ b/packages/react-native/React/Base/RCTUtils.m @@ -317,18 +317,11 @@ static void RCTUnsafeExecuteOnMainQueueOnceSync(dispatch_once_t *onceToken, disp } } -static dispatch_once_t onceTokenScreenScale; -static CGFloat screenScale; - -void RCTComputeScreenScale(void) -{ - dispatch_once(&onceTokenScreenScale, ^{ - screenScale = [UITraitCollection currentTraitCollection].displayScale; - }); -} - CGFloat RCTScreenScale(void) { + static dispatch_once_t onceTokenScreenScale; + static CGFloat screenScale; + RCTUnsafeExecuteOnMainQueueOnceSync(&onceTokenScreenScale, ^{ screenScale = [UITraitCollection currentTraitCollection].displayScale; });