diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-07-21 16:36:31 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-07-26 09:50:38 -0700 |
commit | d4cb498d7abc612029c575fb290eb649a4697d57 (patch) | |
tree | 9e9221873a3c51ef538402f1f7dec4055cb828e5 /platform/android/src | |
parent | 32bd1d54fa777035920b58e653905e4592ef187c (diff) | |
download | qtlocation-mapboxgl-d4cb498d7abc612029c575fb290eb649a4697d57.tar.gz |
[all] Merge View into RendererBackend
Diffstat (limited to 'platform/android/src')
-rw-r--r-- | platform/android/src/android_renderer_frontend.cpp | 5 | ||||
-rw-r--r-- | platform/android/src/android_renderer_frontend.hpp | 4 | ||||
-rwxr-xr-x | platform/android/src/native_map_view.cpp | 4 | ||||
-rwxr-xr-x | platform/android/src/native_map_view.hpp | 8 |
4 files changed, 7 insertions, 14 deletions
diff --git a/platform/android/src/android_renderer_frontend.cpp b/platform/android/src/android_renderer_frontend.cpp index 41e44d297a..597bebe40d 100644 --- a/platform/android/src/android_renderer_frontend.cpp +++ b/platform/android/src/android_renderer_frontend.cpp @@ -1,6 +1,5 @@ #include "android_renderer_frontend.hpp" -#include <mbgl/map/view.hpp> #include <mbgl/renderer/backend_scope.hpp> #include <mbgl/renderer/renderer.hpp> @@ -37,13 +36,13 @@ void AndroidRendererFrontend::update(std::shared_ptr<UpdateParameters> params) { asyncInvalidate.send(); } -void AndroidRendererFrontend::render(View& view) { +void AndroidRendererFrontend::render() { assert (renderer); if (!updateParameters) return; BackendScope guard { backend }; - renderer->render(view, *updateParameters); + renderer->render(*updateParameters); } void AndroidRendererFrontend::onLowMemory() { diff --git a/platform/android/src/android_renderer_frontend.hpp b/platform/android/src/android_renderer_frontend.hpp index 59ece88f19..107bbbe0b6 100644 --- a/platform/android/src/android_renderer_frontend.hpp +++ b/platform/android/src/android_renderer_frontend.hpp @@ -13,9 +13,7 @@ namespace mbgl { -class View; class Renderer; -class View; class RenderedQueryOptions; class SourceQueryOptions; @@ -31,7 +29,7 @@ public: void setObserver(RendererObserver&) override; void update(std::shared_ptr<UpdateParameters>) override; - void render(View& view); + void render(); // Feature querying std::vector<Feature> queryRenderedFeatures(const ScreenCoordinate&, const RenderedQueryOptions&) const; diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index 17f55d9827..fa9e90ddc6 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -107,7 +107,7 @@ NativeMapView::~NativeMapView() { } /** - * From mbgl::View + * From mbgl::RendererBackend */ void NativeMapView::bind() { setFramebufferBinding(0); @@ -275,7 +275,7 @@ void NativeMapView::render(jni::JNIEnv& env) { framebufferSizeChanged = false; } - rendererFrontend->render(*this); + rendererFrontend->render(); if(snapshot){ snapshot = false; diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp index 387593350a..ba1545728a 100755 --- a/platform/android/src/native_map_view.hpp +++ b/platform/android/src/native_map_view.hpp @@ -4,7 +4,6 @@ #include <mbgl/map/change.hpp> #include <mbgl/map/camera.hpp> #include <mbgl/map/map.hpp> -#include <mbgl/map/view.hpp> #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/default_thread_pool.hpp> #include <mbgl/util/run_loop.hpp> @@ -38,7 +37,7 @@ namespace android { class AndroidRendererFrontend; -class NativeMapView : public View, public RendererBackend, public MapObserver { +class NativeMapView : public RendererBackend, public MapObserver { public: static constexpr auto Name() { return "com/mapbox/mapboxsdk/maps/NativeMapView"; }; @@ -55,12 +54,9 @@ public: virtual ~NativeMapView(); - // mbgl::View // - - void bind() override; - // mbgl::RendererBackend // + void bind() override; void updateAssumedState() override; // Deprecated // |