Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[ios, macos] CP 11831 into release-chai #12087

Merged
merged 6 commits into from
Jun 7, 2018
Merged

Conversation

fabian-guerra
Copy link
Contributor

CP #11831 into release-chai

fabian-guerra and others added 6 commits June 7, 2018 15:26
8 simultaneous mapsnapshotter test periodically deadlocks in simulator.
Also, increase timeouts to decrease chance of spurious test failure.

# Conflicts:
#	platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterTest.m
# Conflicts:
#	platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterTest.m
# Conflicts:
#	platform/darwin/src/MGLMapSnapshotter.mm
- Biggest change: when we apply the watermark on a background thread, don't capture self (turn most of the related instance methods into class methods)
- Don't call mbglMapSnapshotter->snapshot from a user-provided queue, since it's an asynchronous call anyway and starting it on the user's queue requires capturing self.

# Conflicts:
#	platform/darwin/src/MGLMapSnapshotter.mm
@fabian-guerra fabian-guerra self-assigned this Jun 7, 2018
Copy link
Contributor

@ChrisLoer ChrisLoer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks right to me. Looks like it actually ended up being a pretty clean cherry-pick? If you had to make many changes, I think I'm missing what they were.

🚀

@fabian-guerra fabian-guerra merged commit 8118cb5 into release-chai Jun 7, 2018
@fabian-guerra fabian-guerra deleted the fabian-cp-11831 branch June 7, 2018 21:43
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants