From fee3892f958737e0b41e87cd2da62c2067aacec5 Mon Sep 17 00:00:00 2001
From: Li Tan <lit@fb.com>
Date: Thu, 18 Dec 2014 18:11:12 -0800
Subject: [PATCH] use asyncDisplayNodePerformOnMainThread

---
 .../{ASCollectionView.m => ASCollectionView.mm}       |  9 +++------
 AsyncDisplayKit/{ASTableView.m => ASTableView.mm}     | 11 ++++-------
 2 files changed, 7 insertions(+), 13 deletions(-)
 rename AsyncDisplayKit/{ASCollectionView.m => ASCollectionView.mm} (98%)
 rename AsyncDisplayKit/{ASTableView.m => ASTableView.mm} (98%)

diff --git a/AsyncDisplayKit/ASCollectionView.m b/AsyncDisplayKit/ASCollectionView.mm
similarity index 98%
rename from AsyncDisplayKit/ASCollectionView.m
rename to AsyncDisplayKit/ASCollectionView.mm
index 4d0a8a48b5..edaf045b0c 100644
--- a/AsyncDisplayKit/ASCollectionView.m
+++ b/AsyncDisplayKit/ASCollectionView.mm
@@ -12,6 +12,7 @@
 #import "ASFlowLayoutController.h"
 #import "ASRangeController.h"
 #import "ASDataController.h"
+#import "ASDisplayNodeInternal.h"
 
 
 #pragma mark -
@@ -135,13 +136,9 @@ static BOOL _isInterceptedSelector(SEL sel)
 {
   [_dataController reloadData];
 
-  if ([NSThread isMainThread]) {
+  ASDisplayNodePerformBlockOnMainThread(^{
     [super reloadData];
-  } else {
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [super reloadData];
-    });
-  }
+  });
 }
 
 - (void)setDataSource:(id<UICollectionViewDataSource>)dataSource
diff --git a/AsyncDisplayKit/ASTableView.m b/AsyncDisplayKit/ASTableView.mm
similarity index 98%
rename from AsyncDisplayKit/ASTableView.m
rename to AsyncDisplayKit/ASTableView.mm
index 3158792082..719c7c7ee1 100644
--- a/AsyncDisplayKit/ASTableView.m
+++ b/AsyncDisplayKit/ASTableView.mm
@@ -13,6 +13,8 @@
 #import "ASFlowLayoutController.h"
 #import "ASLayoutController.h"
 #import "ASRangeController.h"
+#import "ASDisplayNodeInternal.h"
+
 
 
 #pragma mark -
@@ -185,14 +187,9 @@ static BOOL _isInterceptedSelector(SEL sel)
 - (void)reloadData
 {
   [_dataController reloadData];
-
-  if ([NSThread isMainThread]) {
+  ASDisplayNodePerformBlockOnMainThread(^{
     [super reloadData];
-  } else {
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [super reloadData];
-    });
-  }
+  });
 }
 
 - (ASRangeTuningParameters)rangeTuningParameters