Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

Conflicts:
	src/mbgl/map/map.cpp

include/mbgl/map/map.hpp

@@ -64,9 +64,6 @@ public:
     // Forces a map update: always triggers a rerender.
     void update();
 
-    // Triggers a cleanup that releases resources.
-    void cleanup();
-
     // Releases resources immediately
     void terminate();
 
@@ -157,7 +154,6 @@ private:
     std::thread thread;
     std::unique_ptr<uv::async> asyncTerminate;
     std::unique_ptr<uv::async> asyncRender;
-    std::unique_ptr<uv::async> asyncCleanup;
 
     bool terminating = false;
     bool pausing = false;

src/mbgl/map/map.cpp

@@ -160,7 +160,6 @@ void Map::start(bool startPaused) {
         terminating = true;
 
         // Closes all open handles on the loop. This means that the loop will automatically terminate.
-        asyncCleanup.reset();
         asyncRender.reset();
         asyncTerminate.reset();
     });
@@ -184,11 +183,6 @@ void Map::start(bool startPaused) {
         }
     });
 
-    asyncCleanup = util::make_unique<uv::async>(**loop, [this]() {
-        assert(painter);
-        painter->cleanup();
-    });
-
     // Do we need to pause first?
     if (startPaused) {
         pause();
@@ -361,12 +355,6 @@ void Map::swapped() {
     rerender();
 }
 
-void Map::cleanup() {
-    if (asyncCleanup != nullptr) {
-        asyncCleanup->send();
-    }
-}
-
 void Map::terminate() {
     assert(painter);
     painter->terminate();

src/mbgl/renderer/painter.cpp

@@ -31,7 +31,6 @@ Painter::Painter(SpriteAtlas& spriteAtlas_, GlyphAtlas& glyphAtlas_)
 }
 
 Painter::~Painter() {
-    cleanup();
 }
 
 bool Painter::needsAnimation() const {
@@ -118,11 +117,7 @@ void Painter::deleteShaders() {
     gaussianShader = nullptr;
 }
 
-void Painter::cleanup() {
-}
-
 void Painter::terminate() {
-    cleanup();
     deleteShaders();
 }
 

src/mbgl/renderer/painter.hpp

@@ -64,8 +64,6 @@ public:
     // Perform cleanup tasks that prepare shutting down the app. This doesn't mean that the
     // app will be shut down. That means all operations must be automatically be reversed (e.g. through
     // lazy initialization) in case rendering continues.
-    void cleanup();
-
     void terminate();
 
     // Renders the backdrop of the OpenGL view. This also paints in areas where we don't have any