[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.
This commit is contained in:
Alexander Shalamov
2019-04-23 16:08:16 +03:00
parent 9a70e755dc
commit 83c33cdeb2
5 changed files with 25 additions and 11 deletions

View File

@@ -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();
}