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/darwin/src/MGLRendererFrontend.h | |
parent | 32bd1d54fa777035920b58e653905e4592ef187c (diff) | |
download | qtlocation-mapboxgl-d4cb498d7abc612029c575fb290eb649a4697d57.tar.gz |
[all] Merge View into RendererBackend
Diffstat (limited to 'platform/darwin/src/MGLRendererFrontend.h')
-rw-r--r-- | platform/darwin/src/MGLRendererFrontend.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/platform/darwin/src/MGLRendererFrontend.h b/platform/darwin/src/MGLRendererFrontend.h index 3611577f2e..76904d008b 100644 --- a/platform/darwin/src/MGLRendererFrontend.h +++ b/platform/darwin/src/MGLRendererFrontend.h @@ -13,12 +13,10 @@ class MGLRenderFrontend : public mbgl::RendererFrontend { public: - MGLRenderFrontend(std::unique_ptr<mbgl::Renderer> renderer_, MGLMapView* nativeView_, mbgl::RendererBackend& mbglBackend_, mbgl::View& mbglView_, bool async = false) + MGLRenderFrontend(std::unique_ptr<mbgl::Renderer> renderer_, MGLMapView* nativeView_, mbgl::RendererBackend& mbglBackend_, bool async = false) : renderer(std::move(renderer_)) , nativeView(nativeView_) - , mbglBackend(mbglBackend_) - , mbglView(mbglView_) { - + , mbglBackend(mbglBackend_) { if (async) { asyncInvalidate.emplace([&]() { [nativeView setNeedsGLDisplay]; @@ -51,7 +49,7 @@ public: mbgl::BackendScope guard { mbglBackend, mbgl::BackendScope::ScopeType::Implicit }; - renderer->render(mbglView, *updateParameters); + renderer->render(*updateParameters); } mbgl::Renderer* getRenderer() { @@ -67,7 +65,6 @@ private: std::unique_ptr<mbgl::Renderer> renderer; __weak MGLMapView *nativeView = nullptr; mbgl::RendererBackend& mbglBackend; - mbgl::View& mbglView; std::shared_ptr<mbgl::UpdateParameters> updateParameters; mbgl::optional<mbgl::util::AsyncTask> asyncInvalidate; }; |