-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Disable interface coalescing #862
Merged
Adlai-Holler
merged 19 commits into
TextureGroup:master
from
wsdwsd0829:disable-interface-coalescing
Mar 29, 2018
Merged
Changes from 13 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
929d118
fix SIMULATE_WEB_RESPONSE not imported #449
wsdwsd0829 dd24d8f
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 b8eaffa
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 2918ea0
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 9c42266
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 329f35f
Fix to make rangeMode update in right time
wsdwsd0829 5f8b7ec
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 d87bb11
merge master from upstream
wsdwsd0829 269c2ab
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 24c1ce8
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 233169e
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 67f908b
disable interface coalescing and fix tests
wsdwsd0829 9890825
Revert to before coalescing for ease of reading
wsdwsd0829 819ca1c
refactor, make min change
wsdwsd0829 e96d270
refactor
wsdwsd0829 b19f90d
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 a9b4045
Merge branch 'master' into disable-interface-coalescing
wsdwsd0829 833e32a
add comments
wsdwsd0829 029a4c5
Add change log
wsdwsd0829 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2898,27 +2898,48 @@ - (void)didExitHierarchy | |
// same runloop. Strategy: strong reference (might be the last!), wait one runloop, and confirm we are still outside the hierarchy (both layer-backed and view-backed). | ||
// TODO: This approach could be optimized by only performing the dispatch for root elements + recursively apply the interface state change. This would require a closer | ||
// integration with _ASDisplayLayer to ensure that the superlayer pointer has been cleared by this stage (to check if we are root or not), or a different delegate call. | ||
if (ASInterfaceStateIncludesVisible(_pendingInterfaceState)) { | ||
void(^exitVisibleInterfaceState)(void) = ^{ | ||
// This block intentionally retains self. | ||
__instanceLock__.lock(); | ||
unsigned isStillInHierarchy = _flags.isInHierarchy; | ||
BOOL isVisible = ASInterfaceStateIncludesVisible(_pendingInterfaceState); | ||
ASInterfaceState newState = (_pendingInterfaceState & ~ASInterfaceStateVisible); | ||
__instanceLock__.unlock(); | ||
|
||
if (!isStillInHierarchy && isVisible) { | ||
if (![self supportsRangeManagedInterfaceState]) { | ||
newState = ASInterfaceStateNone; | ||
} | ||
self.interfaceState = newState; | ||
if (!ASCATransactionQueue.sharedQueue.enabled) { | ||
if (![self supportsRangeManagedInterfaceState]) { | ||
self.interfaceState = ASInterfaceStateNone; | ||
} else { | ||
if (ASInterfaceStateIncludesVisible(self.interfaceState)) { | ||
dispatch_async(dispatch_get_main_queue(), ^{ | ||
// This block intentionally retains self. | ||
__instanceLock__.lock(); | ||
unsigned isInHierarchy = _flags.isInHierarchy; | ||
BOOL isVisible = ASInterfaceStateIncludesVisible(_interfaceState); | ||
ASInterfaceState newState = (_interfaceState & ~ASInterfaceStateVisible); | ||
__instanceLock__.unlock(); | ||
if (!isInHierarchy && isVisible) { | ||
self.interfaceState = newState; | ||
} | ||
}); | ||
} | ||
}; | ||
} | ||
} else { | ||
// TODO(wsdwsd0829): rework on this piece code that alter interface behavior of non-interfaceCoalescing. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. // Rework this code to ensure that interface state behavior is not altered when ASCATransactionQueue is disabled. |
||
if (ASInterfaceStateIncludesVisible(_pendingInterfaceState)) { | ||
void(^exitVisibleInterfaceState)(void) = ^{ | ||
// This block intentionally retains self. | ||
__instanceLock__.lock(); | ||
unsigned isStillInHierarchy = _flags.isInHierarchy; | ||
BOOL isVisible = ASInterfaceStateIncludesVisible(_pendingInterfaceState); | ||
ASInterfaceState newState = (_pendingInterfaceState & ~ASInterfaceStateVisible); | ||
__instanceLock__.unlock(); | ||
|
||
if (!isStillInHierarchy && isVisible) { | ||
if (![self supportsRangeManagedInterfaceState]) { | ||
newState = ASInterfaceStateNone; | ||
} | ||
self.interfaceState = newState; | ||
} | ||
}; | ||
|
||
if (!ASCATransactionQueue.sharedQueue.enabled) { | ||
dispatch_async(dispatch_get_main_queue(), exitVisibleInterfaceState); | ||
} else { | ||
exitVisibleInterfaceState(); | ||
if (!ASCATransactionQueue.sharedQueue.enabled) { | ||
dispatch_async(dispatch_get_main_queue(), exitVisibleInterfaceState); | ||
} else { | ||
exitVisibleInterfaceState(); | ||
} | ||
} | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is to add back reverted code before interface coalescing.
An put current code in "else" for ease of reading & future debugging.