tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't pass Worker& around so much

Browse Source
This commit is contained in:
John Firebaugh
2015-06-09 10:08:20 -04:00
parent abdf205510
commit db1202e8e3
8 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mbgl/map/raster_tile_data.cpp
View File

@@ -12,9 +12,11 @@ using namespace mbgl;
RasterTileData::RasterTileData(const TileID& id_,
TexturePool &texturePool,
const SourceInfo &source_)
const SourceInfo &source_,
Worker& worker_)
: TileData(id_),
source(source_),
worker(worker_),
bucket(texturePool, layout) {
}
@@ -22,14 +24,13 @@ RasterTileData::~RasterTileData() {
cancel();
}
void RasterTileData::request(Worker& worker,
float pixelRatio,
const std::function<void()>& callback) {
void RasterTileData::request(float pixelRatio,
const std::function<void()>& callback) {
std::string url = source.tileURL(id, pixelRatio);
state = State::loading;
FileSource* fs = util::ThreadContext::getFileSource();
req = fs->request({ Resource::Kind::Tile, url }, util::RunLoop::current.get()->get(), [url, callback, &worker, this](const Response &res) {
req = fs->request({ Resource::Kind::Tile, url }, util::RunLoop::current.get()->get(), [url, callback, this](const Response &res) {
req = nullptr;
if (res.status != Response::Successful) {
@@ -59,7 +60,7 @@ void RasterTileData::request(Worker& worker,
});
}
bool RasterTileData::reparse(Worker&, std::function<void()>) {
bool RasterTileData::reparse(std::function<void()>) {
assert(false);
return false;
}