summaryrefslogtreecommitdiff
path: root/src/mbgl
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl')
-rw-r--r--src/mbgl/annotation/annotation_tile.cpp2
-rw-r--r--src/mbgl/annotation/annotation_tile.hpp2
-rw-r--r--src/mbgl/map/map_context.hpp4
-rw-r--r--src/mbgl/source/source.hpp4
-rw-r--r--src/mbgl/sprite/sprite_store.cpp4
-rw-r--r--src/mbgl/storage/asset_file_source.hpp2
-rw-r--r--src/mbgl/text/glyph_pbf.hpp4
-rw-r--r--src/mbgl/tile/geojson_tile.cpp2
-rw-r--r--src/mbgl/tile/geojson_tile.hpp2
-rw-r--r--src/mbgl/tile/geometry_tile.hpp4
-rw-r--r--src/mbgl/tile/raster_tile_data.hpp7
-rw-r--r--src/mbgl/tile/vector_tile.cpp2
-rw-r--r--src/mbgl/tile/vector_tile.hpp2
-rw-r--r--src/mbgl/tile/vector_tile_data.hpp7
-rw-r--r--src/mbgl/util/thread.hpp2
-rw-r--r--src/mbgl/util/work_queue.cpp2
-rw-r--r--src/mbgl/util/work_queue.hpp4
-rw-r--r--src/mbgl/util/worker.cpp8
-rw-r--r--src/mbgl/util/worker.hpp4
19 files changed, 33 insertions, 35 deletions
diff --git a/src/mbgl/annotation/annotation_tile.cpp b/src/mbgl/annotation/annotation_tile.cpp
index 3a038cc6eb..ee468902cb 100644
--- a/src/mbgl/annotation/annotation_tile.cpp
+++ b/src/mbgl/annotation/annotation_tile.cpp
@@ -37,7 +37,7 @@ AnnotationTileMonitor::~AnnotationTileMonitor() {
data.getAnnotationManager()->removeTileMonitor(*this);
}
-std::unique_ptr<FileRequest> AnnotationTileMonitor::monitorTile(const GeometryTileMonitor::Callback& callback_) {
+std::unique_ptr<AsyncRequest> AnnotationTileMonitor::monitorTile(const GeometryTileMonitor::Callback& callback_) {
callback = callback_;
data.getAnnotationManager()->addTileMonitor(*this);
return nullptr;
diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp
index 8d0804d7f9..ca6b074c21 100644
--- a/src/mbgl/annotation/annotation_tile.hpp
+++ b/src/mbgl/annotation/annotation_tile.hpp
@@ -47,7 +47,7 @@ public:
~AnnotationTileMonitor();
void update(std::unique_ptr<GeometryTile>);
- std::unique_ptr<FileRequest> monitorTile(const GeometryTileMonitor::Callback&) override;
+ std::unique_ptr<AsyncRequest> monitorTile(const GeometryTileMonitor::Callback&) override;
TileID tileID;
diff --git a/src/mbgl/map/map_context.hpp b/src/mbgl/map/map_context.hpp
index 8570a40935..5e1d5e70ae 100644
--- a/src/mbgl/map/map_context.hpp
+++ b/src/mbgl/map/map_context.hpp
@@ -20,7 +20,7 @@ class View;
class MapData;
class Painter;
class SpriteImage;
-class FileRequest;
+class AsyncRequest;
class PropertyTransition;
namespace gl { class TexturePool; }
@@ -106,7 +106,7 @@ private:
std::string styleURL;
std::string styleJSON;
- std::unique_ptr<FileRequest> styleRequest;
+ std::unique_ptr<AsyncRequest> styleRequest;
Map::StillImageCallback callback;
size_t sourceCacheSize;
diff --git a/src/mbgl/source/source.hpp b/src/mbgl/source/source.hpp
index 52c7d76baf..c85e2ccd2d 100644
--- a/src/mbgl/source/source.hpp
+++ b/src/mbgl/source/source.hpp
@@ -23,7 +23,7 @@ namespace mbgl {
class StyleUpdateParameters;
class Painter;
class FileSource;
-class FileRequest;
+class AsyncRequest;
class TransformState;
class Tile;
struct ClipID;
@@ -107,7 +107,7 @@ private:
std::map<TileID, std::weak_ptr<TileData>> tileDataMap;
TileCache cache;
- std::unique_ptr<FileRequest> req;
+ std::unique_ptr<AsyncRequest> req;
Observer nullObserver;
Observer* observer = &nullObserver;
diff --git a/src/mbgl/sprite/sprite_store.cpp b/src/mbgl/sprite/sprite_store.cpp
index 869abab39f..ae8835534a 100644
--- a/src/mbgl/sprite/sprite_store.cpp
+++ b/src/mbgl/sprite/sprite_store.cpp
@@ -14,8 +14,8 @@ namespace mbgl {
struct SpriteStore::Loader {
std::shared_ptr<const std::string> image;
std::shared_ptr<const std::string> json;
- std::unique_ptr<FileRequest> jsonRequest;
- std::unique_ptr<FileRequest> spriteRequest;
+ std::unique_ptr<AsyncRequest> jsonRequest;
+ std::unique_ptr<AsyncRequest> spriteRequest;
};
SpriteStore::SpriteStore(float pixelRatio_)
diff --git a/src/mbgl/storage/asset_file_source.hpp b/src/mbgl/storage/asset_file_source.hpp
index 11a430e124..f6c11c1768 100644
--- a/src/mbgl/storage/asset_file_source.hpp
+++ b/src/mbgl/storage/asset_file_source.hpp
@@ -14,7 +14,7 @@ public:
AssetFileSource(const std::string& assetRoot);
~AssetFileSource() override;
- std::unique_ptr<FileRequest> request(const Resource&, Callback) override;
+ std::unique_ptr<AsyncRequest> request(const Resource&, Callback) override;
private:
class Impl;
diff --git a/src/mbgl/text/glyph_pbf.hpp b/src/mbgl/text/glyph_pbf.hpp
index 016792aae8..93b7c9db76 100644
--- a/src/mbgl/text/glyph_pbf.hpp
+++ b/src/mbgl/text/glyph_pbf.hpp
@@ -13,7 +13,7 @@
namespace mbgl {
class FontStack;
-class FileRequest;
+class AsyncRequest;
class FileSource;
class GlyphPBF : private util::noncopyable {
@@ -31,7 +31,7 @@ public:
private:
std::atomic<bool> parsed;
- std::unique_ptr<FileRequest> req;
+ std::unique_ptr<AsyncRequest> req;
GlyphStore::Observer* observer = nullptr;
};
diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp
index fceae19619..31f2443ced 100644
--- a/src/mbgl/tile/geojson_tile.cpp
+++ b/src/mbgl/tile/geojson_tile.cpp
@@ -124,7 +124,7 @@ void GeoJSONTileMonitor::update() {
}
}
-std::unique_ptr<FileRequest>
+std::unique_ptr<AsyncRequest>
GeoJSONTileMonitor::monitorTile(const GeometryTileMonitor::Callback& cb) {
callback = cb;
update();
diff --git a/src/mbgl/tile/geojson_tile.hpp b/src/mbgl/tile/geojson_tile.hpp
index ce9c643de2..340d1053c6 100644
--- a/src/mbgl/tile/geojson_tile.hpp
+++ b/src/mbgl/tile/geojson_tile.hpp
@@ -58,7 +58,7 @@ public:
GeoJSONTileMonitor(mapbox::geojsonvt::GeoJSONVT*, const TileID&);
virtual ~GeoJSONTileMonitor();
- std::unique_ptr<FileRequest> monitorTile(const GeometryTileMonitor::Callback&) override;
+ std::unique_ptr<AsyncRequest> monitorTile(const GeometryTileMonitor::Callback&) override;
void setGeoJSONVT(mapbox::geojsonvt::GeoJSONVT*);
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp
index 6236e4e889..f1930ef3de 100644
--- a/src/mbgl/tile/geometry_tile.hpp
+++ b/src/mbgl/tile/geometry_tile.hpp
@@ -55,7 +55,7 @@ public:
virtual util::ptr<GeometryTileLayer> getLayer(const std::string&) const = 0;
};
-class FileRequest;
+class AsyncRequest;
class GeometryTileMonitor : private util::noncopyable {
public:
@@ -73,7 +73,7 @@ public:
*
* To cease monitoring, release the returned Request.
*/
- virtual std::unique_ptr<FileRequest> monitorTile(const Callback&) = 0;
+ virtual std::unique_ptr<AsyncRequest> monitorTile(const Callback&) = 0;
};
class GeometryTileFeatureExtractor {
diff --git a/src/mbgl/tile/raster_tile_data.hpp b/src/mbgl/tile/raster_tile_data.hpp
index 59eee88496..48af2fa5c2 100644
--- a/src/mbgl/tile/raster_tile_data.hpp
+++ b/src/mbgl/tile/raster_tile_data.hpp
@@ -7,9 +7,8 @@
namespace mbgl {
class FileSource;
-class FileRequest;
+class AsyncRequest;
class StyleLayer;
-class WorkRequest;
namespace gl { class TexturePool; }
class RasterTileData : public TileData {
@@ -29,9 +28,9 @@ public:
private:
gl::TexturePool& texturePool;
Worker& worker;
- std::unique_ptr<FileRequest> req;
+ std::unique_ptr<AsyncRequest> req;
std::unique_ptr<Bucket> bucket;
- std::unique_ptr<WorkRequest> workRequest;
+ std::unique_ptr<AsyncRequest> workRequest;
};
} // namespace mbgl
diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp
index 8b58ade169..4c6027d36c 100644
--- a/src/mbgl/tile/vector_tile.cpp
+++ b/src/mbgl/tile/vector_tile.cpp
@@ -188,7 +188,7 @@ VectorTileMonitor::VectorTileMonitor(const TileID& tileID_, float pixelRatio_, c
fileSource(fileSource_) {
}
-std::unique_ptr<FileRequest> VectorTileMonitor::monitorTile(const GeometryTileMonitor::Callback& callback) {
+std::unique_ptr<AsyncRequest> VectorTileMonitor::monitorTile(const GeometryTileMonitor::Callback& callback) {
const Resource resource = Resource::tile(urlTemplate, pixelRatio, tileID.x, tileID.y, tileID.sourceZ);
return fileSource.request(resource, [callback, this](Response res) {
if (res.error) {
diff --git a/src/mbgl/tile/vector_tile.hpp b/src/mbgl/tile/vector_tile.hpp
index 48e501cbd7..4d330f17f2 100644
--- a/src/mbgl/tile/vector_tile.hpp
+++ b/src/mbgl/tile/vector_tile.hpp
@@ -65,7 +65,7 @@ class VectorTileMonitor : public GeometryTileMonitor {
public:
VectorTileMonitor(const TileID&, float pixelRatio, const std::string& urlTemplate, FileSource&);
- std::unique_ptr<FileRequest> monitorTile(const GeometryTileMonitor::Callback&) override;
+ std::unique_ptr<AsyncRequest> monitorTile(const GeometryTileMonitor::Callback&) override;
private:
TileID tileID;
diff --git a/src/mbgl/tile/vector_tile_data.hpp b/src/mbgl/tile/vector_tile_data.hpp
index d0b599c4cf..922ad35bcd 100644
--- a/src/mbgl/tile/vector_tile_data.hpp
+++ b/src/mbgl/tile/vector_tile_data.hpp
@@ -12,8 +12,7 @@
namespace mbgl {
class Style;
-class WorkRequest;
-class FileRequest;
+class AsyncRequest;
class GeometryTileMonitor;
class VectorTileData : public TileData {
@@ -42,8 +41,8 @@ private:
TileWorker tileWorker;
std::unique_ptr<GeometryTileMonitor> monitor;
- std::unique_ptr<FileRequest> tileRequest;
- std::unique_ptr<WorkRequest> workRequest;
+ std::unique_ptr<AsyncRequest> tileRequest;
+ std::unique_ptr<AsyncRequest> workRequest;
// Contains all the Bucket objects for the tile. Buckets are render
// objects and they get added by tile parsing operations.
diff --git a/src/mbgl/util/thread.hpp b/src/mbgl/util/thread.hpp
index d05748a003..33ca5aba6b 100644
--- a/src/mbgl/util/thread.hpp
+++ b/src/mbgl/util/thread.hpp
@@ -37,7 +37,7 @@ public:
// Invoke object->fn(args...) in the runloop thread, then invoke callback(result) in the current thread.
template <typename Fn, class Cb, class... Args>
- std::unique_ptr<WorkRequest>
+ std::unique_ptr<AsyncRequest>
invokeWithCallback(Fn fn, Cb&& callback, Args&&... args) {
return loop->invokeWithCallback(bind(fn), callback, std::forward<Args>(args)...);
}
diff --git a/src/mbgl/util/work_queue.cpp b/src/mbgl/util/work_queue.cpp
index 80c4af8778..d0033e3ca2 100644
--- a/src/mbgl/util/work_queue.cpp
+++ b/src/mbgl/util/work_queue.cpp
@@ -12,7 +12,7 @@ WorkQueue::WorkQueue() : runLoop(RunLoop::Get()) {
WorkQueue::~WorkQueue() {
assert(runLoop == RunLoop::Get());
- // Cancel all pending WorkRequests.
+ // Cancel all pending AsyncRequests.
while (!queue.empty()) {
queue.pop();
}
diff --git a/src/mbgl/util/work_queue.hpp b/src/mbgl/util/work_queue.hpp
index 6694352918..788cfb4d2d 100644
--- a/src/mbgl/util/work_queue.hpp
+++ b/src/mbgl/util/work_queue.hpp
@@ -2,7 +2,7 @@
#define MBGL_UTIL_WORK_QUEUE
#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/util/work_request.hpp>
+#include <mbgl/util/async_request.hpp>
#include <functional>
#include <memory>
@@ -31,7 +31,7 @@ public:
private:
void pop(const std::function<void()>&);
- std::queue<std::unique_ptr<WorkRequest>> queue;
+ std::queue<std::unique_ptr<AsyncRequest>> queue;
std::mutex queueMutex;
RunLoop* runLoop;
diff --git a/src/mbgl/util/worker.cpp b/src/mbgl/util/worker.cpp
index bc6e4be3db..ec9d02573d 100644
--- a/src/mbgl/util/worker.cpp
+++ b/src/mbgl/util/worker.cpp
@@ -68,7 +68,7 @@ Worker::Worker(std::size_t count) {
Worker::~Worker() = default;
-std::unique_ptr<WorkRequest>
+std::unique_ptr<AsyncRequest>
Worker::parseRasterTile(std::unique_ptr<RasterBucket> bucket,
const std::shared_ptr<const std::string> data,
std::function<void(RasterTileParseResult)> callback) {
@@ -77,7 +77,7 @@ Worker::parseRasterTile(std::unique_ptr<RasterBucket> bucket,
data);
}
-std::unique_ptr<WorkRequest>
+std::unique_ptr<AsyncRequest>
Worker::parseGeometryTile(TileWorker& worker,
std::vector<std::unique_ptr<StyleLayer>> layers,
std::unique_ptr<GeometryTile> tile,
@@ -88,7 +88,7 @@ Worker::parseGeometryTile(TileWorker& worker,
std::move(layers), std::move(tile), config);
}
-std::unique_ptr<WorkRequest>
+std::unique_ptr<AsyncRequest>
Worker::parsePendingGeometryTileLayers(TileWorker& worker,
PlacementConfig config,
std::function<void(TileParseResult)> callback) {
@@ -97,7 +97,7 @@ Worker::parsePendingGeometryTileLayers(TileWorker& worker,
callback, &worker, config);
}
-std::unique_ptr<WorkRequest>
+std::unique_ptr<AsyncRequest>
Worker::redoPlacement(TileWorker& worker,
const std::unordered_map<std::string, std::unique_ptr<Bucket>>& buckets,
PlacementConfig config,
diff --git a/src/mbgl/util/worker.hpp b/src/mbgl/util/worker.hpp
index 96a7b27885..6630465631 100644
--- a/src/mbgl/util/worker.hpp
+++ b/src/mbgl/util/worker.hpp
@@ -10,7 +10,7 @@
namespace mbgl {
-class WorkRequest;
+class AsyncRequest;
class RasterBucket;
class GeometryTileLoader;
@@ -33,7 +33,7 @@ public:
// bind references to itself, and if and when those lambdas execute, the references
// will still be valid.
- using Request = std::unique_ptr<WorkRequest>;
+ using Request = std::unique_ptr<AsyncRequest>;
Request parseRasterTile(std::unique_ptr<RasterBucket> bucket,
std::shared_ptr<const std::string> data,
View Lorry Controller Status