Remove Broken Caching Logic in AndroidProgressBarMeasurementsManagaer and AndroidSwitchMeasurementsManager (#51757)

Summary:
Pull Request resolved: #51757

These both have a boolean flag `hasBeenMeasured_` which is never set to true, so the cached measurement is never used, but it would be wrong if it was used, since the cache doesn't respect the content, or measure constraints. Delete the broken code.

Changelog: [Internal]

Reviewed By: alanleedev

Differential Revision: D75817999

fbshipit-source-id: eb062f523840bbac7099b28f7e9b25cf9ad302aa

Author: NickGerleman

packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.cpp

@@ -20,13 +20,6 @@ Size AndroidProgressBarMeasurementsManager::measure(
     SurfaceId surfaceId,
     const AndroidProgressBarProps& props,
     LayoutConstraints layoutConstraints) const {
-  {
-    std::scoped_lock lock(mutex_);
-    if (hasBeenMeasured_) {
-      return cachedMeasurement_;
-    }
-  }
-
   const jni::global_ref<jobject>& fabricUIManager =
       contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
 
@@ -54,7 +47,7 @@ Size AndroidProgressBarMeasurementsManager::measure(
   local_ref<ReadableMap::javaobject> propsRM =
       make_local(reinterpret_cast<ReadableMap::javaobject>(propsRNM.get()));
 
-  auto measurement = yogaMeassureToSize(measure(
+  return yogaMeassureToSize(measure(
       fabricUIManager,
       surfaceId,
       componentName.get(),
@@ -65,10 +58,6 @@ Size AndroidProgressBarMeasurementsManager::measure(
       maximumSize.width,
       minimumSize.height,
       maximumSize.height));
-
-  std::scoped_lock lock(mutex_);
-  cachedMeasurement_ = measurement;
-  return measurement;
 }
 
 } // namespace facebook::react

packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.h

@@ -27,9 +27,6 @@ class AndroidProgressBarMeasurementsManager {
 
  private:
   const ContextContainer::Shared contextContainer_;
-  mutable std::mutex mutex_;
-  mutable bool hasBeenMeasured_ = false;
-  mutable Size cachedMeasurement_{};
 };
 
 } // namespace facebook::react

packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchMeasurementsManager.cpp

@@ -19,48 +19,39 @@ Size AndroidSwitchMeasurementsManager::measure(
     SurfaceId surfaceId,
     LayoutConstraints layoutConstraints) const {
   {
-    std::scoped_lock lock(mutex_);
-    if (hasBeenMeasured_) {
-      return cachedMeasurement_;
-    }
+    const jni::global_ref<jobject>& fabricUIManager =
+        contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
+
+    static auto measure =
+        jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
+            ->getMethod<jlong(
+                jint,
+                jstring,
+                ReadableMap::javaobject,
+                ReadableMap::javaobject,
+                ReadableMap::javaobject,
+                jfloat,
+                jfloat,
+                jfloat,
+                jfloat)>("measure");
+
+    auto minimumSize = layoutConstraints.minimumSize;
+    auto maximumSize = layoutConstraints.maximumSize;
+
+    local_ref<JString> componentName = make_jstring("AndroidSwitch");
+
+    return yogaMeassureToSize(measure(
+        fabricUIManager,
+        surfaceId,
+        componentName.get(),
+        nullptr,
+        nullptr,
+        nullptr,
+        minimumSize.width,
+        maximumSize.width,
+        minimumSize.height,
+        maximumSize.height));
   }
-
-  const jni::global_ref<jobject>& fabricUIManager =
-      contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
-
-  static auto measure =
-      jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
-          ->getMethod<jlong(
-              jint,
-              jstring,
-              ReadableMap::javaobject,
-              ReadableMap::javaobject,
-              ReadableMap::javaobject,
-              jfloat,
-              jfloat,
-              jfloat,
-              jfloat)>("measure");
-
-  auto minimumSize = layoutConstraints.minimumSize;
-  auto maximumSize = layoutConstraints.maximumSize;
-
-  local_ref<JString> componentName = make_jstring("AndroidSwitch");
-
-  auto measurement = yogaMeassureToSize(measure(
-      fabricUIManager,
-      surfaceId,
-      componentName.get(),
-      nullptr,
-      nullptr,
-      nullptr,
-      minimumSize.width,
-      maximumSize.width,
-      minimumSize.height,
-      maximumSize.height));
-
-  std::scoped_lock lock(mutex_);
-  cachedMeasurement_ = measurement;
-  return measurement;
 }
 
 } // namespace facebook::react

packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchMeasurementsManager.h

@@ -23,9 +23,6 @@ class AndroidSwitchMeasurementsManager {
 
  private:
   const ContextContainer::Shared contextContainer_;
-  mutable std::mutex mutex_;
-  mutable bool hasBeenMeasured_ = false;
-  mutable Size cachedMeasurement_{};
 };
 
 } // namespace facebook::react