ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-09-15 16:36:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1660 from maicki/FixWrongConstrainedSize

Browse Source 
Fix passing wrong constrained size to nodes
This commit is contained in:
appleguy 2016-05-13 13:06:29 -07:00
commit 60b71a604c
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
AsyncDisplayKit/Details/ASDataController.mm
View File

@ -191,26 +191,32 @@ static void *kASSizingQueueContext = &kASSizingQueueContext;
for (NSUInteger j = 0; j < nodeCount; j += kASDataControllerSizingCountPerProcessor) { for (NSUInteger j = 0; j < nodeCount; j += kASDataControllerSizingCountPerProcessor) {
NSInteger batchCount = MIN(kASDataControllerSizingCountPerProcessor, nodeCount - j); NSInteger batchCount = MIN(kASDataControllerSizingCountPerProcessor, nodeCount - j);
__block NSArray *subarray;
// Allocate nodes concurrently. // Allocate nodes concurrently.
__block NSArray *subarrayOfContexts;
__block NSArray *subarrayOfNodes;
dispatch_block_t allocationBlock = ^{ dispatch_block_t allocationBlock = ^{
__strong ASIndexedNodeContext **allocatedContextBuffer = (__strong ASIndexedNodeContext **)calloc(batchCount, sizeof(ASIndexedNodeContext *));
__strong ASCellNode **allocatedNodeBuffer = (__strong ASCellNode **)calloc(batchCount, sizeof(ASCellNode *)); __strong ASCellNode **allocatedNodeBuffer = (__strong ASCellNode **)calloc(batchCount, sizeof(ASCellNode *));
dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
dispatch_apply(batchCount, queue, ^(size_t i) { dispatch_apply(batchCount, queue, ^(size_t i) {
unsigned long k = j + i; unsigned long k = j + i;
ASCellNode *node = [contexts[k] allocateNode]; ASIndexedNodeContext *context = contexts[k];
ASCellNode *node = [context allocateNode];
if (node == nil) { if (node == nil) {
ASDisplayNodeAssertNotNil(node, @"Node block created nil node; %@, %@", self, self.dataSource); ASDisplayNodeAssertNotNil(node, @"Node block created nil node; %@, %@", self, self.dataSource);
node = [[ASCellNode alloc] init]; // Fallback to avoid crash for production apps. node = [[ASCellNode alloc] init]; // Fallback to avoid crash for production apps.
} }
allocatedNodeBuffer[i] = node; allocatedNodeBuffer[i] = node;
allocatedContextBuffer[i] = context;
}); });
subarray = [[NSArray alloc] initWithObjects:allocatedNodeBuffer count:batchCount]; subarrayOfNodes = [[NSArray alloc] initWithObjects:allocatedNodeBuffer count:batchCount];
subarrayOfContexts = [NSArray arrayWithObjects:allocatedContextBuffer count:batchCount];
// Nil out buffer indexes to allow arc to free the stored cells. // Nil out buffer indexes to allow arc to free the stored cells.
for (int i = 0; i < batchCount; i++) { for (int i = 0; i < batchCount; i++) {
allocatedContextBuffer[i] = nil;
allocatedNodeBuffer[i] = nil; allocatedNodeBuffer[i] = nil;
} }
free(allocatedContextBuffer);
free(allocatedNodeBuffer); free(allocatedNodeBuffer);
}; };
@ -225,15 +231,15 @@ static void *kASSizingQueueContext = &kASSizingQueueContext;
}); });
dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER); dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
[self _layoutNodes:subarray fromContexts:contexts atIndexesOfRange:batchRange ofKind:kind]; [self _layoutNodes:subarrayOfNodes fromContexts:subarrayOfContexts atIndexesOfRange:batchRange ofKind:kind];
} else { } else {
allocationBlock(); allocationBlock();
[_mainSerialQueue performBlockOnMainThread:^{ [_mainSerialQueue performBlockOnMainThread:^{
[self _layoutNodes:subarray fromContexts:contexts atIndexesOfRange:batchRange ofKind:kind]; [self _layoutNodes:subarrayOfNodes fromContexts:subarrayOfContexts atIndexesOfRange:batchRange ofKind:kind];
}]; }];
} }
[allocatedNodes addObjectsFromArray:subarray]; [allocatedNodes addObjectsFromArray:subarrayOfNodes];
dispatch_group_async(layoutGroup, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ dispatch_group_async(layoutGroup, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
// We should already have measured loaded nodes before we left the main thread. Layout the remaining ones on a background thread. // We should already have measured loaded nodes before we left the main thread. Layout the remaining ones on a background thread.