Also check for _layerClass overwrite for synchronous flag

TextureGroup · Jan 30, 2018 · 7339fbf · 7339fbf
1 parent 9dc7a4b
commit 7339fbf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/Source/ASDisplayNode.mm b/Source/ASDisplayNode.mm
@@ -252,9 +252,11 @@ - (void)_initializeInstance
 #endif
 
   _viewClass = [self.class viewClass];
-  setFlag(Synchronous, ![_viewClass isSubclassOfClass:[_ASDisplayView class]]);
-
   _layerClass = [self.class layerClass];
+  BOOL isSynchronous = ![_viewClass isSubclassOfClass:[_ASDisplayView class]]
+                        || ![_layerClass isSubclassOfClass:[_ASDisplayLayer class]];
+  setFlag(Synchronous, isSynchronous);
+
 
   _contentsScaleForDisplay = ASScreenScale();
   _drawingPriority = ASDefaultDrawingPriority;

diff --git a/Tests/ASDisplayNodeTests.mm b/Tests/ASDisplayNodeTests.mm
@@ -173,13 +173,20 @@ - (void)displayWillStartAsynchronously:(BOOL)asynchronously
 
 @end
 
-@interface ASSynchronousTestDisplayNode : ASDisplayNode
+@interface ASSynchronousTestDisplayNodeViaViewClass : ASDisplayNode
 @end
 
-@implementation ASSynchronousTestDisplayNode
+@implementation ASSynchronousTestDisplayNodeViaViewClass
 + (Class)viewClass { return [UIView class]; }
 @end
 
+@interface ASSynchronousTestDisplayNodeViaLayerClass : ASDisplayNode
+@end
+
+@implementation ASSynchronousTestDisplayNodeViaLayerClass
++ (Class)layerClass { return [CALayer class]; }
+@end
+
 @interface UIDisplayNodeTestView : UIView
 @end
 
@@ -2363,7 +2370,13 @@ - (void)testScreenScale
 
 - (void)testThatIfViewClassIsOverwrittenItsSynchronous
 {
-  ASSynchronousTestDisplayNode *node = [[ASSynchronousTestDisplayNode alloc] init];
+  ASSynchronousTestDisplayNodeViaViewClass *node = [[ASSynchronousTestDisplayNodeViaViewClass alloc] init];
+  XCTAssertTrue([node isSynchronous], @"Node should be synchronous if viewClass is ovewritten and not a subclass of _ASDisplayView");
+}
+
+- (void)testThatIfLayerClassIsOverwrittenItsSynchronous
+{
+  ASSynchronousTestDisplayNodeViaLayerClass *node = [[ASSynchronousTestDisplayNodeViaLayerClass alloc] init];
   XCTAssertTrue([node isSynchronous], @"Node should be synchronous if viewClass is ovewritten and not a subclass of _ASDisplayView");
 }