Remove deprecated java code

Reviewed By: AaaChiuuu

Differential Revision: D4233198

fbshipit-source-id: 736d79be266e1b9f2d62e5fe6d901de47123cdc1

ReactAndroid/src/main/java/com/facebook/react/uimanager/FloatUtil.java

@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+package com.facebook.react.uimanager;
+
+public class FloatUtil {
+
+  private static final float EPSILON = .00001f;
+
+  public static boolean floatsEqual(float f1, float f2) {
+    if (Float.isNaN(f1) || Float.isNaN(f2)) {
+      return Float.isNaN(f1) && Float.isNaN(f2);
+    }
+    return Math.abs(f2 - f1) < EPSILON;
+  }
+}

ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java

@@ -14,17 +14,16 @@ import javax.annotation.Nullable;
 import java.util.ArrayList;
 
 import com.facebook.csslayout.CSSAlign;
+import com.facebook.csslayout.CSSEdge;
 import com.facebook.csslayout.CSSConstants;
 import com.facebook.csslayout.CSSDirection;
 import com.facebook.csslayout.CSSFlexDirection;
 import com.facebook.csslayout.CSSJustify;
-import com.facebook.csslayout.CSSLayoutContext;
 import com.facebook.csslayout.CSSNode;
 import com.facebook.csslayout.CSSNodeAPI;
 import com.facebook.csslayout.CSSOverflow;
 import com.facebook.csslayout.CSSPositionType;
 import com.facebook.csslayout.CSSWrap;
-import com.facebook.csslayout.Spacing;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.uimanager.annotations.ReactPropertyHolder;
 
@@ -352,8 +351,8 @@ public class ReactShadowNode {
     return mShouldNotifyOnLayout;
   }
 
-  public void calculateLayout(CSSLayoutContext layoutContext) {
-    mCSSNode.calculateLayout(layoutContext);
+  public void calculateLayout() {
+    mCSSNode.calculateLayout();
   }
 
   public final boolean hasNewLayout() {
@@ -605,11 +604,11 @@ public class ReactShadowNode {
   }
 
   public void setMargin(int spacingType, float margin) {
-    mCSSNode.setMargin(spacingType, margin);
+    mCSSNode.setMargin(CSSEdge.fromInt(spacingType), margin);
   }
 
   public final float getPadding(int spacingType) {
-    return mCSSNode.getPadding(spacingType);
+    return mCSSNode.getPadding(CSSEdge.fromInt(spacingType));
   }
 
   public void setDefaultPadding(int spacingType, float padding) {
@@ -625,40 +624,40 @@ public class ReactShadowNode {
   private void updatePadding() {
     for (int spacingType = Spacing.LEFT; spacingType <= Spacing.ALL; spacingType++) {
       if (spacingType == Spacing.LEFT ||
-        spacingType == Spacing.RIGHT ||
-        spacingType == Spacing.START ||
-        spacingType == Spacing.END) {
+          spacingType == Spacing.RIGHT ||
+          spacingType == Spacing.START ||
+          spacingType == Spacing.END) {
         if (CSSConstants.isUndefined(mPadding.getRaw(spacingType)) &&
           CSSConstants.isUndefined(mPadding.getRaw(Spacing.HORIZONTAL)) &&
           CSSConstants.isUndefined(mPadding.getRaw(Spacing.ALL))) {
-          mCSSNode.setPadding(spacingType, mDefaultPadding.getRaw(spacingType));
+          mCSSNode.setPadding(CSSEdge.fromInt(spacingType), mDefaultPadding.getRaw(spacingType));
         } else {
-          mCSSNode.setPadding(spacingType, mPadding.getRaw(spacingType));
+          mCSSNode.setPadding(CSSEdge.fromInt(spacingType), mPadding.getRaw(spacingType));
         }
       } else if (spacingType == Spacing.TOP || spacingType == Spacing.BOTTOM) {
         if (CSSConstants.isUndefined(mPadding.getRaw(spacingType)) &&
           CSSConstants.isUndefined(mPadding.getRaw(Spacing.VERTICAL)) &&
           CSSConstants.isUndefined(mPadding.getRaw(Spacing.ALL))) {
-          mCSSNode.setPadding(spacingType, mDefaultPadding.getRaw(spacingType));
+          mCSSNode.setPadding(CSSEdge.fromInt(spacingType), mDefaultPadding.getRaw(spacingType));
         } else {
-          mCSSNode.setPadding(spacingType, mPadding.getRaw(spacingType));
+          mCSSNode.setPadding(CSSEdge.fromInt(spacingType), mPadding.getRaw(spacingType));
         }
       } else {
         if (CSSConstants.isUndefined(mPadding.getRaw(spacingType))) {
-          mCSSNode.setPadding(spacingType, mDefaultPadding.getRaw(spacingType));
+          mCSSNode.setPadding(CSSEdge.fromInt(spacingType), mDefaultPadding.getRaw(spacingType));
         } else {
-          mCSSNode.setPadding(spacingType, mPadding.getRaw(spacingType));
+          mCSSNode.setPadding(CSSEdge.fromInt(spacingType), mPadding.getRaw(spacingType));
         }
       }
     }
   }
 
   public void setBorder(int spacingType, float borderWidth) {
-    mCSSNode.setBorder(spacingType, borderWidth);
+    mCSSNode.setBorder(CSSEdge.fromInt(spacingType), borderWidth);
   }
 
   public void setPosition(int spacingType, float position) {
-    mCSSNode.setPosition(spacingType, position);
+    mCSSNode.setPosition(CSSEdge.fromInt(spacingType), position);
   }
 
   public void setPositionType(CSSPositionType positionType) {

ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java

@@ -0,0 +1,192 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+package com.facebook.react.uimanager;
+
+import com.facebook.csslayout.CSSConstants;
+
+import java.util.Arrays;
+
+/**
+ * Class representing CSS spacing (padding, margin, and borders). This is mostly necessary to
+ * properly implement interactions and updates for properties like margin, marginLeft, and
+ * marginHorizontal.
+ */
+public class Spacing {
+
+  /**
+   * Spacing type that represents the left direction. E.g. {@code marginLeft}.
+   */
+  public static final int LEFT = 0;
+  /**
+   * Spacing type that represents the top direction. E.g. {@code marginTop}.
+   */
+  public static final int TOP = 1;
+  /**
+   * Spacing type that represents the right direction. E.g. {@code marginRight}.
+   */
+  public static final int RIGHT = 2;
+  /**
+   * Spacing type that represents the bottom direction. E.g. {@code marginBottom}.
+   */
+  public static final int BOTTOM = 3;
+  /**
+   * Spacing type that represents start direction e.g. left in left-to-right, right in right-to-left.
+   */
+  public static final int START = 4;
+  /**
+   * Spacing type that represents end direction e.g. right in left-to-right, left in right-to-left.
+   */
+  public static final int END = 5;
+  /**
+   * Spacing type that represents horizontal direction (left and right). E.g.
+   * {@code marginHorizontal}.
+   */
+  public static final int HORIZONTAL = 6;
+  /**
+   * Spacing type that represents vertical direction (top and bottom). E.g. {@code marginVertical}.
+   */
+  public static final int VERTICAL = 7;
+  /**
+   * Spacing type that represents all directions (left, top, right, bottom). E.g. {@code margin}.
+   */
+  public static final int ALL = 8;
+
+  private static final int[] sFlagsMap = {
+    1, /*LEFT*/
+    2, /*TOP*/
+    4, /*RIGHT*/
+    8, /*BOTTOM*/
+    16, /*START*/
+    32, /*END*/
+    64, /*HORIZONTAL*/
+    128, /*VERTICAL*/
+    256, /*ALL*/
+  };
+
+  private final float[] mSpacing = newFullSpacingArray();
+  private int mValueFlags = 0;
+  private float mDefaultValue;
+  private boolean mHasAliasesSet;
+
+  public Spacing() {
+    this(0);
+  }
+
+  public Spacing(float defaultValue) {
+    mDefaultValue = defaultValue;
+  }
+
+  /**
+   * Set a spacing value.
+   *
+   * @param spacingType one of {@link #LEFT}, {@link #TOP}, {@link #RIGHT}, {@link #BOTTOM},
+   *        {@link #VERTICAL}, {@link #HORIZONTAL}, {@link #ALL}
+   * @param value the value for this direction
+   * @return {@code true} if the spacing has changed, or {@code false} if the same value was already
+   *         set
+   */
+  public boolean set(int spacingType, float value) {
+    if (!FloatUtil.floatsEqual(mSpacing[spacingType], value)) {
+      mSpacing[spacingType] = value;
+
+      if (CSSConstants.isUndefined(value)) {
+        mValueFlags &= ~sFlagsMap[spacingType];
+      } else {
+        mValueFlags |= sFlagsMap[spacingType];
+      }
+
+      mHasAliasesSet =
+          (mValueFlags & sFlagsMap[ALL]) != 0 ||
+          (mValueFlags & sFlagsMap[VERTICAL]) != 0 ||
+          (mValueFlags & sFlagsMap[HORIZONTAL]) != 0;
+
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Get the spacing for a direction. This takes into account any default values that have been set.
+   *
+   * @param spacingType one of {@link #LEFT}, {@link #TOP}, {@link #RIGHT}, {@link #BOTTOM}
+   */
+  public float get(int spacingType) {
+    float defaultValue = (spacingType == START || spacingType == END
+        ? CSSConstants.UNDEFINED
+        : mDefaultValue);
+
+    if (mValueFlags == 0) {
+      return defaultValue;
+    }
+
+    if ((mValueFlags & sFlagsMap[spacingType]) != 0) {
+      return mSpacing[spacingType];
+    }
+
+    if (mHasAliasesSet) {
+      int secondType = spacingType == TOP || spacingType == BOTTOM ? VERTICAL : HORIZONTAL;
+      if ((mValueFlags & sFlagsMap[secondType]) != 0) {
+        return mSpacing[secondType];
+      } else if ((mValueFlags & sFlagsMap[ALL]) != 0) {
+        return mSpacing[ALL];
+      }
+    }
+
+    return defaultValue;
+  }
+
+  /**
+   * Get the raw value (that was set using {@link #set(int, float)}), without taking into account
+   * any default values.
+   *
+   * @param spacingType one of {@link #LEFT}, {@link #TOP}, {@link #RIGHT}, {@link #BOTTOM},
+   *        {@link #VERTICAL}, {@link #HORIZONTAL}, {@link #ALL}
+   */
+  public float getRaw(int spacingType) {
+    return mSpacing[spacingType];
+  }
+
+  /**
+   * Resets the spacing instance to its default state. This method is meant to be used when
+   * recycling {@link Spacing} instances.
+   */
+  public void reset() {
+    Arrays.fill(mSpacing, CSSConstants.UNDEFINED);
+    mHasAliasesSet = false;
+    mValueFlags = 0;
+  }
+
+  /**
+   * Try to get start value and fallback to given type if not defined. This is used privately
+   * by the layout engine as a more efficient way to fetch direction-aware values by
+   * avoid extra method invocations.
+   */
+  float getWithFallback(int spacingType, int fallbackType) {
+    return
+        (mValueFlags & sFlagsMap[spacingType]) != 0
+            ? mSpacing[spacingType]
+            : get(fallbackType);
+  }
+
+  private static float[] newFullSpacingArray() {
+    return new float[] {
+        CSSConstants.UNDEFINED,
+        CSSConstants.UNDEFINED,
+        CSSConstants.UNDEFINED,
+        CSSConstants.UNDEFINED,
+        CSSConstants.UNDEFINED,
+        CSSConstants.UNDEFINED,
+        CSSConstants.UNDEFINED,
+        CSSConstants.UNDEFINED,
+        CSSConstants.UNDEFINED,
+    };
+  }
+}

ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java

@@ -14,7 +14,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.facebook.common.logging.FLog;
-import com.facebook.csslayout.CSSLayoutContext;
 import com.facebook.csslayout.CSSDirection;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.animation.Animation;
@@ -40,7 +39,6 @@ public class UIImplementation {
 
   private final ShadowNodeRegistry mShadowNodeRegistry = new ShadowNodeRegistry();
   private final ViewManagerRegistry mViewManagers;
-  private final CSSLayoutContext mLayoutContext = new CSSLayoutContext();
   private final UIViewOperationQueue mOperationsQueue;
   private final NativeViewHierarchyOptimizer mNativeViewHierarchyOptimizer;
   private final int[] mMeasureBuffer = new int[4];
@@ -767,7 +765,7 @@ public class UIImplementation {
         .flush();
     double startTime = (double) System.nanoTime();
     try {
-      cssRoot.calculateLayout(mLayoutContext);
+      cssRoot.calculateLayout();
     } finally {
       Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
       mLayoutTimer = mLayoutTimer + ((double)System.nanoTime() - startTime)/ 1000000000.0;

ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java

@@ -12,8 +12,6 @@ package com.facebook.react.uimanager;
 import java.util.Arrays;
 import java.util.HashSet;
 
-import com.facebook.csslayout.Spacing;
-
 /**
  * Keys for props that need to be shared across multiple classes.
  */

ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java

@@ -31,7 +31,6 @@ import android.graphics.drawable.Drawable;
 
 import com.facebook.common.util.UriUtil;
 import com.facebook.csslayout.CSSConstants;
-import com.facebook.csslayout.FloatUtil;
 import com.facebook.drawee.controller.AbstractDraweeControllerBuilder;
 import com.facebook.drawee.controller.BaseControllerListener;
 import com.facebook.drawee.controller.ControllerListener;
@@ -51,6 +50,7 @@ import com.facebook.imagepipeline.request.Postprocessor;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.FloatUtil;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;

ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java

@@ -35,7 +35,6 @@ import com.facebook.csslayout.CSSConstants;
 import com.facebook.csslayout.CSSMeasureMode;
 import com.facebook.csslayout.CSSNodeAPI;
 import com.facebook.csslayout.MeasureOutput;
-import com.facebook.csslayout.Spacing;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReadableMap;
@@ -43,6 +42,7 @@ import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.ReactShadowNode;
+import com.facebook.react.uimanager.Spacing;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactShadowNode;
 import com.facebook.react.uimanager.UIViewOperationQueue;

ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java

@@ -17,12 +17,12 @@ import android.view.Gravity;
 import android.widget.TextView;
 
 import com.facebook.csslayout.CSSConstants;
-import com.facebook.csslayout.Spacing;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.annotations.ReactProp;
+import com.facebook.react.uimanager.Spacing;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewDefaults;
 import com.facebook.react.uimanager.ViewProps;

ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java

@@ -29,7 +29,6 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
 
 import com.facebook.csslayout.CSSConstants;
-import com.facebook.csslayout.Spacing;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReactContext;
@@ -40,6 +39,7 @@ import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.PixelUtil;
+import com.facebook.react.uimanager.Spacing;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewDefaults;

ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java

@@ -20,10 +20,10 @@ import com.facebook.csslayout.CSSDirection;
 import com.facebook.csslayout.CSSMeasureMode;
 import com.facebook.csslayout.CSSNodeAPI;
 import com.facebook.csslayout.MeasureOutput;
-import com.facebook.csslayout.Spacing;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.uimanager.PixelUtil;
+import com.facebook.react.uimanager.Spacing;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIViewOperationQueue;
 import com.facebook.react.uimanager.ViewDefaults;

ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java

@@ -27,10 +27,10 @@ import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 
-import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.csslayout.CSSConstants;
-import com.facebook.csslayout.FloatUtil;
-import com.facebook.csslayout.Spacing;
+import com.facebook.react.common.annotations.VisibleForTesting;
+import com.facebook.react.uimanager.FloatUtil;
+import com.facebook.react.uimanager.Spacing;
 
 /**
  * A subclass of {@link Drawable} used for background of {@link ReactViewGroup}. It supports

ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java

@@ -20,7 +20,6 @@ import android.os.Build;
 import android.view.View;
 
 import com.facebook.csslayout.CSSConstants;
-import com.facebook.csslayout.Spacing;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
@@ -29,6 +28,7 @@ import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.PointerEvents;
+import com.facebook.react.uimanager.Spacing;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.ViewProps;