Revert - Assert node did load before did enter visible way 1 (Texture…

…Group#886)

CHANGELOG.md

@@ -622,4 +622,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Source/ASDisplayNode.mm

@@ -2260,14 +2260,7 @@ - (void)_insertSubnode:(ASDisplayNode *)subnode atSubnodeIndex:(NSInteger)subnod
     [_subnodes insertObject:subnode atIndex:subnodeIndex];
     _cachedSubnodes = nil;
   __instanceLock__.unlock();
-
-  if (!isRasterized && self.nodeLoaded) {
-    // Trigger the subnode to load its layer, which will create its view if it needs one.
-    // By doing this prior to downward propagation of .interfaceState in _setSupernode:,
-    // we can guarantee that -didEnterVisibleState is only called with .isNodeLoaded = YES.
-    [subnode layer];
-  }
-
+
   // This call will apply our .hierarchyState to the new subnode.
   // If we are a managed hierarchy, as in ASCellNode trees, it will also apply our .interfaceState.
   [subnode _setSupernode:self];
@@ -3280,19 +3273,11 @@ - (void)didEnterVisibleState
 {
   // subclass override
   ASDisplayNodeAssertMainThread();
-
-#if ASDISPLAYNODE_ASSERTIONS_ENABLED
-  // Rasterized node's loading state is merged with root node of rasterized tree.
-  if (!(self.hierarchyState & ASHierarchyStateRasterized)) {
-    ASDisplayNodeAssert(self.isNodeLoaded, @"Node should be loaded before entering visible state.");
-  }
-#endif
-
+
   ASAssertUnlocked(__instanceLock__);
   [self enumerateInterfaceStateDelegates:^(id<ASInterfaceStateDelegate> del) {
     [del didEnterVisibleState];
   }];
-
 #if AS_ENABLE_TIPS
   [ASTipsController.shared nodeDidAppear:self];
 #endif

Tests/ASNetworkImageNodeTests.mm

@@ -57,7 +57,6 @@ - (void)DISABLED_testThatProgressBlockIsSetAndClearedCorrectlyOnVisibility
 
 - (void)testThatProgressBlockIsSetAndClearedCorrectlyOnChangeURL
 {
-  [node layer];
   [node enterInterfaceState:ASInterfaceStateInHierarchy];
 
   // Set URL while visible, should set progress block

Tests/ASVideoNodeTests.mm

@@ -199,9 +199,9 @@ - (void)testPlayerLayerNodeIsNotAddedIfVisibleButShouldNotBePlayingWithUrl
 - (void)doPlayerLayerNodeIsNotAddedIfVisibleButShouldNotBePlaying
 {
   [_videoNode pause];
-  [_videoNode layer];
   [_videoNode setInterfaceState:ASInterfaceStateVisible | ASInterfaceStateDisplay];
-
+  [_videoNode didLoad];
+
   XCTAssert(![_videoNode.subnodes containsObject:_videoNode.playerNode]);
 }
 
@@ -226,8 +226,7 @@ - (void)doVideoStartsPlayingOnDidDidBecomeVisibleWhenShouldAutoplay
     return playerLayer;
   }];
   _videoNode.playerNode.layer.frame = CGRectZero;
-
-  [_videoNode layer];
+
   [_videoNode didEnterVisibleState];
 
   XCTAssertTrue(_videoNode.shouldBePlaying);
@@ -305,7 +304,7 @@ - (void)testVideoThatDoesNotAutorepeatsShouldPauseOnPlaybackEnd
   _videoNode.asset = assetMock;
   _videoNode.shouldAutorepeat = NO;
 
-  [_videoNode layer];
+  [_videoNode didLoad];
   [_videoNode setInterfaceState:ASInterfaceStateVisible | ASInterfaceStateDisplay | ASInterfaceStatePreload];
   [_videoNode prepareToPlayAsset:assetMock withKeys:_requestedKeys];
   [_videoNode play];
@@ -326,7 +325,7 @@ - (void)testVideoThatAutorepeatsShouldRepeatOnPlaybackEnd
   _videoNode.asset = assetMock;
   _videoNode.shouldAutorepeat = YES;
 
-  [_videoNode layer];
+  [_videoNode didLoad];
   [_videoNode setInterfaceState:ASInterfaceStateVisible | ASInterfaceStateDisplay | ASInterfaceStatePreload];
   [_videoNode prepareToPlayAsset:assetMock withKeys:_requestedKeys];
   [_videoNode play];
@@ -343,7 +342,6 @@ - (void)testVideoResumedWhenBufferIsLikelyToKeepUp
 
   _videoNode.asset = assetMock;
 
-  [_videoNode layer];
   [_videoNode setInterfaceState:ASInterfaceStateVisible | ASInterfaceStateDisplay | ASInterfaceStatePreload];
   [_videoNode prepareToPlayAsset:assetMock withKeys:_requestedKeys];
   ASCATransactionQueueWait(nil);