Merge branch 'master' into update-objc

Conflicts:
	AsyncDisplayKit/ASCellNode.h
This commit is contained in:
Adlai Holler
2015-11-02 09:36:46 -08:00
39 changed files with 592 additions and 206 deletions

View File

@@ -24,10 +24,10 @@ NS_ASSUME_NONNULL_BEGIN
@interface ASNetworkImageNode : ASImageNode
/**
* The designated initializer.
* The designated initializer. Cache and Downloader are WEAK references.
*
* @param cache The object that implements a cache of images for the image node.
* @param downloader The object that implements image downloading for the image node. Must not be nil.
* @param cache The object that implements a cache of images for the image node. Weak reference.
* @param downloader The object that implements image downloading for the image node. Must not be nil. Weak reference.
*
* @discussion If `cache` is nil, the receiver will not attempt to retrieve images from a cache before downloading them.
*