From b461c70b7672292d9991dc13bd9d8ee966cc6e56 Mon Sep 17 00:00:00 2001
From: Denis Koroskin <dkoroskin@fb.com>
Date: Wed, 17 Feb 2016 11:53:20 -0800
Subject: [PATCH] Fix StateBuilder incorrectly casting a child to
 FlatShadowNode

Summary: Not every CSSNode in a hierarchy is a FlatShadowNode, some virtual nodes can be ReactShadowNodes for compatibility with ART nodes. This diff fixes StateBuilder unconditionally casting a node to FlatShadowNode, which is causing a crash in Groups.

Reviewed By: nickholub

Differential Revision: D2941031
---
 .../main/java/com/facebook/react/flat/StateBuilder.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java
index ff0480127..a6682cd9a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java
@@ -13,9 +13,9 @@ import javax.annotation.Nullable;
 
 import java.util.ArrayList;
 
-import com.facebook.csslayout.CSSNode;
 import com.facebook.csslayout.Spacing;
 import com.facebook.react.uimanager.OnLayoutEvent;
+import com.facebook.react.uimanager.ReactShadowNode;
 import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.events.EventDispatcher;
 
@@ -387,14 +387,14 @@ import com.facebook.react.uimanager.events.EventDispatcher;
     node.collectState(this, left, top, right, bottom, clipLeft, clipTop, clipRight, clipBottom);
 
     for (int i = 0, childCount = node.getChildCount(); i != childCount; ++i) {
-      FlatShadowNode child = (FlatShadowNode) node.getChildAt(i);
+      ReactShadowNode child = node.getChildAt(i);
       if (child.isVirtual()) {
         markLayoutSeenRecursively(child);
         continue;
       }
 
       processNodeAndCollectState(
-          child,
+          (FlatShadowNode) child,
           left,
           top,
           clipLeft,
@@ -406,7 +406,7 @@ import com.facebook.react.uimanager.events.EventDispatcher;
     }
   }
 
-  private void markLayoutSeenRecursively(CSSNode node) {
+  private void markLayoutSeenRecursively(ReactShadowNode node) {
     if (node.hasNewLayout()) {
       node.markLayoutSeen();
     }