Pass LayoutStateFuture to ComponentContext

Summary: We'll need this to inquire during resolving a layout whether the current LayoutStateFuture has been cancelled. Reviewed By: pasqualeanatriello Differential Revision: D14748110 fbshipit-source-id: ad9a529078f31cdf7421837e7f61c58a5d1f3d92
dsyang · Apr 5, 2019 · 28a6e3b · 28a6e3b
1 parent 418066c
commit 28a6e3b
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 8 deletions.
diff --git a/litho-core/src/main/java/com/facebook/litho/ComponentContext.java b/litho-core/src/main/java/com/facebook/litho/ComponentContext.java
@@ -77,6 +77,8 @@ public interface YogaNodeFactory {
   @ThreadConfined(ThreadConfined.ANY)
   private int mDefStyleAttr = 0;
 
+  private ComponentTree.LayoutStateFuture mLayoutStateFuture;
+
   public ComponentContext(
       Context context,
       @Nullable String logTag,
@@ -104,7 +106,8 @@ public ComponentContext(
       ComponentContext context,
       @Nullable StateHandler stateHandler,
       @Nullable KeyHandler keyHandler,
-      @Nullable TreeProps treeProps) {
+      @Nullable TreeProps treeProps,
+      @Nullable ComponentTree.LayoutStateFuture layoutStateFuture) {
 
     mContext = context.getAndroidContext();
     mResourceCache = context.mResourceCache;
@@ -122,6 +125,7 @@ public ComponentContext(
     mStateHandler = stateHandler != null ? stateHandler : context.mStateHandler;
     mKeyHandler = keyHandler != null ? keyHandler : context.mKeyHandler;
     mTreeProps = treeProps != null ? treeProps : context.mTreeProps;
+    mLayoutStateFuture = layoutStateFuture == null ? context.mLayoutStateFuture : layoutStateFuture;
   }
 
   public ComponentContext(
@@ -163,7 +167,12 @@ public ComponentContext(Context context, YogaNodeFactory yogaNodeFactory) {
   }
 
   public ComponentContext(ComponentContext context) {
-    this(context, context.mStateHandler, context.mKeyHandler, context.mTreeProps);
+    this(
+        context,
+        context.mStateHandler,
+        context.mKeyHandler,
+        context.mTreeProps,
+        context.mLayoutStateFuture);
   }
 
   public ComponentContext(Context context) {
@@ -446,7 +455,7 @@ void applyStyle(InternalNode node, @AttrRes int defStyleAttr, @StyleRes int defS
 
   static ComponentContext withComponentTree(ComponentContext context, ComponentTree componentTree) {
     ComponentContext componentContext =
-        new ComponentContext(context, new StateHandler(), null, null);
+        new ComponentContext(context, new StateHandler(), null, null, null);
     componentContext.mComponentTree = componentTree;
 
     return componentContext;

diff --git a/litho-core/src/main/java/com/facebook/litho/ComponentTree.java b/litho-core/src/main/java/com/facebook/litho/ComponentTree.java
@@ -171,6 +171,7 @@ public void run() {
 
   private final boolean mUseSharedLayoutStateFuture;
   private final Object mLayoutStateFutureLock = new Object();
+  private final boolean mUseCancelableLayoutFutures;
 
   @GuardedBy("mLayoutStateFutureLock")
   private final List<LayoutStateFuture> mLayoutStateFutures = new ArrayList<>();
@@ -278,6 +279,7 @@ protected ComponentTree(Builder builder) {
     mNestedTreeResolutionExperimentEnabled = builder.nestedTreeResolutionExperimentEnabled;
     mUseSharedLayoutStateFuture = builder.useSharedLayoutStateFuture;
     mIsPersistenceEnabled = builder.isPersistenceEnabled;
+    mUseCancelableLayoutFutures = ComponentsConfiguration.useCancelableLayoutFutures;
 
     ensureLayoutThreadHandler();
 
@@ -2038,7 +2040,8 @@ public void handleMessage(Message msg) {
           previousLayoutState,
           treeProps,
           source,
-          extraAttribution);
+          extraAttribution,
+          null);
     }
   }
 
@@ -2051,7 +2054,8 @@ private LayoutState calculateLayoutStateInternal(
       @Nullable LayoutState previousLayoutState,
       @Nullable TreeProps treeProps,
       @CalculateLayoutSource int source,
-      @Nullable String extraAttribution) {
+      @Nullable String extraAttribution,
+      @Nullable LayoutStateFuture layoutStateFuture) {
     final ComponentContext contextWithStateHandler;
 
     synchronized (this) {
@@ -2062,7 +2066,11 @@ private LayoutState calculateLayoutStateInternal(
 
       contextWithStateHandler =
           new ComponentContext(
-              context, StateHandler.createNewInstance(mStateHandler), keyHandler, treeProps);
+              context,
+              StateHandler.createNewInstance(mStateHandler),
+              keyHandler,
+              treeProps,
+              layoutStateFuture);
     }
 
     return LayoutState.calculate(
@@ -2142,7 +2150,10 @@ private LayoutStateFuture(
                           previousLayoutState,
                           treeProps,
                           source,
-                          extraAttribution);
+                          extraAttribution,
+                          ComponentTree.this.mUseSharedLayoutStateFuture
+                              ? LayoutStateFuture.this
+                              : null);
                   synchronized (LayoutStateFuture.this) {
                     if (released) {
                       return null;
@@ -2163,6 +2174,10 @@ private synchronized void release() {
       released = true;
     }
 
+    boolean isReleased() {
+      return released;
+    }
+
     void unregisterForResponse() {
       refCount--;
 

diff --git a/litho-core/src/main/java/com/facebook/litho/TestComponentContext.java b/litho-core/src/main/java/com/facebook/litho/TestComponentContext.java
@@ -30,7 +30,7 @@ class TestComponentContext extends ComponentContext {
   }
 
   TestComponentContext(ComponentContext c, StateHandler stateHandler) {
-    super(c, stateHandler, null, null);
+    super(c, stateHandler, null, null, null);
   }
 
   @Override

diff --git a/litho-core/src/main/java/com/facebook/litho/config/ComponentsConfiguration.java b/litho-core/src/main/java/com/facebook/litho/config/ComponentsConfiguration.java
@@ -208,6 +208,8 @@ public class ComponentsConfiguration {
   /** If true, information about RenderInfos will be passed to Flipper's layout inspector. */
   public static boolean enableRenderInfoDebugging = false;
 
+  public static boolean useCancelableLayoutFutures;
+
   public static boolean isRenderInfoDebuggingEnabled() {
     return isDebugModeEnabled && enableRenderInfoDebugging;
   }