ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-06 05:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #914 from Adlai-Holler/UpdateInterfaceStateBeforeCallout

Browse Source 
Minimize critical section in -setInterfaceState:, and move ivar set before subclass hooks are called.
This commit is contained in:
appleguy
2015-12-05 16:03:57 -08:00
parent 6e13368463 4284b6e23a
commit faf9d266c5
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
AsyncDisplayKit/ASDisplayNode.mm
View File

@@ -1643,14 +1643,20 @@ void recursivelyEnsureDisplayForLayer(CALayer *layer)
- (void)setInterfaceState:(ASInterfaceState)interfaceState
{
ASDN::MutexLocker l(_propertyLock);
if (interfaceState != _interfaceState) {
if ((interfaceState & ASInterfaceStateMeasureLayout) != (_interfaceState & ASInterfaceStateMeasureLayout)) {
ASInterfaceState oldValue;
{
ASDN::MutexLocker l(_propertyLock);
oldValue = _interfaceState;
_interfaceState = interfaceState;
}
if (interfaceState != oldValue) {
if ((interfaceState & ASInterfaceStateMeasureLayout) != (oldValue & ASInterfaceStateMeasureLayout)) {
// Trigger asynchronous measurement if it is not already cached or being calculated.
}
// Entered or exited data loading state.
if ((interfaceState & ASInterfaceStateFetchData) != (_interfaceState & ASInterfaceStateFetchData)) {
if ((interfaceState & ASInterfaceStateFetchData) != (oldValue & ASInterfaceStateFetchData)) {
if (interfaceState & ASInterfaceStateFetchData) {
[self fetchData];
} else {
@@ -1659,7 +1665,7 @@ void recursivelyEnsureDisplayForLayer(CALayer *layer)
}
// Entered or exited contents rendering state.
if ((interfaceState & ASInterfaceStateDisplay) != (_interfaceState & ASInterfaceStateDisplay)) {
if ((interfaceState & ASInterfaceStateDisplay) != (oldValue & ASInterfaceStateDisplay)) {
if (interfaceState & ASInterfaceStateDisplay) {
// Once the working window is eliminated (ASRangeHandlerRender), trigger display directly here.
[self setDisplaySuspended:NO];
@@ -1670,15 +1676,14 @@ void recursivelyEnsureDisplayForLayer(CALayer *layer)
}
// Entered or exited data loading state.
if ((interfaceState & ASInterfaceStateVisible) != (_interfaceState & ASInterfaceStateVisible)) {
if ((interfaceState & ASInterfaceStateVisible) != (oldValue & ASInterfaceStateVisible)) {
if (interfaceState & ASInterfaceStateVisible) {
// Consider providing a -didBecomeVisible.
} else {
// Consider providing a -didBecomeInvisible.
}
}
_interfaceState = interfaceState;
}
}