diff options
| author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2020-02-27 11:46:17 +0200 |
|---|---|---|
| committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2020-03-05 17:43:37 +0200 |
| commit | 81e116d41a4ea1e3ed0d5e91e06541c3e8855a09 (patch) | |
| tree | 79cdee7e5a4ffda6fafcb9f4fce39b5b87682385 /test | |
| parent | c5155dcf334a5c5125c065e4447cb8b30989e5e5 (diff) | |
| download | qtlocation-mapboxgl-81e116d41a4ea1e3ed0d5e91e06541c3e8855a09.tar.gz | |
[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.
Diffstat (limited to 'test')
| -rw-r--r-- | test/style/source.test.cpp | 2 | ||||
| -rw-r--r-- | test/tile/custom_geometry_tile.test.cpp | 20 | ||||
| -rw-r--r-- | test/tile/geojson_tile.test.cpp | 20 | ||||
| -rw-r--r-- | test/tile/raster_dem_tile.test.cpp | 20 | ||||
| -rw-r--r-- | test/tile/raster_tile.test.cpp | 20 | ||||
| -rw-r--r-- | test/tile/tile_cache.test.cpp | 2 | ||||
| -rw-r--r-- | test/tile/vector_tile.test.cpp | 20 |
7 files changed, 47 insertions, 57 deletions
diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp index dbc67681e9..37f87fb982 100644 --- a/test/style/source.test.cpp +++ b/test/style/source.test.cpp @@ -69,7 +69,7 @@ public: transformState, fileSource, mapMode, - annotationManager, + annotationManager.makeWeakPtr(), imageManager, glyphManager, 0}; diff --git a/test/tile/custom_geometry_tile.test.cpp b/test/tile/custom_geometry_tile.test.cpp index 6e8a7e6981..28f2b7ef5a 100644 --- a/test/tile/custom_geometry_tile.test.cpp +++ b/test/tile/custom_geometry_tile.test.cpp @@ -30,17 +30,15 @@ public: ImageManager imageManager; GlyphManager glyphManager; - TileParameters tileParameters { - 1.0, - MapDebugOptions(), - transformState, - fileSource, - MapMode::Continuous, - annotationManager, - imageManager, - glyphManager, - 0 - }; + TileParameters tileParameters{1.0, + MapDebugOptions(), + transformState, + fileSource, + MapMode::Continuous, + annotationManager.makeWeakPtr(), + imageManager, + glyphManager, + 0}; }; TEST(CustomGeometryTile, InvokeFetchTile) { diff --git a/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp index 25fd268dc8..bffd99999e 100644 --- a/test/tile/geojson_tile.test.cpp +++ b/test/tile/geojson_tile.test.cpp @@ -31,17 +31,15 @@ public: GlyphManager glyphManager; Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" }; - TileParameters tileParameters { - 1.0, - MapDebugOptions(), - transformState, - fileSource, - MapMode::Continuous, - annotationManager, - imageManager, - glyphManager, - 0 - }; + TileParameters tileParameters{1.0, + MapDebugOptions(), + transformState, + fileSource, + MapMode::Continuous, + annotationManager.makeWeakPtr(), + imageManager, + glyphManager, + 0}; }; namespace { diff --git a/test/tile/raster_dem_tile.test.cpp b/test/tile/raster_dem_tile.test.cpp index f5f7610096..3c12e7b4be 100644 --- a/test/tile/raster_dem_tile.test.cpp +++ b/test/tile/raster_dem_tile.test.cpp @@ -25,17 +25,15 @@ public: GlyphManager glyphManager; Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" }; - TileParameters tileParameters { - 1.0, - MapDebugOptions(), - transformState, - fileSource, - MapMode::Continuous, - annotationManager, - imageManager, - glyphManager, - 0 - }; + TileParameters tileParameters{1.0, + MapDebugOptions(), + transformState, + fileSource, + MapMode::Continuous, + annotationManager.makeWeakPtr(), + imageManager, + glyphManager, + 0}; }; TEST(RasterDEMTile, setError) { diff --git a/test/tile/raster_tile.test.cpp b/test/tile/raster_tile.test.cpp index a5a2875f2e..db5087dc3e 100644 --- a/test/tile/raster_tile.test.cpp +++ b/test/tile/raster_tile.test.cpp @@ -25,17 +25,15 @@ public: GlyphManager glyphManager; Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" }; - TileParameters tileParameters { - 1.0, - MapDebugOptions(), - transformState, - fileSource, - MapMode::Continuous, - annotationManager, - imageManager, - glyphManager, - 0 - }; + TileParameters tileParameters{1.0, + MapDebugOptions(), + transformState, + fileSource, + MapMode::Continuous, + annotationManager.makeWeakPtr(), + imageManager, + glyphManager, + 0}; }; TEST(RasterTile, setError) { diff --git a/test/tile/tile_cache.test.cpp b/test/tile/tile_cache.test.cpp index 43b409ae87..64444f91cf 100644 --- a/test/tile/tile_cache.test.cpp +++ b/test/tile/tile_cache.test.cpp @@ -39,7 +39,7 @@ public: transformState, fileSource, MapMode::Continuous, - annotationManager, + annotationManager.makeWeakPtr(), imageManager, glyphManager, 0}; diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp index b89a572f7f..b28661d938 100644 --- a/test/tile/vector_tile.test.cpp +++ b/test/tile/vector_tile.test.cpp @@ -31,17 +31,15 @@ public: GlyphManager glyphManager; Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" }; - TileParameters tileParameters { - 1.0, - MapDebugOptions(), - transformState, - fileSource, - MapMode::Continuous, - annotationManager, - imageManager, - glyphManager, - 0 - }; + TileParameters tileParameters{1.0, + MapDebugOptions(), + transformState, + fileSource, + MapMode::Continuous, + annotationManager.makeWeakPtr(), + imageManager, + glyphManager, + 0}; }; TEST(VectorTile, setError) { |