From 651ca3bc9fc7710a79d1209334d4bd4dad452fbf Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Mon, 20 May 2019 15:36:56 -0700
Subject: [PATCH] Refactor RootTag -> surfaceId

Summary:
Quick diff to refactor RootTag for surfaceId in Binding.cpp class
This is the first diff to start moving away from rootTag naming in Fabric

Reviewed By: JoshuaGross

Differential Revision: D15421770

fbshipit-source-id: 7bca7782f96be3d7148ee93f5d5a3a54e0d768dd
---
 .../main/java/com/facebook/react/fabric/jsi/Binding.java  | 2 +-
 .../java/com/facebook/react/fabric/jsi/jni/Binding.cpp    | 8 ++++----
 .../main/java/com/facebook/react/fabric/jsi/jni/Binding.h | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/Binding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/Binding.java
index b3346ecf9b3..441e9809110 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/Binding.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/Binding.java
@@ -49,7 +49,7 @@ public class Binding {
   public native void setPixelDensity(float pointScaleFactor);
 
   public native void setConstraints(
-      int rootTag, float minWidth, float maxWidth, float minHeight, float maxHeight);
+      int surfaceId, float minWidth, float maxWidth, float minHeight, float maxHeight);
 
   public void register(
        JavaScriptContextHolder jsContext,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp
index 4bc1df5c249..daf0fd20e47 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp
@@ -67,7 +67,7 @@ void Binding::stopSurface(jint surfaceId) {
 }
 
 void Binding::setConstraints(
-    jint rootTag,
+    jint surfaceId,
     jfloat minWidth,
     jfloat maxWidth,
     jfloat minHeight,
@@ -84,7 +84,7 @@ void Binding::setConstraints(
     constraints.minimumSize = minimumSize;
     constraints.maximumSize = maximumSize;
 
-    scheduler_->constraintSurfaceLayout(rootTag, constraints, context);
+    scheduler_->constraintSurfaceLayout(surfaceId, constraints, context);
   }
 }
 
@@ -329,7 +329,7 @@ local_ref<JMountItem::javaobject> createDeleteMountItem(
 local_ref<JMountItem::javaobject> createCreateMountItem(
     const jni::global_ref<jobject>& javaUIManager,
     const ShadowViewMutation& mutation,
-    const Tag rootTag) {
+    const Tag surfaceId) {
   static auto createJavaInstruction =
       jni::findClassStatic(UIManagerJavaDescriptor)
           ->getMethod<alias_ref<JMountItem>(jstring, jint, jint, jboolean)>(
@@ -345,7 +345,7 @@ local_ref<JMountItem::javaobject> createCreateMountItem(
   return createJavaInstruction(
       javaUIManager,
       componentName.get(),
-      rootTag,
+      surfaceId,
       newChildShadowView.tag,
       isLayoutable);
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.h
index e61b5c1ceba..d082e78f285 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.h
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.h
@@ -34,7 +34,7 @@ class Binding : public jni::HybridClass<Binding>, public SchedulerDelegate {
 
  private:
   void setConstraints(
-      jint rootTag,
+      jint surfaceId,
       jfloat minWidth,
       jfloat maxWidth,
       jfloat minHeight,