Remove ASLayoutOptions locking

This commit is contained in:
Michael Schneider 2016-04-22 19:54:40 -07:00
parent 77713019d2
commit bcd91f18ce

View File

@ -90,142 +90,112 @@ extern void ASLayoutableClearCurrentContext();
\ \
- (CGFloat)spacingAfter\ - (CGFloat)spacingAfter\
{\ {\
ASDN::MutexLocker l(_propertyLock);\
return _environmentState.layoutOptionsState.spacingAfter;\ return _environmentState.layoutOptionsState.spacingAfter;\
}\ }\
\ \
- (void)setSpacingAfter:(CGFloat)spacingAfter\ - (void)setSpacingAfter:(CGFloat)spacingAfter\
{\ {\
_propertyLock.lock();\
_environmentState.layoutOptionsState.spacingAfter = spacingAfter;\ _environmentState.layoutOptionsState.spacingAfter = spacingAfter;\
[self propagateUpLayoutOptionsState];\ [self propagateUpLayoutOptionsState];\
_propertyLock.unlock();\
}\ }\
\ \
- (CGFloat)spacingBefore\ - (CGFloat)spacingBefore\
{\ {\
ASDN::MutexLocker l(_propertyLock);\
return _environmentState.layoutOptionsState.spacingBefore;\ return _environmentState.layoutOptionsState.spacingBefore;\
}\ }\
\ \
- (void)setSpacingBefore:(CGFloat)spacingBefore\ - (void)setSpacingBefore:(CGFloat)spacingBefore\
{\ {\
_propertyLock.lock();\
_environmentState.layoutOptionsState.spacingBefore = spacingBefore;\ _environmentState.layoutOptionsState.spacingBefore = spacingBefore;\
[self propagateUpLayoutOptionsState];\ [self propagateUpLayoutOptionsState];\
_propertyLock.unlock();\
}\ }\
\ \
- (BOOL)flexGrow\ - (BOOL)flexGrow\
{\ {\
ASDN::MutexLocker l(_propertyLock);\
return _environmentState.layoutOptionsState.flexGrow;\ return _environmentState.layoutOptionsState.flexGrow;\
}\ }\
\ \
- (void)setFlexGrow:(BOOL)flexGrow\ - (void)setFlexGrow:(BOOL)flexGrow\
{\ {\
_propertyLock.lock();\
_environmentState.layoutOptionsState.flexGrow = flexGrow;\ _environmentState.layoutOptionsState.flexGrow = flexGrow;\
[self propagateUpLayoutOptionsState];\ [self propagateUpLayoutOptionsState];\
_propertyLock.unlock();\
}\ }\
\ \
- (BOOL)flexShrink\ - (BOOL)flexShrink\
{\ {\
ASDN::MutexLocker l(_propertyLock);\
return _environmentState.layoutOptionsState.flexShrink;\ return _environmentState.layoutOptionsState.flexShrink;\
}\ }\
\ \
- (void)setFlexShrink:(BOOL)flexShrink\ - (void)setFlexShrink:(BOOL)flexShrink\
{\ {\
_propertyLock.lock();\
_environmentState.layoutOptionsState.flexShrink = flexShrink;\ _environmentState.layoutOptionsState.flexShrink = flexShrink;\
[self propagateUpLayoutOptionsState];\ [self propagateUpLayoutOptionsState];\
_propertyLock.unlock();\
}\ }\
\ \
- (ASRelativeDimension)flexBasis\ - (ASRelativeDimension)flexBasis\
{\ {\
ASDN::MutexLocker l(_propertyLock);\
return _environmentState.layoutOptionsState.flexBasis;\ return _environmentState.layoutOptionsState.flexBasis;\
}\ }\
\ \
- (void)setFlexBasis:(ASRelativeDimension)flexBasis\ - (void)setFlexBasis:(ASRelativeDimension)flexBasis\
{\ {\
_propertyLock.lock();\
_environmentState.layoutOptionsState.flexBasis = flexBasis;\ _environmentState.layoutOptionsState.flexBasis = flexBasis;\
[self propagateUpLayoutOptionsState];\ [self propagateUpLayoutOptionsState];\
_propertyLock.unlock();\
}\ }\
\ \
- (ASStackLayoutAlignSelf)alignSelf\ - (ASStackLayoutAlignSelf)alignSelf\
{\ {\
ASDN::MutexLocker l(_propertyLock);\
return _environmentState.layoutOptionsState.alignSelf;\ return _environmentState.layoutOptionsState.alignSelf;\
}\ }\
\ \
- (void)setAlignSelf:(ASStackLayoutAlignSelf)alignSelf\ - (void)setAlignSelf:(ASStackLayoutAlignSelf)alignSelf\
{\ {\
_propertyLock.lock();\
_environmentState.layoutOptionsState.alignSelf = alignSelf;\ _environmentState.layoutOptionsState.alignSelf = alignSelf;\
[self propagateUpLayoutOptionsState];\ [self propagateUpLayoutOptionsState];\
_propertyLock.unlock();\
}\ }\
\ \
- (CGFloat)ascender\ - (CGFloat)ascender\
{\ {\
ASDN::MutexLocker l(_propertyLock);\
return _environmentState.layoutOptionsState.ascender;\ return _environmentState.layoutOptionsState.ascender;\
}\ }\
\ \
- (void)setAscender:(CGFloat)ascender\ - (void)setAscender:(CGFloat)ascender\
{\ {\
_propertyLock.lock();\
_environmentState.layoutOptionsState.ascender = ascender;\ _environmentState.layoutOptionsState.ascender = ascender;\
[self propagateUpLayoutOptionsState];\ [self propagateUpLayoutOptionsState];\
_propertyLock.unlock();\
}\ }\
\ \
- (CGFloat)descender\ - (CGFloat)descender\
{\ {\
ASDN::MutexLocker l(_propertyLock);\
return _environmentState.layoutOptionsState.descender;\ return _environmentState.layoutOptionsState.descender;\
}\ }\
\ \
- (void)setDescender:(CGFloat)descender\ - (void)setDescender:(CGFloat)descender\
{\ {\
_propertyLock.lock();\
_environmentState.layoutOptionsState.descender = descender;\ _environmentState.layoutOptionsState.descender = descender;\
[self propagateUpLayoutOptionsState];\ [self propagateUpLayoutOptionsState];\
_propertyLock.unlock();\
}\ }\
\ \
- (ASRelativeSizeRange)sizeRange\ - (ASRelativeSizeRange)sizeRange\
{\ {\
ASDN::MutexLocker l(_propertyLock);\
return _environmentState.layoutOptionsState.sizeRange;\ return _environmentState.layoutOptionsState.sizeRange;\
}\ }\
\ \
- (void)setSizeRange:(ASRelativeSizeRange)sizeRange\ - (void)setSizeRange:(ASRelativeSizeRange)sizeRange\
{\ {\
_propertyLock.lock();\
_environmentState.layoutOptionsState.sizeRange = sizeRange;\ _environmentState.layoutOptionsState.sizeRange = sizeRange;\
[self propagateUpLayoutOptionsState];\ [self propagateUpLayoutOptionsState];\
_propertyLock.unlock();\
}\ }\
\ \
- (CGPoint)layoutPosition\ - (CGPoint)layoutPosition\
{\ {\
ASDN::MutexLocker l(_propertyLock);\
return _environmentState.layoutOptionsState.layoutPosition;\ return _environmentState.layoutOptionsState.layoutPosition;\
}\ }\
\ \
- (void)setLayoutPosition:(CGPoint)layoutPosition\ - (void)setLayoutPosition:(CGPoint)layoutPosition\
{\ {\
_propertyLock.lock();\
_environmentState.layoutOptionsState.layoutPosition = layoutPosition;\ _environmentState.layoutOptionsState.layoutPosition = layoutPosition;\
[self propagateUpLayoutOptionsState];\ [self propagateUpLayoutOptionsState];\
_propertyLock.unlock();\
}\ }\
@ -234,39 +204,30 @@ extern void ASLayoutableClearCurrentContext();
#define ASEnvironmentLayoutExtensibilityForwarding \ #define ASEnvironmentLayoutExtensibilityForwarding \
- (void)setLayoutOptionExtensionBool:(BOOL)value atIndex:(int)idx\ - (void)setLayoutOptionExtensionBool:(BOOL)value atIndex:(int)idx\
{\ {\
_propertyLock.lock();\
_ASEnvironmentLayoutOptionsExtensionSetBoolAtIndex(self, idx, value);\ _ASEnvironmentLayoutOptionsExtensionSetBoolAtIndex(self, idx, value);\
_propertyLock.unlock();\
}\ }\
\ \
- (BOOL)layoutOptionExtensionBoolAtIndex:(int)idx\ - (BOOL)layoutOptionExtensionBoolAtIndex:(int)idx\
{\ {\
ASDN::MutexLocker l(_propertyLock);\
return _ASEnvironmentLayoutOptionsExtensionGetBoolAtIndex(self, idx);\ return _ASEnvironmentLayoutOptionsExtensionGetBoolAtIndex(self, idx);\
}\ }\
\ \
- (void)setLayoutOptionExtensionInteger:(NSInteger)value atIndex:(int)idx\ - (void)setLayoutOptionExtensionInteger:(NSInteger)value atIndex:(int)idx\
{\ {\
_propertyLock.lock();\
_ASEnvironmentLayoutOptionsExtensionSetIntegerAtIndex(self, idx, value);\ _ASEnvironmentLayoutOptionsExtensionSetIntegerAtIndex(self, idx, value);\
_propertyLock.unlock();\
}\ }\
\ \
- (NSInteger)layoutOptionExtensionIntegerAtIndex:(int)idx\ - (NSInteger)layoutOptionExtensionIntegerAtIndex:(int)idx\
{\ {\
ASDN::MutexLocker l(_propertyLock);\
return _ASEnvironmentLayoutOptionsExtensionGetIntegerAtIndex(self, idx);\ return _ASEnvironmentLayoutOptionsExtensionGetIntegerAtIndex(self, idx);\
}\ }\
\ \
- (void)setLayoutOptionExtensionEdgeInsets:(UIEdgeInsets)value atIndex:(int)idx\ - (void)setLayoutOptionExtensionEdgeInsets:(UIEdgeInsets)value atIndex:(int)idx\
{\ {\
_propertyLock.lock();\
_ASEnvironmentLayoutOptionsExtensionSetEdgeInsetsAtIndex(self, idx, value);\ _ASEnvironmentLayoutOptionsExtensionSetEdgeInsetsAtIndex(self, idx, value);\
_propertyLock.unlock();\
}\ }\
\ \
- (UIEdgeInsets)layoutOptionExtensionEdgeInsetsAtIndex:(int)idx\ - (UIEdgeInsets)layoutOptionExtensionEdgeInsetsAtIndex:(int)idx\
{\ {\
ASDN::MutexLocker l(_propertyLock);\
return _ASEnvironmentLayoutOptionsExtensionGetEdgeInsetsAtIndex(self, idx);\ return _ASEnvironmentLayoutOptionsExtensionGetEdgeInsetsAtIndex(self, idx);\
}\ }\