diff options
author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2020-03-12 13:17:02 +0200 |
---|---|---|
committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2020-03-13 02:18:29 +0200 |
commit | c4502372e690b60ad9d4dea430531a1463fac635 (patch) | |
tree | ad3e8a62b2a569ef075995fba59900746017de64 /platform/android/src/style/layers/raster_layer.cpp | |
parent | d9d0cbcc6b1ec0c3eb0841e84561498ac1a067d4 (diff) | |
download | qtlocation-mapboxgl-upstream/alexshalamov_android_snapshotter.tar.gz |
Remove Map parameter from factoriesupstream/alexshalamov_android_snapshotter
- remove unused map from factory interfaces. Map is only needed for repaint.
Diffstat (limited to 'platform/android/src/style/layers/raster_layer.cpp')
-rw-r--r-- | platform/android/src/style/layers/raster_layer.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/platform/android/src/style/layers/raster_layer.cpp b/platform/android/src/style/layers/raster_layer.cpp index b12267525f..53442c0a94 100644 --- a/platform/android/src/style/layers/raster_layer.cpp +++ b/platform/android/src/style/layers/raster_layer.cpp @@ -26,15 +26,15 @@ namespace android { /** * Creates a non-owning peer object (for layers currently attached to the map) */ - RasterLayer::RasterLayer(mbgl::Map& map, mbgl::style::RasterLayer& coreLayer) - : Layer(map, coreLayer) { + RasterLayer::RasterLayer(mbgl::style::RasterLayer& coreLayer) + : Layer(coreLayer) { } /** * Creates an owning peer object (for layers not attached to the map) */ - RasterLayer::RasterLayer(mbgl::Map& map, std::unique_ptr<mbgl::style::RasterLayer> coreLayer) - : Layer(map, std::move(coreLayer)) { + RasterLayer::RasterLayer(std::unique_ptr<mbgl::style::RasterLayer> coreLayer) + : Layer(std::move(coreLayer)) { } RasterLayer::~RasterLayer() = default; @@ -172,14 +172,14 @@ namespace android { } } // namespace - jni::Local<jni::Object<Layer>> RasterJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::Map& map, mbgl::style::Layer& layer) { + jni::Local<jni::Object<Layer>> RasterJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) { assert(layer.baseImpl->getTypeInfo() == getTypeInfo()); - return createJavaPeer(env, new RasterLayer(map, toRasterLayer(layer))); + return createJavaPeer(env, new RasterLayer(toRasterLayer(layer))); } - jni::Local<jni::Object<Layer>> RasterJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::Map& map, std::unique_ptr<mbgl::style::Layer> layer) { + jni::Local<jni::Object<Layer>> RasterJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) { assert(layer->baseImpl->getTypeInfo() == getTypeInfo()); - return createJavaPeer(env, new RasterLayer(map, std::unique_ptr<mbgl::style::RasterLayer>(static_cast<mbgl::style::RasterLayer*>(layer.release())))); + return createJavaPeer(env, new RasterLayer(std::unique_ptr<mbgl::style::RasterLayer>(static_cast<mbgl::style::RasterLayer*>(layer.release())))); } void RasterJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { @@ -190,7 +190,9 @@ namespace android { // Register the peer jni::RegisterNativePeer<RasterLayer>( - env, javaClass, "nativePtr", + env, + javaClass, + "nativePtr", jni::MakePeer<RasterLayer, jni::String&, jni::String&>, "initialize", "finalize", |