diff options
| -rw-r--r-- | src/mbgl/sprite/sprite_loader.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/storage/file_source_request.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/tile/geometry_tile.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/tile/raster_tile.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/mbgl/sprite/sprite_loader.cpp b/src/mbgl/sprite/sprite_loader.cpp index 60ece5ed73..93d6dfd9ae 100644 --- a/src/mbgl/sprite/sprite_loader.cpp +++ b/src/mbgl/sprite/sprite_loader.cpp @@ -10,8 +10,8 @@ #include <mbgl/storage/file_source.hpp> #include <mbgl/storage/resource.hpp> #include <mbgl/storage/response.hpp> -#include <mbgl/util/run_loop.hpp> #include <mbgl/actor/actor.hpp> +#include <mbgl/actor/scheduler.hpp> #include <cassert> @@ -21,7 +21,7 @@ static SpriteLoaderObserver nullObserver; struct SpriteLoader::Loader { Loader(Scheduler& scheduler, SpriteLoader& imageManager) - : mailbox(std::make_shared<Mailbox>(*util::RunLoop::Get())), + : mailbox(std::make_shared<Mailbox>(*Scheduler::GetCurrent())), worker(scheduler, ActorRef<SpriteLoader>(imageManager, mailbox)) { } diff --git a/src/mbgl/storage/file_source_request.cpp b/src/mbgl/storage/file_source_request.cpp index 8a6fb21181..09ea8cc32a 100644 --- a/src/mbgl/storage/file_source_request.cpp +++ b/src/mbgl/storage/file_source_request.cpp @@ -1,13 +1,13 @@ #include <mbgl/storage/file_source_request.hpp> #include <mbgl/actor/mailbox.hpp> -#include <mbgl/util/run_loop.hpp> +#include <mbgl/actor/scheduler.hpp> namespace mbgl { FileSourceRequest::FileSourceRequest(FileSource::Callback&& callback) : responseCallback(callback) - , mailbox(std::make_shared<Mailbox>(*util::RunLoop::Get())) { + , mailbox(std::make_shared<Mailbox>(*Scheduler::GetCurrent())) { } FileSourceRequest::~FileSourceRequest() { diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index 33911df9ed..20056e355d 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -17,10 +17,10 @@ #include <mbgl/geometry/feature_index.hpp> #include <mbgl/text/collision_tile.hpp> #include <mbgl/map/transform_state.hpp> -#include <mbgl/util/run_loop.hpp> #include <mbgl/style/filter_evaluator.hpp> #include <mbgl/util/chrono.hpp> #include <mbgl/util/logging.hpp> +#include <mbgl/actor/scheduler.hpp> #include <iostream> @@ -33,7 +33,7 @@ GeometryTile::GeometryTile(const OverscaledTileID& id_, const TileParameters& parameters) : Tile(id_), sourceID(std::move(sourceID_)), - mailbox(std::make_shared<Mailbox>(*util::RunLoop::Get())), + mailbox(std::make_shared<Mailbox>(*Scheduler::GetCurrent())), worker(parameters.workerScheduler, ActorRef<GeometryTile>(*this, mailbox), id_, diff --git a/src/mbgl/tile/raster_tile.cpp b/src/mbgl/tile/raster_tile.cpp index 1260fd1edd..b940e342d7 100644 --- a/src/mbgl/tile/raster_tile.cpp +++ b/src/mbgl/tile/raster_tile.cpp @@ -8,7 +8,7 @@ #include <mbgl/storage/file_source.hpp> #include <mbgl/renderer/tile_parameters.hpp> #include <mbgl/renderer/buckets/raster_bucket.hpp> -#include <mbgl/util/run_loop.hpp> +#include <mbgl/actor/scheduler.hpp> namespace mbgl { @@ -17,7 +17,7 @@ RasterTile::RasterTile(const OverscaledTileID& id_, const Tileset& tileset) : Tile(id_), loader(*this, id_, parameters, tileset), - mailbox(std::make_shared<Mailbox>(*util::RunLoop::Get())), + mailbox(std::make_shared<Mailbox>(*Scheduler::GetCurrent())), worker(parameters.workerScheduler, ActorRef<RasterTile>(*this, mailbox)) { } |