[core] Added GeometryTileWorker-owned image correlation ID
This commit is contained in:
@@ -52,23 +52,23 @@ const style::Image::Impl* ImageManager::getImage(const std::string& id) const {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void ImageManager::getImages(ImageRequestor& requestor, ImageDependencies dependencies) {
|
||||
void ImageManager::getImages(ImageRequestor& requestor, ImageRequestPair&& pair) {
|
||||
// If the sprite has been loaded, or if all the icon dependencies are already present
|
||||
// (i.e. if they've been addeded via runtime styling), then notify the requestor immediately.
|
||||
// Otherwise, delay notification until the sprite is loaded. At that point, if any of the
|
||||
// dependencies are still unavailable, we'll just assume they are permanently missing.
|
||||
bool hasAllDependencies = true;
|
||||
if (!isLoaded()) {
|
||||
for (const auto& dependency : dependencies) {
|
||||
for (const auto& dependency : pair.first) {
|
||||
if (images.find(dependency) == images.end()) {
|
||||
hasAllDependencies = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (isLoaded() || hasAllDependencies) {
|
||||
notify(requestor, dependencies);
|
||||
notify(requestor, std::move(pair));
|
||||
} else {
|
||||
requestors.emplace(&requestor, std::move(dependencies));
|
||||
requestors.emplace(&requestor, std::move(pair));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -76,17 +76,17 @@ void ImageManager::removeRequestor(ImageRequestor& requestor) {
|
||||
requestors.erase(&requestor);
|
||||
}
|
||||
|
||||
void ImageManager::notify(ImageRequestor& requestor, const ImageDependencies& dependencies) const {
|
||||
void ImageManager::notify(ImageRequestor& requestor, const ImageRequestPair& pair) const {
|
||||
ImageMap response;
|
||||
|
||||
for (const auto& dependency : dependencies) {
|
||||
for (const auto& dependency : pair.first) {
|
||||
auto it = images.find(dependency);
|
||||
if (it != images.end()) {
|
||||
response.emplace(*it);
|
||||
}
|
||||
}
|
||||
|
||||
requestor.onImagesAvailable(response);
|
||||
requestor.onImagesAvailable(response, pair.second);
|
||||
}
|
||||
|
||||
void ImageManager::dumpDebugLogs() const {
|
||||
|
||||
Reference in New Issue
Block a user