-
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
Background image load api #1007
Merged
nguyenhuy
merged 36 commits into
TextureGroup:master
from
wsdwsd0829:background-image-load-api
Jul 24, 2018
Merged
Changes from 32 commits
Commits
Show all changes
36 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 b19f90d
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 b50cec4
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 b75a5f3
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 64b46e0
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 5fabc1e
remove uncessary assert
wsdwsd0829 3d5b84b
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 098b978
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 77eefd6
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 0310ed7
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 324d3b0
add api to allow delegated calls in background.
wsdwsd0829 018867e
fix typo
wsdwsd0829 1da91a6
1. Add class property to decide whether to send delegate callbacks on
wsdwsd0829 bdbd7de
Refactor.
wsdwsd0829 8480a75
add ivar for class property.
wsdwsd0829 30fed6b
merge masster
wsdwsd0829 c17c0a1
Donot use extra api.
wsdwsd0829 33a80df
Refactor
wsdwsd0829 4134330
refactor
wsdwsd0829 f0419c2
revert to use let
wsdwsd0829 6d1ce31
Merge branch 'master' into background-image-load-api
wsdwsd0829 0a0dbcc
refactor
wsdwsd0829 c2d8d9b
make class property atomic.
wsdwsd0829 056a3d9
kick of new ci test.
wsdwsd0829 d6c133a
Merge branch 'master' of github.com:TextureGroup/Texture into backgro…
wsdwsd0829 645adce
kick off new ci
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
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.
Technically this should be
static std::atomic_bool _useMainThreadDelegateCallbacks(true)
or some variant. The other code in here should be OK, since c++ defines the operators to implicitly do store/load.In practice the risk is trivial. I approve either way – let's get this landed!