[ASEnvironment] Fix incomplete gating of upward propagation of layout properties (disabled for now).

This commit is contained in:
Scott Goodson 2016-04-11 20:34:24 -07:00
parent 1b7b1f3991
commit 8ccef1e99f
4 changed files with 6 additions and 3 deletions

View File

@ -2695,7 +2695,7 @@ static const char *ASDisplayNodeDrawingPriorityKey = "ASDrawingPriority";
- (BOOL)supportsUpwardPropagation
{
return YES;
return ASEnvironmentStatePropagationEnabled();
}
ASEnvironmentLayoutOptionsForwarding

View File

@ -175,7 +175,7 @@ static NSString * const kDefaultChildrenKey = @"kDefaultChildrenKey";
// the specifications that are known to have more than one.
- (BOOL)supportsUpwardPropagation
{
return YES;
return ASEnvironmentStatePropagationEnabled();
}
ASEnvironmentLayoutOptionsForwarding

View File

@ -79,6 +79,9 @@ extern void ASLayoutableClearCurrentContext();
#define ASEnvironmentLayoutOptionsForwarding \
- (void)propagateUpLayoutOptionsState\
{\
if (!ASEnvironmentStatePropagationEnabled()) {\
return;\
}\
id<ASEnvironment> parent = [self parent];\
if ([parent supportsUpwardPropagation]) {\
ASEnvironmentStatePropagateUp(parent, _environmentState.layoutOptionsState);\

View File

@ -19,7 +19,7 @@
BOOL ASEnvironmentStatePropagationEnabled()
{
return AS_SUPPORT_PROPAGATION;
return AS_SUPPORT_PROPAGATION;
}