[core] TileSource ⇢ TileLoader

This commit is contained in:
John Firebaugh
2016-06-13 13:00:20 -07:00
parent 9a43768667
commit 040bdb1994
7 changed files with 21 additions and 22 deletions

View File

@@ -1,6 +1,6 @@
#include <mbgl/tile/raster_tile.hpp>
#include <mbgl/tile/tile_observer.hpp>
#include <mbgl/tile/tile_source_impl.hpp>
#include <mbgl/tile/tile_loader_impl.hpp>
#include <mbgl/style/source.hpp>
#include <mbgl/style/update_parameters.hpp>
#include <mbgl/storage/resource.hpp>
@@ -17,7 +17,7 @@ RasterTile::RasterTile(const OverscaledTileID& id_,
: Tile(id_),
texturePool(parameters.texturePool),
worker(parameters.worker),
tileSource(*this, id_, parameters, tileset) {
loader(*this, id_, parameters, tileset) {
}
void RasterTile::setError(std::exception_ptr err) {
@@ -60,7 +60,7 @@ Bucket* RasterTile::getBucket(const style::Layer&) {
}
void RasterTile::setNecessity(Necessity necessity) {
tileSource.setNecessity(static_cast<TileSource<RasterTile>::Necessity>(necessity));
loader.setNecessity(static_cast<TileLoader<RasterTile>::Necessity>(necessity));
}
void RasterTile::cancel() {