From d8748233ca0f42a63c39de8c3a2d84c5c6307c03 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Tue, 7 Feb 2017 13:59:17 -0800
Subject: [PATCH] Removing `transformMatrix` and `decomposedMatrix` properties

Summary: We deprecated `transformMatrix` and `decomposedMatrix` in D3239960 10 months ago. This revision finally removes remains of this functionality from native code.

Reviewed By: mmmulani

Differential Revision: D4515760

fbshipit-source-id: b4d5b7e834ac4a775f4992b28270b4ff961889a6
---
 Libraries/Components/View/ReactNativeStyleAttributes.js  | 5 -----
 React/Views/RCTViewManager.m                             | 9 ++-------
 .../java/com/facebook/react/flat/FlatShadowNode.java     | 4 +---
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/Libraries/Components/View/ReactNativeStyleAttributes.js b/Libraries/Components/View/ReactNativeStyleAttributes.js
index 1e91b1ef265..fd26f396995 100644
--- a/Libraries/Components/View/ReactNativeStyleAttributes.js
+++ b/Libraries/Components/View/ReactNativeStyleAttributes.js
@@ -17,7 +17,6 @@ var TextStylePropTypes = require('TextStylePropTypes');
 var ViewStylePropTypes = require('ViewStylePropTypes');
 
 var keyMirror = require('fbjs/lib/keyMirror');
-var matricesDiffer = require('matricesDiffer');
 var processColor = require('processColor');
 var processTransform = require('processTransform');
 var sizesDiffer = require('sizesDiffer');
@@ -29,12 +28,8 @@ var ReactNativeStyleAttributes = {
 };
 
 ReactNativeStyleAttributes.transform = { process: processTransform };
-ReactNativeStyleAttributes.transformMatrix = { diff: matricesDiffer };
 ReactNativeStyleAttributes.shadowOffset = { diff: sizesDiffer };
 
-// Do not rely on this attribute.
-ReactNativeStyleAttributes.decomposedMatrix = 'decomposedMatrix';
-
 var colorAttributes = { process: processColor };
 ReactNativeStyleAttributes.backgroundColor = colorAttributes;
 ReactNativeStyleAttributes.borderBottomColor = colorAttributes;
diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m
index 30143b385d2..c743c7865c1 100644
--- a/React/Views/RCTViewManager.m
+++ b/React/Views/RCTViewManager.m
@@ -138,19 +138,14 @@ RCT_CUSTOM_VIEW_PROPERTY(shouldRasterizeIOS, BOOL, RCTView)
   view.layer.shouldRasterize = json ? [RCTConvert BOOL:json] : defaultView.layer.shouldRasterize;
   view.layer.rasterizationScale = view.layer.shouldRasterize ? [UIScreen mainScreen].scale : defaultView.layer.rasterizationScale;
 }
-// TODO: t11041683 Remove this duplicate property name.
-RCT_CUSTOM_VIEW_PROPERTY(transformMatrix, CATransform3D, RCTView)
-{
-  view.layer.transform = json ? [RCTConvert CATransform3D:json] : defaultView.layer.transform;
-  // TODO: Improve this by enabling edge antialiasing only for transforms with rotation or skewing
-  view.layer.allowsEdgeAntialiasing = !CATransform3DIsIdentity(view.layer.transform);
-}
+
 RCT_CUSTOM_VIEW_PROPERTY(transform, CATransform3D, RCTView)
 {
   view.layer.transform = json ? [RCTConvert CATransform3D:json] : defaultView.layer.transform;
   // TODO: Improve this by enabling edge antialiasing only for transforms with rotation or skewing
   view.layer.allowsEdgeAntialiasing = !CATransform3DIsIdentity(view.layer.transform);
 }
+
 RCT_CUSTOM_VIEW_PROPERTY(pointerEvents, RCTPointerEvents, RCTView)
 {
   if ([view respondsToSelector:@selector(setPointerEvents:)]) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
index e8ec9afc5a4..450dafd19cf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
@@ -30,7 +30,6 @@ import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
 
   /* package */ static final FlatShadowNode[] EMPTY_ARRAY = new FlatShadowNode[0];
 
-  private static final String PROP_DECOMPOSED_MATRIX = "decomposedMatrix";
   private static final String PROP_OPACITY = "opacity";
   private static final String PROP_RENDER_TO_HARDWARE_TEXTURE = "renderToHardwareTextureAndroid";
   private static final String PROP_ACCESSIBILITY_LABEL = "accessibilityLabel";
@@ -88,8 +87,7 @@ import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
   /* package */ void handleUpdateProperties(ReactStylesDiffMap styles) {
     if (!mountsToView()) {
       // Make sure we mount this FlatShadowNode to a View if any of these properties are present.
-      if (styles.hasKey(PROP_DECOMPOSED_MATRIX) ||
-          styles.hasKey(PROP_OPACITY) ||
+      if (styles.hasKey(PROP_OPACITY) ||
           styles.hasKey(PROP_RENDER_TO_HARDWARE_TEXTURE) ||
           styles.hasKey(PROP_TEST_ID) ||
           styles.hasKey(PROP_ACCESSIBILITY_LABEL) ||