Addresses thread safety, GitHub issue facebook#769.

See also: discussions in PR facebook#852 and facebook#786. In addition to improving thread safety, it removes 8 bytes of heap per node.
jpap · Jan 17, 2019 · 13ebc70 · 13ebc70
1 parent 604a9a9
commit 13ebc70
Show file tree

Hide file tree

Showing 4 changed files with 130 additions and 60 deletions.
diff --git a/yoga/YGLayout.h b/yoga/YGLayout.h
@@ -22,12 +22,8 @@ struct YGLayout {
   bool doesLegacyStretchFlagAffectsLayout : 1;
   bool hadOverflow : 1;
 
-  uint32_t computedFlexBasisGeneration = 0;
   YGFloatOptional computedFlexBasis = {};
 
-  // Instead of recomputing the entire layout every single time, we cache some
-  // information to break early when nothing changed
-  uint32_t generationCount = 0;
   YGDirection lastOwnerDirection = (YGDirection) -1;
 
   uint32_t nextCachedMeasurementsIndex = 0;

diff --git a/yoga/YGNode.cpp b/yoga/YGNode.cpp
@@ -189,11 +189,6 @@ void YGNode::setLayoutPosition(float position, int index) {
   layout_.position[index] = position;
 }
 
-void YGNode::setLayoutComputedFlexBasisGeneration(
-    uint32_t computedFlexBasisGeneration) {
-  layout_.computedFlexBasisGeneration = computedFlexBasisGeneration;
-}
-
 void YGNode::setLayoutMeasuredDimension(float measuredDimension, int index) {
   layout_.measuredDimensions[index] = measuredDimension;
 }

diff --git a/yoga/YGNode.h b/yoga/YGNode.h
@@ -239,8 +239,6 @@ struct YGNode {
   void setDirty(bool isDirty);
   void setLayoutLastOwnerDirection(YGDirection direction);
   void setLayoutComputedFlexBasis(const YGFloatOptional computedFlexBasis);
-  void setLayoutComputedFlexBasisGeneration(
-      uint32_t computedFlexBasisGeneration);
   void setLayoutMeasuredDimension(float measuredDimension, int index);
   void setLayoutHadOverflow(bool hadOverflow);
   void setLayoutDimension(float dimension, int index);