diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-13 16:24:27 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-13 17:56:44 +0200 |
commit | 8cc100bfd56955c629d5da0bc49ce2bdbae52946 (patch) | |
tree | a807cdfc906af092eb7158cd90c38834f68a55a0 /platform/android/src | |
parent | 1b39f456fdab71a918427dede28f27281bd28a14 (diff) | |
download | qtlocation-mapboxgl-8cc100bfd56955c629d5da0bc49ce2bdbae52946.tar.gz |
[core] Get FileSource via UpdateParameters in Renderer::Impl
Diffstat (limited to 'platform/android/src')
-rw-r--r-- | platform/android/src/android_renderer_frontend.cpp | 1 | ||||
-rw-r--r-- | platform/android/src/map_renderer.cpp | 7 | ||||
-rw-r--r-- | platform/android/src/map_renderer.hpp | 3 |
3 files changed, 2 insertions, 9 deletions
diff --git a/platform/android/src/android_renderer_frontend.cpp b/platform/android/src/android_renderer_frontend.cpp index 295ed1766b..21e8da6a21 100644 --- a/platform/android/src/android_renderer_frontend.cpp +++ b/platform/android/src/android_renderer_frontend.cpp @@ -3,7 +3,6 @@ #include <mbgl/actor/scheduler.hpp> #include <mbgl/renderer/renderer.hpp> #include <mbgl/renderer/renderer_observer.hpp> -#include <mbgl/storage/file_source.hpp> #include <mbgl/util/async_task.hpp> #include <mbgl/util/thread.hpp> #include <mbgl/util/run_loop.hpp> diff --git a/platform/android/src/map_renderer.cpp b/platform/android/src/map_renderer.cpp index cd8953e4cf..8d226c0008 100644 --- a/platform/android/src/map_renderer.cpp +++ b/platform/android/src/map_renderer.cpp @@ -9,20 +9,17 @@ #include "attach_env.hpp" #include "android_renderer_backend.hpp" #include "map_renderer_runnable.hpp" -#include "file_source.hpp" namespace mbgl { namespace android { MapRenderer::MapRenderer(jni::JNIEnv& _env, const jni::Object<MapRenderer>& obj, - const jni::Object<FileSource>& _fileSource, jni::jfloat pixelRatio_, const jni::String& programCacheDir_, const jni::String& localIdeographFontFamily_) : javaPeer(_env, obj) , pixelRatio(pixelRatio_) - , fileSource(FileSource::getDefaultFileSource(_env, _fileSource)) , programCacheDir(jni::Make<std::string>(_env, programCacheDir_)) , localIdeographFontFamily(localIdeographFontFamily_ ? jni::Make<std::string>(_env, localIdeographFontFamily_) : optional<std::string>{}) , threadPool(sharedThreadPool()) @@ -174,7 +171,7 @@ void MapRenderer::onSurfaceCreated(JNIEnv&) { // Create the new backend and renderer backend = std::make_unique<AndroidRendererBackend>(); - renderer = std::make_unique<Renderer>(*backend, pixelRatio, fileSource, *threadPool, + renderer = std::make_unique<Renderer>(*backend, pixelRatio, *threadPool, GLContextMode::Unique, programCacheDir, localIdeographFontFamily); rendererRef = std::make_unique<ActorRef<Renderer>>(*renderer, mailbox); @@ -211,7 +208,7 @@ void MapRenderer::registerNative(jni::JNIEnv& env) { // Register the peer jni::RegisterNativePeer<MapRenderer>(env, javaClass, "nativePtr", - jni::MakePeer<MapRenderer, const jni::Object<MapRenderer>&, const jni::Object<FileSource>&, jni::jfloat, const jni::String&, const jni::String&>, + jni::MakePeer<MapRenderer, const jni::Object<MapRenderer>&, jni::jfloat, const jni::String&, const jni::String&>, "nativeInitialize", "finalize", METHOD(&MapRenderer::render, "nativeRender"), METHOD(&MapRenderer::onSurfaceCreated, diff --git a/platform/android/src/map_renderer.hpp b/platform/android/src/map_renderer.hpp index fdc3600d02..3e5b99605e 100644 --- a/platform/android/src/map_renderer.hpp +++ b/platform/android/src/map_renderer.hpp @@ -23,7 +23,6 @@ class UpdateParameters; namespace android { class AndroidRendererBackend; -class FileSource; /** * The MapRenderer is a peer class that encapsulates the actions @@ -42,7 +41,6 @@ public: MapRenderer(jni::JNIEnv& _env, const jni::Object<MapRenderer>&, - const jni::Object<FileSource>&, jni::jfloat pixelRatio, const jni::String& programCacheDir, const jni::String& localIdeographFontFamily); @@ -103,7 +101,6 @@ private: jni::WeakReference<jni::Object<MapRenderer>, jni::EnvAttachingDeleter> javaPeer; float pixelRatio; - DefaultFileSource& fileSource; std::string programCacheDir; optional<std::string> localIdeographFontFamily; |