Reverting the dirty child optimization

Reviewed By: emilsjolander Differential Revision: D6203290 fbshipit-source-id: 8e42abb70e55f0fac90faaa21ecdbe0fbb76ce6b
shaundon · Nov 1, 2017 · 0230672 · 0230672
1 parent 1dca01b
commit 0230672
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 70 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
@@ -82,8 +82,6 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
 
   boolean isDirty();
 
-  boolean hasDirtyDescendants();
-
   void addChildAt(T child, int i);
 
   T removeChildAt(int i);

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -134,7 +134,7 @@ public final String getViewClass() {
 
   @Override
   public final boolean hasUpdates() {
-    return mNodeUpdated || hasNewLayout() || isDirty() || hasDirtyDescendants();
+    return mNodeUpdated || hasNewLayout() || isDirty();
   }
 
   @Override
@@ -174,11 +174,6 @@ public final boolean isDirty() {
     return mYogaNode != null && mYogaNode.isDirty();
   }
 
-  @Override
-  public boolean hasDirtyDescendants() {
-    return mYogaNode != null && mYogaNode.hasDirtyDescendants();
-  }
-
   @Override
   public void addChildAt(ReactShadowNodeImpl child, int i) {
     if (child.getParent() != null) {

diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
@@ -9,11 +9,13 @@
 
 package com.facebook.yoga;
 
+import javax.annotation.Nullable;
+
+import java.util.List;
+import java.util.ArrayList;
+
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.soloader.SoLoader;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Nullable;
 
 @DoNotStrip
 public class YogaNode {
@@ -196,12 +198,6 @@ public boolean isDirty() {
     return jni_YGNodeIsDirty(mNativePointer);
   }
 
-  private native boolean jni_YGNodeHasDirtyDescendants(long nativePointer);
-
-  public boolean hasDirtyDescendants() {
-    return jni_YGNodeHasDirtyDescendants(mNativePointer);
-  }
-
   private native void jni_YGNodeCopyStyle(long dstNativePointer, long srcNativePointer);
   public void copyStyle(YogaNode srcNode) {
     jni_YGNodeCopyStyle(mNativePointer, srcNode.mNativePointer);

diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
@@ -249,10 +249,6 @@ jboolean jni_YGNodeIsDirty(alias_ref<jobject>, jlong nativePointer) {
   return (jboolean) YGNodeIsDirty(_jlong2YGNodeRef(nativePointer));
 }
 
-jboolean jni_YGNodeHasDirtyDescendants(alias_ref<jobject>, jlong nativePointer) {
-  return (jboolean) YGNodeHasDirtyDescendants(_jlong2YGNodeRef(nativePointer));
-}
-
 void jni_YGNodeSetHasMeasureFunc(alias_ref<jobject>, jlong nativePointer, jboolean hasMeasureFunc) {
   YGNodeSetMeasureFunc(_jlong2YGNodeRef(nativePointer), hasMeasureFunc ? YGJNIMeasureFunc : NULL);
 }
@@ -457,7 +453,6 @@ jint JNI_OnLoad(JavaVM *vm, void *) {
                         YGMakeNativeMethod(jni_YGNodeCalculateLayout),
                         YGMakeNativeMethod(jni_YGNodeMarkDirty),
                         YGMakeNativeMethod(jni_YGNodeIsDirty),
-                        YGMakeNativeMethod(jni_YGNodeHasDirtyDescendants),
                         YGMakeNativeMethod(jni_YGNodeSetHasMeasureFunc),
                         YGMakeNativeMethod(jni_YGNodeSetHasBaselineFunc),
                         YGMakeNativeMethod(jni_YGNodeCopyStyle),

diff --git a/ReactCommon/yoga/yoga/Yoga.c b/ReactCommon/yoga/yoga/Yoga.c
@@ -123,7 +123,6 @@ typedef struct YGNode {
   void *context;
 
   bool isDirty;
-  bool hasDirtyDescendants;
   bool hasNewLayout;
   YGNodeType nodeType;
 
@@ -163,7 +162,6 @@ static const YGNode gYGNodeDefaults = {
     .children = NULL,
     .hasNewLayout = true,
     .isDirty = false,
-    .hasDirtyDescendants = false,
     .nodeType = YGNodeTypeDefault,
     .resolvedDimensions = {[YGDimensionWidth] = &YGValueUndefined,
                            [YGDimensionHeight] = &YGValueUndefined},
@@ -240,8 +238,6 @@ static YGConfig gYGConfigDefaults = {
 };
 
 static void YGNodeMarkDirtyInternal(const YGNodeRef node);
-static bool YGNodeIsLayoutBoundary(const YGNodeRef node);
-static void YGNodeMarkHasDirtyDescendants(const YGNodeRef node);
 
 YGMalloc gYGMalloc = &malloc;
 YGCalloc gYGCalloc = &calloc;
@@ -456,33 +452,16 @@ void YGConfigCopy(const YGConfigRef dest, const YGConfigRef src) {
   memcpy(dest, src, sizeof(YGConfig));
 }
 
-static void YGNodeMarkHasDirtyDescendants(const YGNodeRef node) {
-  if (node && !node->hasDirtyDescendants) {
-    node->hasDirtyDescendants = true;
-    YGNodeMarkHasDirtyDescendants(node->parent);
-  }
-}
-
 static void YGNodeMarkDirtyInternal(const YGNodeRef node) {
   if (!node->isDirty) {
     node->isDirty = true;
     node->layout.computedFlexBasis = YGUndefined;
     if (node->parent) {
-      if (YGNodeIsLayoutBoundary(node->parent)) {
-        node->parent->isDirty = true; // Because parent lays out the child
-        node->parent->layout.computedFlexBasis = YGUndefined;
-        YGNodeMarkHasDirtyDescendants(node->parent);
-      } else {
-        YGNodeMarkDirtyInternal(node->parent);
-      }
+      YGNodeMarkDirtyInternal(node->parent);
     }
   }
 }
 
-static bool YGNodeIsLayoutBoundary(const YGNodeRef node) {
-  return YGNodeStyleGetPositionType(node) == YGPositionTypeAbsolute;
-}
-
 void YGNodeSetMeasureFunc(const YGNodeRef node, YGMeasureFunc measureFunc) {
   if (measureFunc == NULL) {
     node->measure = NULL;
@@ -649,10 +628,6 @@ bool YGNodeIsDirty(const YGNodeRef node) {
   return node->isDirty;
 }
 
-bool YGNodeHasDirtyDescendants(const YGNodeRef node) {
-  return node->hasDirtyDescendants;
-}
-
 void YGNodeCopyStyle(const YGNodeRef dstNode, const YGNodeRef srcNode) {
   if (memcmp(&dstNode->style, &srcNode->style, sizeof(YGStyle)) != 0) {
     memcpy(&dstNode->style, &srcNode->style, sizeof(YGStyle));
@@ -3431,6 +3406,7 @@ bool YGLayoutNodeInternal(const YGNodeRef node,
                           const char *reason,
                           const YGConfigRef config) {
   YGLayout *layout = &node->layout;
+
   gDepth++;
 
   const bool needToVisitNode =
@@ -3522,26 +3498,6 @@ bool YGLayoutNodeInternal(const YGNodeRef node,
   if (!needToVisitNode && cachedResults != NULL) {
     layout->measuredDimensions[YGDimensionWidth] = cachedResults->computedWidth;
     layout->measuredDimensions[YGDimensionHeight] = cachedResults->computedHeight;
-    if (YGNodeHasDirtyDescendants(node)) {
-        const uint32_t childCount = YGNodeListCount(node->children);
-        for (uint32_t i = 0; i < childCount; ++i) {
-          const YGNodeRef child = YGNodeListGet(node->children, i);
-          if (child->isDirty || YGNodeHasDirtyDescendants(child)) {
-            YGLayoutNodeInternal(child,
-                                child->layout.cachedLayout.availableWidth,
-                                child->layout.cachedLayout.availableHeight,
-                                child->layout.direction,
-                                child->layout.cachedLayout.widthMeasureMode,
-                                child->layout.cachedLayout.heightMeasureMode,
-                                cachedResults->computedWidth,
-                                cachedResults->computedHeight,
-                                performLayout,
-                                "layout",
-                                child->config
-                              );
-                          }
-        }
-      }
 
     if (gPrintChanges && gPrintSkips) {
       printf("%s%d.{[skipped] ", YGSpacer(gDepth), gDepth);
@@ -3629,7 +3585,6 @@ bool YGLayoutNodeInternal(const YGNodeRef node,
     node->layout.dimensions[YGDimensionHeight] = node->layout.measuredDimensions[YGDimensionHeight];
     node->hasNewLayout = true;
     node->isDirty = false;
-    node->hasDirtyDescendants = false;
   }
 
   gDepth--;

diff --git a/ReactCommon/yoga/yoga/Yoga.h b/ReactCommon/yoga/yoga/Yoga.h
@@ -101,7 +101,6 @@ WIN_EXPORT void YGNodeCalculateLayout(const YGNodeRef node,
 // marking manually.
 WIN_EXPORT void YGNodeMarkDirty(const YGNodeRef node);
 WIN_EXPORT bool YGNodeIsDirty(const YGNodeRef node);
-WIN_EXPORT bool YGNodeHasDirtyDescendants(const YGNodeRef node);
 
 WIN_EXPORT void YGNodePrint(const YGNodeRef node, const YGPrintOptions options);