[core] Use weak annotation manager

Map and renderer / orchestrator should be able to run on a separate threads,
however, legacy AnnotationManager is shared between Map and Renderer, therefore
is not a thread safe. Until AnnotationManager is deprecated and removed from a
code-base, use it only via weak pointers.

1 files changed, 18 insertions, 20 deletions

diff --git a/src/mbgl/map/map_impl.cpp b/src/mbgl/map/map_impl.cpp
index af18720916..0edc715134 100644
--- a/src/mbgl/map/map_impl.cpp
+++ b/src/mbgl/map/map_impl.cpp
@@ -48,26 +48,24 @@ void Map::Impl::onUpdate() {
 
     transform.updateTransitions(timePoint);
 
-    UpdateParameters params = {
-        style->impl->isLoaded(),
-        mode,
-        pixelRatio,
-        debugOptions,
-        timePoint,
-        transform.getState(),
-        style->impl->getGlyphURL(),
-        style->impl->spriteLoaded,
-        style->impl->getTransitionOptions(),
-        style->impl->getLight()->impl,
-        style->impl->getImageImpls(),
-        style->impl->getSourceImpls(),
-        style->impl->getLayerImpls(),
-        annotationManager,
-        fileSource,
-        prefetchZoomDelta,
-        bool(stillImageRequest),
-        crossSourceCollisions
-    };
+    UpdateParameters params = {style->impl->isLoaded(),
+                               mode,
+                               pixelRatio,
+                               debugOptions,
+                               timePoint,
+                               transform.getState(),
+                               style->impl->getGlyphURL(),
+                               style->impl->spriteLoaded,
+                               style->impl->getTransitionOptions(),
+                               style->impl->getLight()->impl,
+                               style->impl->getImageImpls(),
+                               style->impl->getSourceImpls(),
+                               style->impl->getLayerImpls(),
+                               annotationManager.makeWeakPtr(),
+                               fileSource,
+                               prefetchZoomDelta,
+                               bool(stillImageRequest),
+                               crossSourceCollisions};
 
     rendererFrontend.update(std::make_shared<UpdateParameters>(std::move(params)));
 }