summaryrefslogtreecommitdiff
path: root/platform/android/src/style/layers/background_layer.cpp
diff options
context:
space:
mode:
authorKevin Li <kevin.li@mapbox.com>2020-03-24 14:33:54 +0800
committerGitHub <noreply@github.com>2020-03-24 14:33:54 +0800
commit3f45b0a24b5b608dfa75c84308d1ab0deb6159ee (patch)
tree31d3d4ced5b4004ee1a3ea27d683a148c04cbe22 /platform/android/src/style/layers/background_layer.cpp
parent1adc436c9d883663b2d6fb0cb9014043fa7bc2b6 (diff)
downloadqtlocation-mapboxgl-3f45b0a24b5b608dfa75c84308d1ab0deb6159ee.tar.gz
[android] Add jni binding for styleable snapshotter (#16286)
* [android] Add jni binding for styleable snapshotter * Remove Map parameter from factories - remove unused map from factory interfaces. Map is only needed for repaint. * implement addlayer function * Implement addsource function for snapshotter * Implement addImages function * format codes * Apply baseline * Update CHANGELOG.md * Update map_snapshotter.cpp * Destroy snapshotter on the thread it was created * Activate file sources in start * Use custom deleter for snapshotter * format codes * Release snapshotter pointer to deleting lambda * Clang format * Update CHANGELOG.md * Fix review comments * FIx review comments Co-authored-by: Alexander Shalamov <alexander.shalamov@mapbox.com>
Diffstat (limited to 'platform/android/src/style/layers/background_layer.cpp')
-rw-r--r--platform/android/src/style/layers/background_layer.cpp25
1 files changed, 14 insertions, 11 deletions
diff --git a/platform/android/src/style/layers/background_layer.cpp b/platform/android/src/style/layers/background_layer.cpp
index e28fd0798b..3eae30677f 100644
--- a/platform/android/src/style/layers/background_layer.cpp
+++ b/platform/android/src/style/layers/background_layer.cpp
@@ -26,16 +26,13 @@ namespace android {
/**
* Creates a non-owning peer object (for layers currently attached to the map)
*/
- BackgroundLayer::BackgroundLayer(mbgl::Map& map, mbgl::style::BackgroundLayer& coreLayer)
- : Layer(map, coreLayer) {
- }
+ BackgroundLayer::BackgroundLayer(mbgl::style::BackgroundLayer& coreLayer) : Layer(coreLayer) {}
/**
* Creates an owning peer object (for layers not attached to the map)
*/
- BackgroundLayer::BackgroundLayer(mbgl::Map& map, std::unique_ptr<mbgl::style::BackgroundLayer> coreLayer)
- : Layer(map, std::move(coreLayer)) {
- }
+ BackgroundLayer::BackgroundLayer(std::unique_ptr<mbgl::style::BackgroundLayer> coreLayer)
+ : Layer(std::move(coreLayer)) {}
BackgroundLayer::~BackgroundLayer() = default;
@@ -108,14 +105,18 @@ namespace android {
}
} // namespace
- jni::Local<jni::Object<Layer>> BackgroundJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::Map& map, mbgl::style::Layer& layer) {
+ jni::Local<jni::Object<Layer>> BackgroundJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
+ mbgl::style::Layer& layer) {
assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
- return createJavaPeer(env, new BackgroundLayer(map, toBackgroundLayer(layer)));
+ return createJavaPeer(env, new BackgroundLayer(toBackgroundLayer(layer)));
}
- jni::Local<jni::Object<Layer>> BackgroundJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::Map& map, std::unique_ptr<mbgl::style::Layer> layer) {
+ jni::Local<jni::Object<Layer>> BackgroundJavaLayerPeerFactory::createJavaLayerPeer(
+ jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
- return createJavaPeer(env, new BackgroundLayer(map, std::unique_ptr<mbgl::style::BackgroundLayer>(static_cast<mbgl::style::BackgroundLayer*>(layer.release()))));
+ return createJavaPeer(env,
+ new BackgroundLayer(std::unique_ptr<mbgl::style::BackgroundLayer>(
+ static_cast<mbgl::style::BackgroundLayer*>(layer.release()))));
}
void BackgroundJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
@@ -126,7 +127,9 @@ namespace android {
// Register the peer
jni::RegisterNativePeer<BackgroundLayer>(
- env, javaClass, "nativePtr",
+ env,
+ javaClass,
+ "nativePtr",
jni::MakePeer<BackgroundLayer, jni::String&>,
"initialize",
"finalize",