ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-09-03 11:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Need some more locks for working with calculated yoga layouts (#1388)

Browse Source
This commit is contained in:
Kevin 2019-03-09 07:55:35 -08:00 committed by Adlai Holler
parent 510000ee85
commit 872e89b772
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/ASDisplayNode+Yoga.mm
View File

@ -286,6 +286,7 @@
- (void)invalidateCalculatedYogaLayout - (void)invalidateCalculatedYogaLayout
{ {
ASLockScopeSelf();
YGNodeRef yogaNode = self.style.yogaNode; YGNodeRef yogaNode = self.style.yogaNode;
if (yogaNode && [self shouldHaveYogaMeasureFunc]) { if (yogaNode && [self shouldHaveYogaMeasureFunc]) {
// Yoga internally asserts that MarkDirty() may only be called on nodes with a measurement function. // Yoga internally asserts that MarkDirty() may only be called on nodes with a measurement function.
@ -338,6 +339,7 @@
- (void)calculateLayoutFromYogaRoot:(ASSizeRange)rootConstrainedSize - (void)calculateLayoutFromYogaRoot:(ASSizeRange)rootConstrainedSize
{ {
ASScopedLockSet lockSet = [self lockToRootIfNeededForLayout];
ASDisplayNode *yogaRoot = self.yogaRoot; ASDisplayNode *yogaRoot = self.yogaRoot;
if (self != yogaRoot) { if (self != yogaRoot) {
@ -358,7 +360,6 @@
} }
}]; }];
// Prepare all children for the layout pass with the current Yoga tree configuration. // Prepare all children for the layout pass with the current Yoga tree configuration.
ASDisplayNodePerformBlockOnEveryYogaChild(self, ^(ASDisplayNode *_Nonnull node) { ASDisplayNodePerformBlockOnEveryYogaChild(self, ^(ASDisplayNode *_Nonnull node) {
node.yogaLayoutInProgress = YES; node.yogaLayoutInProgress = YES;