[core] use RAII-style lifetime tracking of Request objects

2015-10-15 15:46:12 +02:00
parent 94a5ac857f
commit 096a3edf39
13 changed files with 57 additions and 56 deletions
--- a/src/mbgl/map/raster_tile_data.cpp
+++ b/src/mbgl/map/raster_tile_data.cpp
@@ -31,7 +31,6 @@ void RasterTileData::request(float pixelRatio,

    FileSource* fs = util::ThreadContext::getFileSource();
    req = fs->request({ Resource::Kind::Tile, url }, util::RunLoop::getLoop(), [url, callback, this](const Response &res) {
-        util::ThreadContext::getFileSource()->cancel(req);
        req = nullptr;

        if (res.status == Response::NotFound) {
@@ -78,9 +77,6 @@ void RasterTileData::cancel() {
    if (state != State::obsolete) {
        state = State::obsolete;
    }
-    if (req) {
-        util::ThreadContext::getFileSource()->cancel(req);
-        req = nullptr;
-    }
+    req = nullptr;
    workRequest.reset();
 }