Skip to content
This repository was archived by the owner on Feb 2, 2023. It is now read-only.

Clean up #723 #725

Merged
merged 2 commits into from
Oct 7, 2015
Merged

Clean up #723 #725

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b7dc91
Fix indentations in ASDisplayNode:layout
nguyenhuy Oct 7, 2015
c2fbd65
Lock the property lock in ASDisplayNode __setSafeFrame
nguyenhuy Oct 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions AsyncDisplayKit/ASDisplayNode.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,9 @@ - (void)__setNeedsLayout

- (void)__setSafeFrame:(CGRect)rect
{
ASDisplayNodeAssertThreadAffinity(self);
ASDN::MutexLocker l(_propertyLock);

BOOL useLayer = (_layer && ASDisplayNodeThreadIsMain());

CGPoint origin = (useLayer ? _layer.bounds.origin : self.bounds.origin);
Expand Down Expand Up @@ -1712,9 +1715,9 @@ - (void)layout
for (ASLayout *subnodeLayout in _layout.sublayouts) {
ASDisplayNodeAssert([_subnodes containsObject:subnodeLayout.layoutableObject], @"Cached sublayouts must only contain subnodes' layout.");
[((ASDisplayNode *)subnodeLayout.layoutableObject) __setSafeFrame:CGRectMake(subnodeLayout.position.x,
subnodeLayout.position.y,
subnodeLayout.size.width,
subnodeLayout.size.height)];
subnodeLayout.position.y,
subnodeLayout.size.width,
subnodeLayout.size.height)];
}
}

Expand Down