From 1f3e4df6a7d42d8a6060d1a21949159a7a90d826 Mon Sep 17 00:00:00 2001 From: Aditya Sharat Date: Mon, 10 Jun 2019 06:52:54 -0700 Subject: [PATCH] Back out "[litho] Adds check to unset a YogaNode's parent during reconciliation." Summary: Removes `unsetOwner` from Yoga. This was temporarily for patching a crash. Reviewed By: colriot Differential Revision: D15737613 fbshipit-source-id: 8ab93ecf7ffb913df6207fe5db47a8cc93eded2c --- ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java | 2 -- .../src/main/java/com/facebook/yoga/YogaNodeJNIBase.java | 5 ----- 2 files changed, 7 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java index 9a8e19663fd..a01a0bdde49 100644 --- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java +++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java @@ -42,8 +42,6 @@ public abstract class YogaNode { @Nullable public abstract YogaNode getOwner(); - public abstract void unsetOwner(); - /** @deprecated Use #getOwner() instead. This will be removed in the next version. */ @Deprecated @Nullable diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java index 0e1f68c8e97..c48162f4a47 100644 --- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java +++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java @@ -137,11 +137,6 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable { return mOwner; } - @Override - public void unsetOwner() { - mOwner = null; - } - /** @deprecated Use #getOwner() instead. This will be removed in the next version. */ @Deprecated @Nullable