summaryrefslogtreecommitdiff
path: root/platform/android/src/style/sources/source.hpp
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2016-11-10 12:35:49 +0100
committerIvo van Dongen <ivovandongen@users.noreply.github.com>2016-11-11 13:46:10 +0100
commit822b83ae4e0308f6f84c1955afbd27f753cfba12 (patch)
treedd47005b705c35369ebf16468420f5ff24e52828 /platform/android/src/style/sources/source.hpp
parent3a4a27c95f1c10c480532c46c4edb7b3120b7a2b (diff)
downloadqtlocation-mapboxgl-822b83ae4e0308f6f84c1955afbd27f753cfba12.tar.gz
[android] fix source ownership
Diffstat (limited to 'platform/android/src/style/sources/source.hpp')
-rw-r--r--platform/android/src/style/sources/source.hpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/platform/android/src/style/sources/source.hpp b/platform/android/src/style/sources/source.hpp
index 0785e4d4e0..b24dc891b4 100644
--- a/platform/android/src/style/sources/source.hpp
+++ b/platform/android/src/style/sources/source.hpp
@@ -32,16 +32,23 @@ public:
virtual ~Source();
+ void addToMap(mbgl::Map&);
+
virtual jni::jobject* createJavaPeer(jni::JNIEnv&) = 0;
jni::String getId(jni::JNIEnv&);
+protected:
//Release the owned view and return it
std::unique_ptr<mbgl::style::Source> releaseCoreSource();
-protected:
+ //Set on newly created sources until added to the map
std::unique_ptr<mbgl::style::Source> ownedSource;
+
+ //Raw pointer that is valid until the source is removed from the map
mbgl::style::Source& source;
+
+ //Map pointer is valid for newly created sources only after adding to the map
mbgl::Map* map;
};