A few more debug changes for the removal of the working window.

Scott Goodson · Scott Goodson · commit 8bc65a96248c · 2015-12-01T12:01:16.000-08:00
diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm
@@ -586,6 +586,7 @@ - (CGSize)measure:(CGSize)constrainedSize
 
 - (ASLayout *)measureWithSizeRange:(ASSizeRange)constrainedSize
 {
+  NSLog(@"About to measure lock for %@", self);
   ASDN::MutexLocker l(_propertyLock);
   return [self __measureWithSizeRange:constrainedSize];
 }
@@ -666,6 +667,7 @@ - (void)setDisplaysAsynchronously:(BOOL)displaysAsynchronously
 - (BOOL)shouldRasterizeDescendants
 {
   ASDisplayNodeAssertThreadAffinity(self);
+  NSLog(@"About to descendants lock for %p, %@", self, [self class]);
   ASDN::MutexLocker l(_propertyLock);
   return _flags.shouldRasterizeDescendants;
 }
@@ -722,6 +724,7 @@ - (void)displayImmediately
 - (void)recursivelyDisplayImmediately
 {
   ASDN::MutexLocker l(_propertyLock);
+  
   for (ASDisplayNode *child in _subnodes) {
     [child recursivelyDisplayImmediately];
   }
@@ -730,12 +733,12 @@ - (void)recursivelyDisplayImmediately
 
 - (void)__setNeedsDisplay
 {
+  ASDN::MutexLocker l(_propertyLock);
+  NSLog(@"About to find parent rasterize for %@", self);
   ASDisplayNode *rasterizedContainerNode = [self __rasterizedContainerNode];
   if (rasterizedContainerNode) {
     [rasterizedContainerNode setNeedsDisplay];
   } else {
-    [_layer setNeedsDisplay];
-    
     if (_layer && !self.isSynchronous && self.displaysAsynchronously) {
       [ASDisplayNode scheduleNodeForDisplay:self];
     }
diff --git a/AsyncDisplayKit/Private/ASDisplayNode+UIViewBridge.mm b/AsyncDisplayKit/Private/ASDisplayNode+UIViewBridge.mm
@@ -219,10 +219,8 @@ - (void)__setSafeFrame:(CGRect)rect
 - (void)setNeedsDisplay
 {
   _bridge_prologue;
-  // Send the message to the layer first, as __setNeedsDisplay may call -displayIfNeeded.
-  // REVIEW: Audit if this is necessary or if it can be called after like __setNeedsLayout
-  // -> Likely possible because of the aggregation / trampoline to occur on a later runloop.
-  _messageToLayer(setNeedsDisplay);
+  // Send the message to the view/layer first, as __setNeedsDisplay may call -displayIfNeeded.
+  _messageToViewOrLayer(setNeedsDisplay);
   [self __setNeedsDisplay];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -586,6 +586,7 @@ - (CGSize)measure:(CGSize)constrainedSize`
`586`	`586`
`587`	`587`	`- (ASLayout *)measureWithSizeRange:(ASSizeRange)constrainedSize`
`588`	`588`	`{`
	`589`	`+ NSLog(@"About to measure lock for %@", self);`
`589`	`590`	`ASDN::MutexLocker l(_propertyLock);`
`590`	`591`	`return [self __measureWithSizeRange:constrainedSize];`
`591`	`592`	`}`
`@@ -666,6 +667,7 @@ - (void)setDisplaysAsynchronously:(BOOL)displaysAsynchronously`
`666`	`667`	`- (BOOL)shouldRasterizeDescendants`
`667`	`668`	`{`
`668`	`669`	`ASDisplayNodeAssertThreadAffinity(self);`
	`670`	`+ NSLog(@"About to descendants lock for %p, %@", self, [self class]);`
`669`	`671`	`ASDN::MutexLocker l(_propertyLock);`
`670`	`672`	`return _flags.shouldRasterizeDescendants;`
`671`	`673`	`}`
`@@ -722,6 +724,7 @@ - (void)displayImmediately`
`722`	`724`	`- (void)recursivelyDisplayImmediately`
`723`	`725`	`{`
`724`	`726`	`ASDN::MutexLocker l(_propertyLock);`
	`727`	`+`
`725`	`728`	`for (ASDisplayNode *child in _subnodes) {`
`726`	`729`	`[child recursivelyDisplayImmediately];`
`727`	`730`	`}`
`@@ -730,12 +733,12 @@ - (void)recursivelyDisplayImmediately`
`730`	`733`
`731`	`734`	`- (void)__setNeedsDisplay`
`732`	`735`	`{`
	`736`	`+ ASDN::MutexLocker l(_propertyLock);`
	`737`	`+ NSLog(@"About to find parent rasterize for %@", self);`
`733`	`738`	`ASDisplayNode *rasterizedContainerNode = [self __rasterizedContainerNode];`
`734`	`739`	`if (rasterizedContainerNode) {`
`735`	`740`	`[rasterizedContainerNode setNeedsDisplay];`
`736`	`741`	`} else {`
`737`		`- [_layer setNeedsDisplay];`
`738`		`-`
`739`	`742`	`if (_layer && !self.isSynchronous && self.displaysAsynchronously) {`
`740`	`743`	`[ASDisplayNode scheduleNodeForDisplay:self];`
`741`	`744`	`}`
Original file line number	Diff line number	Diff line change
`@@ -219,10 +219,8 @@ - (void)__setSafeFrame:(CGRect)rect`
`219`	`219`	`- (void)setNeedsDisplay`
`220`	`220`	`{`
`221`	`221`	`_bridge_prologue;`
`222`		`- // Send the message to the layer first, as __setNeedsDisplay may call -displayIfNeeded.`
`223`		`- // REVIEW: Audit if this is necessary or if it can be called after like __setNeedsLayout`
`224`		`- // -> Likely possible because of the aggregation / trampoline to occur on a later runloop.`
`225`		`- _messageToLayer(setNeedsDisplay);`
	`222`	`+ // Send the message to the view/layer first, as __setNeedsDisplay may call -displayIfNeeded.`
	`223`	`+ _messageToViewOrLayer(setNeedsDisplay);`
`226`	`224`	`[self __setNeedsDisplay];`
`227`	`225`	`}`
`228`	`226`