summaryrefslogtreecommitdiff
path: root/platform/default
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2017-02-17 10:57:21 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2017-02-20 12:04:21 -0800
commit535457262011f3790069c8426e7b143f3aba26d0 (patch)
tree5b78cc5fc1d8215fb315952af4a0960b70e26b52 /platform/default
parented7844d08f3cffaba00cc974c4ab6b26c84dd98d (diff)
downloadqtlocation-mapboxgl-535457262011f3790069c8426e7b143f3aba26d0.tar.gz
[core] Eliminate manual HeadlessBackend activation management
Diffstat (limited to 'platform/default')
-rw-r--r--platform/default/mbgl/gl/headless_backend.cpp3
-rw-r--r--platform/default/mbgl/gl/headless_backend.hpp5
2 files changed, 3 insertions, 5 deletions
diff --git a/platform/default/mbgl/gl/headless_backend.cpp b/platform/default/mbgl/gl/headless_backend.cpp
index 7ccf6d132b..61225d54a1 100644
--- a/platform/default/mbgl/gl/headless_backend.cpp
+++ b/platform/default/mbgl/gl/headless_backend.cpp
@@ -8,16 +8,13 @@
namespace mbgl {
HeadlessBackend::HeadlessBackend() {
- activate();
}
HeadlessBackend::HeadlessBackend(std::shared_ptr<HeadlessDisplay> display_)
: display(std::move(display_)) {
- activate();
}
HeadlessBackend::~HeadlessBackend() {
- deactivate();
}
void HeadlessBackend::activate() {
diff --git a/platform/default/mbgl/gl/headless_backend.hpp b/platform/default/mbgl/gl/headless_backend.hpp
index f566257522..e632d0feb6 100644
--- a/platform/default/mbgl/gl/headless_backend.hpp
+++ b/platform/default/mbgl/gl/headless_backend.hpp
@@ -18,8 +18,6 @@ public:
~HeadlessBackend() override;
void invalidate() override;
- void activate() override;
- void deactivate() override;
void notifyMapChange(MapChange) override;
void setMapChangeCallback(std::function<void(MapChange)>&& cb) { mapChangeCallback = std::move(cb); }
@@ -34,6 +32,9 @@ private:
// Implementation specific functions
static gl::glProc initializeExtension(const char*);
+ void activate() override;
+ void deactivate() override;
+
bool hasContext() const { return bool(impl); }
bool hasDisplay();