From e7f45e0b19eaa86b587e5269f85ecd0eb8a55de7 Mon Sep 17 00:00:00 2001 From: Ivo van Dongen Date: Thu, 13 Jul 2017 12:38:48 +0300 Subject: [PATCH] [android] remove manual ref counting on activation/deactivation --- platform/android/src/native_map_view.cpp | 7 ------- platform/android/src/native_map_view.hpp | 2 -- 2 files changed, 9 deletions(-) diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index 0a57d3e6b..5b0825fa0 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -120,9 +120,6 @@ gl::ProcAddress NativeMapView::initializeExtension(const char* name) { } void NativeMapView::activate() { - if (active++) { - return; - } oldDisplay = eglGetCurrentDisplay(); oldReadSurface = eglGetCurrentSurface(EGL_READ); @@ -151,10 +148,6 @@ void NativeMapView::activate() { * From mbgl::Backend. */ void NativeMapView::deactivate() { - if (--active) { - return; - } - assert(vm != nullptr); if (oldContext != context && oldContext != EGL_NO_CONTEXT) { diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp index df43ad08b..c638de44f 100755 --- a/platform/android/src/native_map_view.hpp +++ b/platform/android/src/native_map_view.hpp @@ -334,8 +334,6 @@ private: std::shared_ptr threadPool; std::unique_ptr map; mbgl::EdgeInsets insets; - - unsigned active = 0; }; } // namespace android