diff options
author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-04-23 16:08:16 +0300 |
---|---|---|
committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-04-25 10:00:23 +0300 |
commit | 83c33cdeb25831cde370b543d9e10c8d1859aec8 (patch) | |
tree | e21874529fbf69bd7d4bbcbb064aaf8e28d0fe50 /src/mbgl/tile | |
parent | 9a70e755dcc52a661ac29715b048afee5d938bee (diff) | |
download | qtlocation-mapboxgl-83c33cdeb25831cde370b543d9e10c8d1859aec8.tar.gz |
[core] Pass ImageManager to ImageRequestor's constructor
This makes ImageRequestor API explicitly dependant on ImageManager, so that
ImageRequestor can unregister itself from ImageManager on destruction.
Diffstat (limited to 'src/mbgl/tile')
-rw-r--r-- | src/mbgl/tile/geometry_tile.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/tile/geometry_tile.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index 792586e73d..029c761e53 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -42,6 +42,7 @@ GeometryTile::GeometryTile(const OverscaledTileID& id_, std::string sourceID_, const TileParameters& parameters) : Tile(Kind::Geometry, id_), + ImageRequestor(parameters.imageManager), sourceID(std::move(sourceID_)), mailbox(std::make_shared<Mailbox>(*Scheduler::GetCurrent())), worker(parameters.workerScheduler, @@ -60,7 +61,6 @@ GeometryTile::GeometryTile(const OverscaledTileID& id_, GeometryTile::~GeometryTile() { glyphManager.removeRequestor(*this); - imageManager.removeRequestor(*this); markObsolete(); } diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index 18f94b9a1f..975c7aab0e 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -22,7 +22,7 @@ class TileParameters; class GlyphAtlas; class ImageAtlas; -class GeometryTile : public Tile, public GlyphRequestor, ImageRequestor { +class GeometryTile : public Tile, public GlyphRequestor, public ImageRequestor { public: GeometryTile(const OverscaledTileID&, std::string sourceID, |