[core] remove SourceInfo dependency from *TileData

This commit is contained in:
Konstantin Käfer
2016-01-05 15:59:10 +01:00
committed by John Firebaugh
parent aac6b00dd0
commit 1ff317c1cd
9 changed files with 43 additions and 51 deletions

View File

@@ -10,11 +10,9 @@ using namespace mbgl;
RasterTileData::RasterTileData(const TileID& id_,
TexturePool &texturePool_,
const SourceInfo &source_,
Worker& worker_)
: TileData(id_),
texturePool(texturePool_),
source(source_),
worker(worker_) {
}
@@ -22,9 +20,8 @@ RasterTileData::~RasterTileData() {
cancel();
}
void RasterTileData::request(float pixelRatio,
void RasterTileData::request(const std::string& url,
const RasterTileData::Callback& callback) {
std::string url = source.tileURL(id, pixelRatio);
state = State::loading;
FileSource* fs = util::ThreadContext::getFileSource();