diff options
Diffstat (limited to 'platform/ios')
| -rw-r--r-- | platform/ios/core-files.json | 7 | ||||
| -rw-r--r-- | platform/ios/src/MGLMapView.mm | 10 |
2 files changed, 4 insertions, 13 deletions
diff --git a/platform/ios/core-files.json b/platform/ios/core-files.json index c3e54a45b0..26a7857dd2 100644 --- a/platform/ios/core-files.json +++ b/platform/ios/core-files.json @@ -13,10 +13,9 @@ "platform/default/src/mbgl/gl/headless_backend.cpp", "platform/default/src/mbgl/gl/headless_frontend.cpp", "platform/default/src/mbgl/map/map_snapshotter.cpp", + "platform/default/src/mbgl/platform/thread_pool.cpp", "platform/default/src/mbgl/text/bidi.cpp", - "platform/default/src/mbgl/util/default_thread_pool.cpp", "platform/default/src/mbgl/util/png_writer.cpp", - "platform/default/src/mbgl/util/shared_thread_pool.cpp", "platform/default/src/mbgl/util/thread_local.cpp", "platform/default/src/mbgl/util/utf.cpp" ], @@ -26,9 +25,7 @@ "mbgl/gl/headless_backend.hpp": "platform/default/include/mbgl/gl/headless_backend.hpp", "mbgl/gl/headless_frontend.hpp": "platform/default/include/mbgl/gl/headless_frontend.hpp", "mbgl/map/map_snapshotter.hpp": "platform/default/include/mbgl/map/map_snapshotter.hpp", - "mbgl/util/default_styles.hpp": "platform/default/include/mbgl/util/default_styles.hpp", - "mbgl/util/default_thread_pool.hpp": "platform/default/include/mbgl/util/default_thread_pool.hpp", - "mbgl/util/shared_thread_pool.hpp": "platform/default/include/mbgl/util/shared_thread_pool.hpp" + "mbgl/util/default_styles.hpp": "platform/default/include/mbgl/util/default_styles.hpp" }, "private_headers": { "CFHandle.hpp": "platform/darwin/src/CFHandle.hpp" diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 59bb1c6666..bc7b5da9ef 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -10,7 +10,6 @@ #include <mbgl/map/mode.hpp> #include <mbgl/util/platform.hpp> #include <mbgl/storage/reachability.h> -#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> #include <mbgl/storage/network_status.hpp> #include <mbgl/style/style.hpp> @@ -30,7 +29,6 @@ #include <mbgl/util/default_styles.hpp> #include <mbgl/util/chrono.hpp> #include <mbgl/util/run_loop.hpp> -#include <mbgl/util/shared_thread_pool.hpp> #include <mbgl/util/string.hpp> #include <mbgl/util/projection.hpp> @@ -272,8 +270,6 @@ public: MBGLView *_mbglView; std::unique_ptr<MGLRenderFrontend> _rendererFrontend; - std::shared_ptr<mbgl::ThreadPool> _mbglThreadPool; - BOOL _opaque; MGLAnnotationTagContextMap _annotationContextsByAnnotationTag; @@ -468,9 +464,8 @@ public: // setup mbgl map MGLRendererConfiguration *config = [MGLRendererConfiguration currentConfiguration]; - _mbglThreadPool = mbgl::sharedThreadPool(); - auto renderer = std::make_unique<mbgl::Renderer>(*_mbglView, config.scaleFactor, *config.fileSource, *_mbglThreadPool, config.contextMode, config.cacheDir, config.localFontFamilyName); + auto renderer = std::make_unique<mbgl::Renderer>(*_mbglView, config.scaleFactor, *config.fileSource, config.contextMode, config.cacheDir, config.localFontFamilyName); BOOL enableCrossSourceCollisions = !config.perSourceCollisions; _rendererFrontend = std::make_unique<MGLRenderFrontend>(std::move(renderer), self, *_mbglView); @@ -481,7 +476,7 @@ public: .withCrossSourceCollisions(enableCrossSourceCollisions); NSAssert(!_mbglMap, @"_mbglMap should be NULL"); - _mbglMap = new mbgl::Map(*_rendererFrontend, *_mbglView, self.size, config.scaleFactor, *[config fileSource], *_mbglThreadPool, mapOptions); + _mbglMap = new mbgl::Map(*_rendererFrontend, *_mbglView, self.size, config.scaleFactor, *[config fileSource], mapOptions); // start paused if in IB if (_isTargetingInterfaceBuilder || background) { @@ -739,7 +734,6 @@ public: _mbglView = nullptr; _rendererFrontend.reset(); - _mbglThreadPool.reset(); } - (void)dealloc |