Need some more locks for working with calculated yoga layouts (Textur…

…eGroup#1388)
hebertialmeida · May 10, 2019 · b20e007 · b20e007
1 parent 932289f
commit b20e007
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Source/ASDisplayNode+Yoga.mm b/Source/ASDisplayNode+Yoga.mm
@@ -286,6 +286,7 @@ - (void)updateYogaMeasureFuncIfNeeded
 
 - (void)invalidateCalculatedYogaLayout
 {
+  ASLockScopeSelf();
   YGNodeRef yogaNode = self.style.yogaNode;
   if (yogaNode && [self shouldHaveYogaMeasureFunc]) {
     // Yoga internally asserts that MarkDirty() may only be called on nodes with a measurement function.
@@ -338,6 +339,7 @@ - (ASLayout *)calculateLayoutYoga:(ASSizeRange)constrainedSize
 
 - (void)calculateLayoutFromYogaRoot:(ASSizeRange)rootConstrainedSize
 {
+  ASScopedLockSet lockSet = [self lockToRootIfNeededForLayout];
   ASDisplayNode *yogaRoot = self.yogaRoot;
 
   if (self != yogaRoot) {
@@ -358,7 +360,6 @@ - (void)calculateLayoutFromYogaRoot:(ASSizeRange)rootConstrainedSize
     }
   }];
 
-
   // Prepare all children for the layout pass with the current Yoga tree configuration.
   ASDisplayNodePerformBlockOnEveryYogaChild(self, ^(ASDisplayNode *_Nonnull node) {
     node.yogaLayoutInProgress = YES;