Merge pull request #1364 from levi/patch-9

[ASDisplayNode] Method naming - use internal underscore notation for recursivelyTriggerDisplayAndBlock
This commit is contained in:
appleguy 2016-03-11 22:30:31 -08:00
commit aac50320dc

View File

@ -220,7 +220,7 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
renderQueue = [[ASRunLoopQueue<ASDisplayNode *> alloc] initWithRunLoop:CFRunLoopGetMain()
andHandler:^(ASDisplayNode * _Nonnull dequeuedItem, BOOL isQueueDrained) {
CFAbsoluteTime timestamp = isQueueDrained ? CFAbsoluteTimeGetCurrent() : 0;
[dequeuedItem __recursivelyTriggerDisplayAndBlock:NO];
[dequeuedItem _recursivelyTriggerDisplayAndBlock:NO];
if (isQueueDrained) {
[[NSNotificationCenter defaultCenter] postNotificationName:ASRenderingEngineDidDisplayScheduledNodesNotification
object:nil
@ -1759,7 +1759,7 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock)
}
}
- (void)__recursivelyTriggerDisplayAndBlock:(BOOL)shouldBlock
- (void)_recursivelyTriggerDisplayAndBlock:(BOOL)shouldBlock
{
ASDisplayNodeAssertMainThread();
@ -1775,7 +1775,7 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock)
- (void)recursivelyEnsureDisplaySynchronously:(BOOL)synchronously
{
[self __recursivelyTriggerDisplayAndBlock:synchronously];
[self _recursivelyTriggerDisplayAndBlock:synchronously];
}
- (void)setShouldBypassEnsureDisplay:(BOOL)shouldBypassEnsureDisplay