summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2017-07-13 12:38:48 +0300
committerIvo van Dongen <info@ivovandongen.nl>2017-07-18 17:06:33 +0200
commitbf8b35c9547b2e0213a347e45242460337cf6018 (patch)
tree49be6520e0bf91867f451c07477fbf8b4239d0b2
parent386556b1a4be5ed4d9864fb2870c9b7a6b0da37b (diff)
downloadqtlocation-mapboxgl-upstream/9458-port-backendscope-changes.tar.gz
[android] remove manual ref counting on activation/deactivationupstream/9458-port-backendscope-changes
-rwxr-xr-xplatform/android/src/native_map_view.cpp7
-rwxr-xr-xplatform/android/src/native_map_view.hpp2
2 files changed, 0 insertions, 9 deletions
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp
index 0a57d3e6b4..5b0825fa09 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 df43ad08b7..c638de44fb 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<mbgl::ThreadPool> threadPool;
std::unique_ptr<mbgl::Map> map;
mbgl::EdgeInsets insets;
-
- unsigned active = 0;
};
} // namespace android