Merge remote-tracking branch 'origin' into bwg-vs2017upstream/bwg-vs2017

# Conflicts:
#	cmake/mason-dependencies.cmake

1 files changed, 13 insertions, 13 deletions

diff --git a/platform/android/src/graphics/rectf.cpp b/platform/android/src/graphics/rectf.cpp
index 1b375dad18..8f418da037 100644
--- a/platform/android/src/graphics/rectf.cpp
+++ b/platform/android/src/graphics/rectf.cpp
@@ -3,33 +3,33 @@
 namespace mbgl {
 namespace android {
 
-float RectF::getLeft(jni::JNIEnv& env, jni::Object<RectF> rectf) {
-    static auto field = RectF::javaClass.GetField<float>(env, "left");
+float RectF::getLeft(jni::JNIEnv& env, const jni::Object<RectF>& rectf) {
+    static auto& javaClass = jni::Class<RectF>::Singleton(env);
+    static auto field = javaClass.GetField<float>(env, "left");
     return rectf.Get(env, field);
 }
 
-float RectF::getTop(jni::JNIEnv& env, jni::Object<RectF> rectf) {
-    static auto field = RectF::javaClass.GetField<float>(env, "top");
+float RectF::getTop(jni::JNIEnv& env, const jni::Object<RectF>& rectf) {
+    static auto& javaClass = jni::Class<RectF>::Singleton(env);
+    static auto field = javaClass.GetField<float>(env, "top");
     return rectf.Get(env, field);
 }
 
-float RectF::getRight(jni::JNIEnv& env, jni::Object<RectF> rectf) {
-    static auto field = RectF::javaClass.GetField<float>(env, "right");
+float RectF::getRight(jni::JNIEnv& env, const jni::Object<RectF>& rectf) {
+    static auto& javaClass = jni::Class<RectF>::Singleton(env);
+    static auto field = javaClass.GetField<float>(env, "right");
     return rectf.Get(env, field);
 }
 
-float RectF::getBottom(jni::JNIEnv& env, jni::Object<RectF> rectf) {
-    static auto field = RectF::javaClass.GetField<float>(env, "bottom");
+float RectF::getBottom(jni::JNIEnv& env, const jni::Object<RectF>& rectf) {
+    static auto& javaClass = jni::Class<RectF>::Singleton(env);
+    static auto field = javaClass.GetField<float>(env, "bottom");
     return rectf.Get(env, field);
 }
 
 void RectF::registerNative(jni::JNIEnv& env) {
-    // Lookup the class
-    RectF::javaClass = *jni::Class<RectF>::Find(env).NewGlobalRef(env).release();
+    jni::Class<RectF>::Singleton(env);
 }
 
-jni::Class<RectF> RectF::javaClass;
-
-
 } // namespace android
 } // namespace mbgl
\ No newline at end of file