From b5c0bf1b8d18bb79ce393ac38b2e55a74863071c Mon Sep 17 00:00:00 2001 From: Ivo van Dongen Date: Thu, 13 Jul 2017 12:38:48 +0300 Subject: [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 8da2ccb6a2..4f84492789 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -117,9 +117,6 @@ gl::ProcAddress NativeMapView::initializeExtension(const char* name) { } void NativeMapView::activate() { - if (active++) { - return; - } oldDisplay = eglGetCurrentDisplay(); oldReadSurface = eglGetCurrentSurface(EGL_READ); @@ -148,10 +145,6 @@ void NativeMapView::activate() { * From mbgl::RendererBackend. */ 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 6409237940..ef0e9e936c 100755 --- a/platform/android/src/native_map_view.hpp +++ b/platform/android/src/native_map_view.hpp @@ -333,8 +333,6 @@ private: std::shared_ptr threadPool; std::unique_ptr map; mbgl::EdgeInsets insets; - - unsigned active = 0; }; } // namespace android -- cgit v1.2.1