Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ASDisplayNode] Notify rasterized subnodes that render pass has completed #532

Merged
merged 6 commits into from
Sep 7, 2017
Merged

[ASDisplayNode] Notify rasterized subnodes that render pass has completed #532

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d81f0e6
Notify rasterized subsides that render pass has completed
smeis Aug 25, 2017
857c71e
Traverse entire subnode tree notifying all subnodes
smeis Aug 25, 2017
a171440
Add entry in changelog
smeis Aug 25, 2017
555c012
Retrieve rasterizesSubtree flag while holding instance lock
smeis Aug 29, 2017
27cd73d
Balance display delegate calls for rasterized subnodes
smeis Aug 29, 2017
ed32a38
Merge branch 'master' into notify-rasterized-subnodes-render-pass-com…
nguyenhuy Sep 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- Fix retain cycle between ASImageNode and PINAnimatedImage [Phil Larson](https://github.com/plarson) [#520](https://github.com/TextureGroup/Texture/pull/520)
- Change the API for disabling logging from a compiler flag to a runtime C function ASDisableLogging(). [Adlai Holler](https://github.com/Adlai-Holler) [#528](https://github.com/TextureGroup/Texture/pull/528)
- Table and collection views to consider content inset when calculating (default) element size range [Huy Nguyen](https://github.com/nguyenhuy) [#525](https://github.com/TextureGroup/Texture/pull/525)
- [ASDisplayNode] Call -didDisplayAsyncLayer: on rasterized subnodes when rendering pass has completed [Eric Scheers](https://github.com/smeis) [#532](https://github.com/TextureGroup/Texture/pull/532)

##2.4
- Fix an issue where inserting/deleting sections could lead to inconsistent supplementary element behavior. [Adlai Holler](https://github.com/Adlai-Holler)
Expand Down
8 changes: 8 additions & 0 deletions Source/Private/ASDisplayNode+AsyncDisplay.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#import <AsyncDisplayKit/ASDisplayNode+FrameworkSubclasses.h>
#import <AsyncDisplayKit/ASInternalHelpers.h>
#import <AsyncDisplayKit/ASSignpost.h>
#import <AsyncDisplayKit/ASDisplayNodeExtras.h>


@interface ASDisplayNode () <_ASDisplayLayerDelegate>
@end
Expand Down Expand Up @@ -347,6 +349,12 @@ - (void)displayAsyncLayer:(_ASDisplayLayer *)asyncLayer asynchronously:(BOOL)asy
layer.contents = (id)image.CGImage;
}
[self didDisplayAsyncLayer:self.asyncLayer];

if (_flags.rasterizesSubtree) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we no longer hold the instance lock by the time this completionBlock is executed, I think we should either grab this flag at the beginning of this method and use it here, or call self.rasterizesSubtree here.

ASDisplayNodePerformBlockOnEverySubnode(self, NO, ^(ASDisplayNode * _Nonnull node) {
[node didDisplayAsyncLayer:node.asyncLayer];
});
}
}
};

Expand Down
34 changes: 34 additions & 0 deletions Tests/ASDisplayNodeTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ @interface ASTestDisplayNode : ASDisplayNode
@property (nonatomic) BOOL hasPreloaded;
@property (nonatomic) BOOL preloadStateChangedToYES;
@property (nonatomic) BOOL preloadStateChangedToNO;

@property (nonatomic, assign) NSUInteger didDisplayCount;

@end

@interface ASTestResponderNode : ASTestDisplayNode
Expand Down Expand Up @@ -155,6 +158,12 @@ - (void)dealloc
}
}

- (void)displayDidFinish
{
[super displayDidFinish];
_didDisplayCount++;
}

@end

@interface UIDisplayNodeTestView : UIView
Expand Down Expand Up @@ -2019,6 +2028,31 @@ - (void)testThatRasterizingWrapperNodesIsNotAllowed
XCTAssertThrows([rasterizedSupernode addSubnode:subnode]);
}

- (void)testThatRasterizedSubnodesGetUpdatesWhenRenderPassCompletes
{
ASTestDisplayNode *supernode = [[ASTestDisplayNode alloc] init];
supernode.frame = CGRectMake(0.0, 0.0, 100.0, 100.0);
[supernode enableSubtreeRasterization];

ASTestDisplayNode *subnode = [[ASTestDisplayNode alloc] init];
ASTestDisplayNode *subSubnode = [[ASTestDisplayNode alloc] init];

ASSetDebugNames(supernode, subnode);
UIWindow *window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
[subnode addSubnode:subSubnode];
[supernode addSubnode:subnode];
[window addSubnode:supernode];
[window makeKeyAndVisible];

XCTAssertTrue(ASDisplayNodeRunRunLoopUntilBlockIsTrue(^BOOL{
return (subnode.didDisplayCount == 1);
}));

XCTAssertTrue(ASDisplayNodeRunRunLoopUntilBlockIsTrue(^BOOL{
return (subSubnode.didDisplayCount == 1);
}));
}

// Underlying issue for: https://github.com/facebook/AsyncDisplayKit/issues/2011
- (void)testThatLayerBackedSubnodesAreMarkedInvisibleBeforeDeallocWhenSupernodesViewIsRemovedFromHierarchyWhileBeingRetained
{
Expand Down