From feba7f8ed16735f08cd728ca4bb860fe72ebdf38 Mon Sep 17 00:00:00 2001 From: Scott Goodson Date: Sat, 27 Jun 2015 12:10:04 -0700 Subject: [PATCH] Update the identifier that AsyncDisplayKit uses to label its internal queues (2/2). --- AsyncDisplayKit/ASDisplayNode.mm | 2 +- AsyncDisplayKit/Details/ASDataController.mm | 5 +++-- AsyncDisplayKit/Details/ASTextNodeWordKerner.m | 2 +- AsyncDisplayKit/Details/_ASDisplayLayer.mm | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm index c1a269e559..212c5c76f1 100644 --- a/AsyncDisplayKit/ASDisplayNode.mm +++ b/AsyncDisplayKit/ASDisplayNode.mm @@ -1645,7 +1645,7 @@ static void _recursivelySetDisplaySuspended(ASDisplayNode *node, CALayer *layer, static dispatch_queue_t asyncSizingQueue = NULL; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - asyncSizingQueue = dispatch_queue_create("com.facebook.AsyncDisplayKit.ASDisplayNode.asyncSizingQueue", DISPATCH_QUEUE_CONCURRENT); + asyncSizingQueue = dispatch_queue_create("org.AsyncDisplayKit.ASDisplayNode.asyncSizingQueue", DISPATCH_QUEUE_CONCURRENT); // we use the highpri queue to prioritize UI rendering over other async operations dispatch_set_target_queue(asyncSizingQueue, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0)); }); diff --git a/AsyncDisplayKit/Details/ASDataController.mm b/AsyncDisplayKit/Details/ASDataController.mm index 973646fabf..bfb56d3b67 100644 --- a/AsyncDisplayKit/Details/ASDataController.mm +++ b/AsyncDisplayKit/Details/ASDataController.mm @@ -94,7 +94,7 @@ static void *kASSizingQueueContext = &kASSizingQueueContext; static dispatch_queue_t sizingQueue = NULL; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - sizingQueue = dispatch_queue_create("com.facebook.AsyncDisplayKit.ASDataController.sizingQueue", DISPATCH_QUEUE_SERIAL); + sizingQueue = dispatch_queue_create("org.AsyncDisplayKit.ASDataController.sizingQueue", DISPATCH_QUEUE_SERIAL); dispatch_queue_set_specific(sizingQueue, kASSizingQueueContext, kASSizingQueueContext, NULL); dispatch_set_target_queue(sizingQueue, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)); }); @@ -332,7 +332,8 @@ withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions }); } -- (void)endUpdates { +- (void)endUpdates +{ [self endUpdatesWithCompletion:NULL]; } diff --git a/AsyncDisplayKit/Details/ASTextNodeWordKerner.m b/AsyncDisplayKit/Details/ASTextNodeWordKerner.m index 0fd7d25004..ffd9655a91 100644 --- a/AsyncDisplayKit/Details/ASTextNodeWordKerner.m +++ b/AsyncDisplayKit/Details/ASTextNodeWordKerner.m @@ -90,7 +90,7 @@ static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ spaceSizes = [[NSMapTable alloc] initWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableStrongMemory capacity:1]; - mapQueue = dispatch_queue_create("com.facebook.AsyncDisplayKit.wordKerningQueue", DISPATCH_QUEUE_SERIAL); + mapQueue = dispatch_queue_create("org.AsyncDisplayKit.wordKerningQueue", DISPATCH_QUEUE_SERIAL); }); CGFloat ordinarySpaceWidth; UIFont *font = [layoutManager.textStorage attribute:NSFontAttributeName atIndex:characterIndex effectiveRange:NULL]; diff --git a/AsyncDisplayKit/Details/_ASDisplayLayer.mm b/AsyncDisplayKit/Details/_ASDisplayLayer.mm index 1acee3bd58..1d9b023983 100644 --- a/AsyncDisplayKit/Details/_ASDisplayLayer.mm +++ b/AsyncDisplayKit/Details/_ASDisplayLayer.mm @@ -129,7 +129,7 @@ static dispatch_queue_t displayQueue = NULL; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - displayQueue = dispatch_queue_create("com.facebook.AsyncDisplayKit.ASDisplayLayer.displayQueue", DISPATCH_QUEUE_CONCURRENT); + displayQueue = dispatch_queue_create("org.AsyncDisplayKit.ASDisplayLayer.displayQueue", DISPATCH_QUEUE_CONCURRENT); // we use the highpri queue to prioritize UI rendering over other async operations dispatch_set_target_queue(displayQueue, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0)); });