From 2f973e9646b49f80c7af6851d38cf1029a31a232 Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Thu, 10 Oct 2019 11:43:17 +0300 Subject: [core] Introduce Scheduler::bindOnce() and use it in ImageManager --- src/mbgl/actor/scheduler.cpp | 9 ++++++++- src/mbgl/renderer/image_manager.cpp | 8 +++----- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/mbgl/actor/scheduler.cpp b/src/mbgl/actor/scheduler.cpp index 5fd9a133bd..81e259fe1f 100644 --- a/src/mbgl/actor/scheduler.cpp +++ b/src/mbgl/actor/scheduler.cpp @@ -4,7 +4,14 @@ namespace mbgl { -util::ThreadLocal g_currentScheduler; +std::function Scheduler::bindOnce(std::function fn) { + assert(fn); + return [scheduler = makeWeakPtr(), scheduled = std::move(fn)]() mutable { + if (!scheduled) return; // Repeated call. + auto schedulerGuard = scheduler.lock(); + if (scheduler) scheduler->schedule(std::move(scheduled)); + }; +} static auto& current() { static util::ThreadLocal scheduler; diff --git a/src/mbgl/renderer/image_manager.cpp b/src/mbgl/renderer/image_manager.cpp index 65defc54c8..0920f5a659 100644 --- a/src/mbgl/renderer/image_manager.cpp +++ b/src/mbgl/renderer/image_manager.cpp @@ -204,6 +204,7 @@ void ImageManager::checkMissingAndNotify(ImageRequestor& requestor, const ImageR } requestedImages[missingImage].emplace(requestorPtr); requestor.addPendingRequest(missingImage); + auto removePendingRequests = [this, missingImage] { auto existingRequest = requestedImages.find(missingImage); if (existingRequest == requestedImages.end()) { @@ -214,11 +215,8 @@ void ImageManager::checkMissingAndNotify(ImageRequestor& requestor, const ImageR req->removePendingRequest(missingImage); } }; - - Scheduler& scheduler = *Scheduler::GetCurrent(); - auto callback = [&scheduler, removePendingRequests]() { scheduler.schedule(removePendingRequests); }; - - observer->onStyleImageMissing(missingImage, std::move(callback)); + observer->onStyleImageMissing(missingImage, + Scheduler::GetCurrent()->bindOnce(std::move(removePendingRequests))); } } else { // Associate requestor with an image that was provided by the client. -- cgit v1.2.1