diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2018-08-22 12:27:43 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-09-07 09:44:12 -0700 |
commit | 79bf0e8af6bf9ec829a352d56b8e70ccc8f4fa41 (patch) | |
tree | 2b646523d45f0fa9917612ed80de12bbd35d5b1e /platform/android/src/map_renderer.hpp | |
parent | 5911e3b13f2f2b6741e26db3e41513ed21cc95b4 (diff) | |
download | qtlocation-mapboxgl-79bf0e8af6bf9ec829a352d56b8e70ccc8f4fa41.tar.gz |
[android] jni.hpp 4.0.0
Diffstat (limited to 'platform/android/src/map_renderer.hpp')
-rw-r--r-- | platform/android/src/map_renderer.hpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/platform/android/src/map_renderer.hpp b/platform/android/src/map_renderer.hpp index 6fcf2fee71..d60447e0ec 100644 --- a/platform/android/src/map_renderer.hpp +++ b/platform/android/src/map_renderer.hpp @@ -9,8 +9,6 @@ #include <jni/jni.hpp> #include <mbgl/storage/default_file_source.hpp> -#include "jni/generic_global_ref_deleter.hpp" - namespace mbgl { template <class> @@ -40,14 +38,14 @@ public: static void registerNative(jni::JNIEnv&); - static MapRenderer& getNativePeer(JNIEnv&, jni::Object<MapRenderer>); + static MapRenderer& getNativePeer(JNIEnv&, const jni::Object<MapRenderer>&); MapRenderer(jni::JNIEnv& _env, - jni::Object<MapRenderer>, - jni::Object<FileSource>, + const jni::Object<MapRenderer>&, + const jni::Object<FileSource>&, jni::jfloat pixelRatio, - jni::String programCacheDir, - jni::String localIdeographFontFamily); + const jni::String& programCacheDir, + const jni::String& localIdeographFontFamily); ~MapRenderer() override; @@ -97,7 +95,7 @@ private: void onSurfaceChanged(JNIEnv&, jint width, jint height); private: - GenericWeak<jni::Object<MapRenderer>> javaPeer; + jni::WeakReference<jni::Object<MapRenderer>, jni::EnvAttachingDeleter> javaPeer; float pixelRatio; DefaultFileSource& fileSource; |