These messages must be called on main. (#2814)

garrettmoon · Hannah Troisi · commit 4ae2948d53b0 · 2016-12-20T14:29:32.000-08:00
diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm
@@ -3029,8 +3029,10 @@ - (void)clearContents
 
 - (void)recursivelyClearContents
 {
-  ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode * _Nonnull node) {
-    [node clearContents];
+  ASPerformBlockOnMainThread(^{
+    ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode * _Nonnull node) {
+      [node clearContents];
+    });
   });
 }
 
@@ -3043,15 +3045,19 @@ - (void)setNeedsPreload
 
 - (void)recursivelyPreload
 {
-  ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode * _Nonnull node) {
-    [node didEnterPreloadState];
+  ASPerformBlockOnMainThread(^{
+    ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode * _Nonnull node) {
+      [node didEnterPreloadState];
+    });
   });
 }
 
 - (void)recursivelyClearPreloadedData
 {
-  ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode * _Nonnull node) {
-    [node didExitPreloadState];
+  ASPerformBlockOnMainThread(^{
+    ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode * _Nonnull node) {
+      [node didExitPreloadState];
+    });
   });
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3029,8 +3029,10 @@ - (void)clearContents`
`3029`	`3029`
`3030`	`3030`	`- (void)recursivelyClearContents`
`3031`	`3031`	`{`
`3032`		`- ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode * _Nonnull node) {`
`3033`		`- [node clearContents];`
	`3032`	`+ ASPerformBlockOnMainThread(^{`
	`3033`	`+ ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode * _Nonnull node) {`
	`3034`	`+ [node clearContents];`
	`3035`	`+ });`
`3034`	`3036`	`});`
`3035`	`3037`	`}`
`3036`	`3038`
`@@ -3043,15 +3045,19 @@ - (void)setNeedsPreload`
`3043`	`3045`
`3044`	`3046`	`- (void)recursivelyPreload`
`3045`	`3047`	`{`
`3046`		`- ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode * _Nonnull node) {`
`3047`		`- [node didEnterPreloadState];`
	`3048`	`+ ASPerformBlockOnMainThread(^{`
	`3049`	`+ ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode * _Nonnull node) {`
	`3050`	`+ [node didEnterPreloadState];`
	`3051`	`+ });`
`3048`	`3052`	`});`
`3049`	`3053`	`}`
`3050`	`3054`
`3051`	`3055`	`- (void)recursivelyClearPreloadedData`
`3052`	`3056`	`{`
`3053`		`- ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode * _Nonnull node) {`
`3054`		`- [node didExitPreloadState];`
	`3057`	`+ ASPerformBlockOnMainThread(^{`
	`3058`	`+ ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode * _Nonnull node) {`
	`3059`	`+ [node didExitPreloadState];`
	`3060`	`+ });`
`3055`	`3061`	`});`
`3056`	`3062`	`}`
`3057`	`3063`