Revert "[ASDisplayNode] Don't force a layout pass on a visible node t…

…hat enters preload state (TextureGroup#751)" This reverts commit 2e98588.
nguyenhuy · Jan 31, 2018 · 4b0e32d · 4b0e32d
1 parent fef965f
commit 4b0e32d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,7 @@
 - [ASScrollNode] Ensure the node respects the given size range while calculating its layout. [#637](https://github.com/TextureGroup/Texture/pull/637) [Huy Nguyen](https://github.com/nguyenhuy)
 - [ASScrollNode] Invalidate the node's calculated layout if its scrollable directions changed. Also add unit tests for the class. [#637](https://github.com/TextureGroup/Texture/pull/637) [Huy Nguyen](https://github.com/nguyenhuy)
 - Add new unit testing to the layout engine. [Adlai Holler](https://github.com/Adlai-Holler) [#424](https://github.com/TextureGroup/Texture/pull/424)
-- [Automatic Subnode Management] Nodes with ASM enabled now insert/delete their subnodes as soon as they enter preload state, so subnodes can start preloading right away. [Huy Nguyen](https://github.com/nguyenhuy) [#706](https://github.com/TextureGroup/Texture/pull/706) [#751](https://github.com/TextureGroup/Texture/pull/751)
+- [Automatic Subnode Management] Nodes with ASM enabled now insert/delete their subnodes as soon as they enter preload state, so subnodes can start preloading right away. [Huy Nguyen](https://github.com/nguyenhuy) [#706](https://github.com/TextureGroup/Texture/pull/706)
 - [ASCollectionNode] Added support for interactive item movement. [Adlai Holler](https://github.com/Adlai-Holler)
 - Added an experimental "no-copy" rendering API. See ASGraphicsContext.h for info. [Adlai Holler](https://github.com/Adlai-Holler)
 - Dropped support for iOS 8. [Adlai Holler](https://github.com/Adlai-Holler)

diff --git a/Source/ASDisplayNode.mm b/Source/ASDisplayNode.mm
@@ -3081,15 +3081,7 @@ - (void)didEnterPreloadState
   // - If it doesn't have a calculated or pending layout that fits its current bounds, a measurement pass will occur
   // (see -__layout and -_u_measureNodeWithBoundsIfNecessary:). This scenario is uncommon,
   // and running a measurement pass here is a fine trade-off because preloading any time after this point would be late.
-  //
-  // Don't force a layout pass if the node is already visible. Soon CoreAnimation will trigger
-  // a (coalesced, thus more efficient) pass on the backing store. Rely on it instead.
-  BOOL shouldForceLayoutPass = NO;
-  {
-    ASDN::MutexLocker l(__instanceLock__);
-    shouldForceLayoutPass = _automaticallyManagesSubnodes && !ASInterfaceStateIncludesVisible(_interfaceState);
-  }
-  if (shouldForceLayoutPass) {
+  if (self.automaticallyManagesSubnodes) {
     [self layoutIfNeeded];
   }