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

Cherry pick #6928 #6932 #6948 #7014 #7034

Merged
merged 8 commits into from
Nov 14, 2016

Conversation

boundsj
Copy link
Contributor

@boundsj boundsj commented Nov 11, 2016

cc @1ec5

@boundsj boundsj added the iOS Mapbox Maps SDK for iOS label Nov 11, 2016
@boundsj boundsj added this to the ios-v3.4.0 milestone Nov 11, 2016
@boundsj boundsj self-assigned this Nov 11, 2016
@mention-bot
Copy link

@boundsj, thanks for your PR! By analyzing the history of the files in this pull request, we identified @jfirebaugh, @brunoabinader and @kkaefer to be potential reviewers.

@boundsj boundsj force-pushed the boundsj-cherry-pick-6928 branch 2 times, most recently from c030e88 to aaa8aa1 Compare November 13, 2016 23:57
@boundsj boundsj mentioned this pull request Nov 14, 2016
@boundsj boundsj mentioned this pull request Nov 14, 2016
@boundsj boundsj changed the title Cherry pick #6928 Cherry pick #6928 #6932 #6948 Nov 14, 2016
@boundsj
Copy link
Contributor Author

boundsj commented Nov 14, 2016

Along with several Qt/Linux related commits that get the build passing in CI again, this brings in:

  • [core] Separate pathway for notifying workers of new images/glyphs aa08796
  • [core] symbol layer - recalculate style on icon/text size changes 39b0bc0

This does not include:

  • [core] separate Backend from View for headless rendering 5cc390d
  • [core] move gl::Context to Backend and refactor View a4d259c
  • [core] don't load tiles from sources that aren't used 9127299
  • [core] change std::array<uint16_t, 2> to mbgl::Size 62b56b7
  • [core] correctly set the framebuffer size on retina screens f7801e5

I think this is the correct of action but I wanted to check since these commits that I did not include were brought into the Android release in #7021.

cc @1ec5 @jfirebaugh @ivovandongen

When a source or layer is removed transfer ownership back to the
caller so it can (optionally) take it. Preserve the behavior that 
removing a CustomLayer triggers deinitialization.  Deinitialize all 
custom layers when a style is destroyed in case those layers are not 
explicitly removed.
@boundsj boundsj changed the title Cherry pick #6928 #6932 #6948 Cherry pick #6928 #6932 #6948 #7014 Nov 14, 2016
@boundsj boundsj merged commit 96a7a44 into release-ios-v3.4.0 Nov 14, 2016
@boundsj boundsj deleted the boundsj-cherry-pick-6928 branch November 14, 2016 04:28
@jfirebaugh
Copy link
Contributor

@boundsj Those look like appropriate changes to cherry pick. I would add #7025 to the list as well.

#7021 pulled a broader set of commits than I would have recommended.

@1ec5
Copy link
Contributor

1ec5 commented Dec 3, 2016

Note that this PR also pulled in #6899 (but out of order and without 6c30105).

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
iOS Mapbox Maps SDK for iOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants