Rename Binding to FabricUIManagerBinding

Differential Revision: D63536329
javache · Sep 27, 2024 · 04ebbe0 · 04ebbe0
1 parent 0234a5d
commit 04ebbe0
Show file tree

Hide file tree

Showing 11 changed files with 95 additions and 205 deletions.
diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api
@@ -2578,39 +2578,6 @@ public abstract interface class com/facebook/react/devsupport/interfaces/StackFr
 	public abstract fun toJSON ()Lorg/json/JSONObject;
 }
 
-public abstract interface class com/facebook/react/fabric/Binding {
-	public abstract fun drainPreallocateViewsQueue ()V
-	public abstract fun driveCxxAnimations ()V
-	public abstract fun getInspectorDataForInstance (Lcom/facebook/react/fabric/events/EventEmitterWrapper;)Lcom/facebook/react/bridge/ReadableNativeMap;
-	public abstract fun register (Lcom/facebook/react/bridge/RuntimeExecutor;Lcom/facebook/react/bridge/RuntimeScheduler;Lcom/facebook/react/fabric/FabricUIManager;Lcom/facebook/react/fabric/events/EventBeatManager;Lcom/facebook/react/fabric/ComponentFactory;Lcom/facebook/react/fabric/ReactNativeConfig;)V
-	public abstract fun reportMount (I)V
-	public abstract fun setConstraints (IFFFFFFZZ)V
-	public abstract fun setPixelDensity (F)V
-	public abstract fun startSurface (ILjava/lang/String;Lcom/facebook/react/bridge/NativeMap;)V
-	public abstract fun startSurfaceWithConstraints (ILjava/lang/String;Lcom/facebook/react/bridge/NativeMap;FFFFFFZZ)V
-	public abstract fun startSurfaceWithSurfaceHandler (ILcom/facebook/react/fabric/SurfaceHandlerBinding;Z)V
-	public abstract fun stopSurface (I)V
-	public abstract fun stopSurfaceWithSurfaceHandler (Lcom/facebook/react/fabric/SurfaceHandlerBinding;)V
-	public abstract fun unregister ()V
-}
-
-public final class com/facebook/react/fabric/BindingImpl : com/facebook/react/fabric/Binding {
-	public fun <init> ()V
-	public fun drainPreallocateViewsQueue ()V
-	public fun driveCxxAnimations ()V
-	public fun getInspectorDataForInstance (Lcom/facebook/react/fabric/events/EventEmitterWrapper;)Lcom/facebook/react/bridge/ReadableNativeMap;
-	public fun register (Lcom/facebook/react/bridge/RuntimeExecutor;Lcom/facebook/react/bridge/RuntimeScheduler;Lcom/facebook/react/fabric/FabricUIManager;Lcom/facebook/react/fabric/events/EventBeatManager;Lcom/facebook/react/fabric/ComponentFactory;Lcom/facebook/react/fabric/ReactNativeConfig;)V
-	public fun reportMount (I)V
-	public fun setConstraints (IFFFFFFZZ)V
-	public fun setPixelDensity (F)V
-	public fun startSurface (ILjava/lang/String;Lcom/facebook/react/bridge/NativeMap;)V
-	public fun startSurfaceWithConstraints (ILjava/lang/String;Lcom/facebook/react/bridge/NativeMap;FFFFFFZZ)V
-	public fun startSurfaceWithSurfaceHandler (ILcom/facebook/react/fabric/SurfaceHandlerBinding;Z)V
-	public fun stopSurface (I)V
-	public fun stopSurfaceWithSurfaceHandler (Lcom/facebook/react/fabric/SurfaceHandlerBinding;)V
-	public fun unregister ()V
-}
-
 public final class com/facebook/react/fabric/ComponentFactory {
 	public fun <init> ()V
 }
@@ -2715,7 +2682,7 @@ public class com/facebook/react/fabric/FabricUIManager : com/facebook/react/brid
 	public fun resolveView (I)Landroid/view/View;
 	public fun sendAccessibilityEvent (II)V
 	public fun sendAccessibilityEventFromJS (IILjava/lang/String;)V
-	public fun setBinding (Lcom/facebook/react/fabric/Binding;)V
+	public fun setBinding (Lcom/facebook/react/fabric/FabricUIManagerBinding;)V
 	public fun setJSResponder (IIIZ)V
 	public fun startSurface (Landroid/view/View;Ljava/lang/String;Lcom/facebook/react/bridge/WritableMap;II)I
 	public fun startSurface (Lcom/facebook/react/interfaces/fabric/SurfaceHandler;Landroid/content/Context;Landroid/view/View;)V

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.kt
diff --git a/...es/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/...es/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
@@ -158,7 +158,7 @@ public class FabricUIManager
     FabricSoLoader.staticInit();
   }
 
-  @Nullable private Binding mBinding;
+  @Nullable private FabricUIManagerBinding mBinding;
   @NonNull private final ReactApplicationContext mReactApplicationContext;
   @NonNull private final MountingManager mMountingManager;
   @NonNull private final EventDispatcher mEventDispatcher;
@@ -872,7 +872,7 @@ public void runGuarded() {
     }
   }
 
-  public void setBinding(Binding binding) {
+  public void setBinding(FabricUIManagerBinding binding) {
     mBinding = binding;
   }
 
@@ -1271,7 +1271,7 @@ public void didMountItems(@Nullable List<MountItem> mountItems) {
                   public void run() {
                     mMountNotificationScheduled = false;
 
-                    final @Nullable Binding binding = mBinding;
+                    final @Nullable FabricUIManagerBinding binding = mBinding;
                     if (binding == null || mDestroyed) {
                       mMountedSurfaceIds.clear();
                       return;

diff --git a/.../com/facebook/react/fabric/BindingImpl.kt → ...ok/react/fabric/FabricUIManagerBinding.kt b/.../com/facebook/react/fabric/BindingImpl.kt → ...ok/react/fabric/FabricUIManagerBinding.kt
@@ -8,7 +8,7 @@
 package com.facebook.react.fabric
 
 import android.annotation.SuppressLint
-import com.facebook.jni.HybridData
+import com.facebook.jni.HybridClassBase
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.NativeMap
 import com.facebook.react.bridge.ReadableNativeMap
@@ -21,8 +21,12 @@ import com.facebook.react.uimanager.PixelUtil.getDisplayMetricDensity
 
 @DoNotStrip
 @SuppressLint("MissingNativeLoadLibrary")
-public class BindingImpl : Binding {
-  @DoNotStrip @Suppress("NoHungarianNotation") private val mHybridData: HybridData = initHybrid()
+internal class FabricUIManagerBinding : HybridClassBase() {
+  init {
+    initHybrid()
+  }
+
+  private external fun initHybrid()
 
   private external fun installFabricUIManager(
       runtimeExecutor: RuntimeExecutor,
@@ -33,9 +37,9 @@ public class BindingImpl : Binding {
       reactNativeConfig: Any
   )
 
-  external override fun startSurface(surfaceId: Int, moduleName: String, initialProps: NativeMap)
+  public external fun startSurface(surfaceId: Int, moduleName: String, initialProps: NativeMap)
 
-  external override fun startSurfaceWithConstraints(
+  public external fun startSurfaceWithConstraints(
       surfaceId: Int,
       moduleName: String,
       initialProps: NativeMap,
@@ -49,19 +53,19 @@ public class BindingImpl : Binding {
       doLeftAndRightSwapInRTL: Boolean
   )
 
-  external override fun startSurfaceWithSurfaceHandler(
+  public external fun startSurfaceWithSurfaceHandler(
       surfaceId: Int,
       surfaceHandler: SurfaceHandlerBinding,
       isMountable: Boolean
   )
 
-  external override fun stopSurface(surfaceId: Int)
+  public external fun stopSurface(surfaceId: Int)
 
-  external override fun stopSurfaceWithSurfaceHandler(surfaceHandler: SurfaceHandlerBinding)
+  public external fun stopSurfaceWithSurfaceHandler(surfaceHandler: SurfaceHandlerBinding)
 
-  external override fun setPixelDensity(pointScaleFactor: Float)
+  public external fun setPixelDensity(pointScaleFactor: Float)
 
-  external override fun setConstraints(
+  public external fun setConstraints(
       surfaceId: Int,
       minWidth: Float,
       maxWidth: Float,
@@ -73,17 +77,17 @@ public class BindingImpl : Binding {
       doLeftAndRightSwapInRTL: Boolean
   )
 
-  external override fun driveCxxAnimations()
+  public external fun driveCxxAnimations()
 
-  external override fun drainPreallocateViewsQueue()
+  public external fun drainPreallocateViewsQueue()
 
-  external override fun reportMount(surfaceId: Int)
+  public external fun reportMount(surfaceId: Int)
 
-  external override fun getInspectorDataForInstance(
+  public external fun getInspectorDataForInstance(
       eventEmitterWrapper: EventEmitterWrapper?
   ): ReadableNativeMap?
 
-  override fun register(
+  public fun register(
       runtimeExecutor: RuntimeExecutor,
       runtimeScheduler: RuntimeScheduler,
       fabricUIManager: FabricUIManager,
@@ -104,7 +108,7 @@ public class BindingImpl : Binding {
 
   private external fun uninstallFabricUIManager()
 
-  override fun unregister() {
+  public fun unregister() {
     uninstallFabricUIManager()
   }
 
@@ -113,7 +117,5 @@ public class BindingImpl : Binding {
       FabricSoLoader.staticInit()
       MapBufferSoLoader.staticInit()
     }
-
-    @JvmStatic private external fun initHybrid(): HybridData
   }
 }
diff --git a/...ive/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerProviderImpl.java b/...ive/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerProviderImpl.java
@@ -47,7 +47,7 @@ public UIManager createUIManager(ReactApplicationContext reactApplicationContext
 
     Systrace.beginSection(
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricUIManagerProviderImpl.registerBinding");
-    final Binding binding = new BindingImpl();
+    final FabricUIManagerBinding binding = new FabricUIManagerBinding();
 
     CatalystInstance catalystInstance = reactApplicationContext.getCatalystInstance();
 

diff --git a/...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.java b/...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.java
@@ -40,10 +40,9 @@
 import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec;
 import com.facebook.react.devsupport.StackTraceHelper;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
-import com.facebook.react.fabric.Binding;
-import com.facebook.react.fabric.BindingImpl;
 import com.facebook.react.fabric.ComponentFactory;
 import com.facebook.react.fabric.FabricUIManager;
+import com.facebook.react.fabric.FabricUIManagerBinding;
 import com.facebook.react.fabric.events.EventBeatManager;
 import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler;
 import com.facebook.react.internal.AndroidChoreographerProvider;
@@ -272,7 +271,7 @@ final class ReactInstance {
     // Misc initialization that needs to be done before Fabric init
     DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(mBridgelessReactContext);
 
-    Binding binding = new BindingImpl();
+    FabricUIManagerBinding binding = new FabricUIManagerBinding();
     binding.register(
         getBufferedRuntimeExecutor(),
         getRuntimeScheduler(),