Merge remote-tracking branch 'upstream/master' into baseline

# Conflicts:
#	AsyncDisplayKit/Layout/ASLayoutSpec.h
#	AsyncDisplayKit/Layout/ASStackLayoutSpec.mm
This commit is contained in:
rcancro
2015-08-24 09:54:36 -07:00
39 changed files with 423 additions and 573 deletions

View File

@@ -13,4 +13,13 @@
/** A layout spec is an immutable object that describes a layout, loosely inspired by React. */
@interface ASLayoutSpec : NSObject <ASStackLayoutable>
/**
Creation of a layout spec should only happen by a user in layoutSpecThatFits:. During that method, a
layout spec can be created and mutated. Once it is passed back to ASDK, the isMutable flag will be
set to NO and any further mutations will cause an assert.
*/
@property (nonatomic, assign) BOOL isMutable;
- (instancetype)init;
@end