Merge pull request #593 from shannonma/merge_fork

Fixes for ASTextNode test, setNeedsDisplay and font loading failures
This commit is contained in:
appleguy
2015-08-08 18:55:00 -07:00
5 changed files with 68 additions and 23 deletions

View File

@@ -20,6 +20,7 @@
BOOL ASDisplayNodeSubclassOverridesSelector(Class subclass, SEL selector);
void ASDisplayNodePerformBlockOnMainThread(void (^block)());
void ASDisplayNodeRespectThreadAffinityOfNode(ASDisplayNode *node, void (^block)());
typedef NS_OPTIONS(NSUInteger, ASDisplayNodeMethodOverrides) {
ASDisplayNodeMethodOverrideNone = 0,