From ed7844d08f3cffaba00cc974c4ab6b26c84dd98d Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 17 Feb 2017 11:14:08 -0800
Subject: [PATCH] [core] Inline
 HeadlessBackend::{activate,deactivate,destroy}Context

HeadlessContext::destroyContext isn't even necessary; std::unique_ptr handles that automatically.
---
 platform/default/mbgl/gl/headless_backend.cpp | 22 ++++---------------
 platform/default/mbgl/gl/headless_backend.hpp |  6 -----
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/platform/default/mbgl/gl/headless_backend.cpp b/platform/default/mbgl/gl/headless_backend.cpp
index 0bfdf11c9..7ccf6d132 100644
--- a/platform/default/mbgl/gl/headless_backend.cpp
+++ b/platform/default/mbgl/gl/headless_backend.cpp
@@ -18,7 +18,6 @@ HeadlessBackend::HeadlessBackend(std::shared_ptr<HeadlessDisplay> display_)
 
 HeadlessBackend::~HeadlessBackend() {
     deactivate();
-    destroyContext();
 }
 
 void HeadlessBackend::activate() {
@@ -31,7 +30,8 @@ void HeadlessBackend::activate() {
         createContext();
     }
 
-    activateContext();
+    assert(hasContext());
+    impl->activateContext();
 
     if (!extensionsLoaded) {
         gl::InitializeExtensions(initializeExtension);
@@ -40,7 +40,8 @@ void HeadlessBackend::activate() {
 }
 
 void HeadlessBackend::deactivate() {
-    deactivateContext();
+    assert(hasContext());
+    impl->deactivateContext();
     active = false;
 }
 
@@ -48,21 +49,6 @@ void HeadlessBackend::invalidate() {
     assert(false);
 }
 
-void HeadlessBackend::destroyContext() {
-    assert(hasContext());
-    impl.reset();
-}
-
-void HeadlessBackend::activateContext() {
-    assert(hasContext());
-    impl->activateContext();
-}
-
-void HeadlessBackend::deactivateContext() {
-    assert(hasContext());
-    impl->deactivateContext();
-}
-
 void HeadlessBackend::notifyMapChange(MapChange change) {
     if (mapChangeCallback) {
         mapChangeCallback(change);
diff --git a/platform/default/mbgl/gl/headless_backend.hpp b/platform/default/mbgl/gl/headless_backend.hpp
index da8c55e04..f56625752 100644
--- a/platform/default/mbgl/gl/headless_backend.hpp
+++ b/platform/default/mbgl/gl/headless_backend.hpp
@@ -39,12 +39,6 @@ private:
 
     void createContext();
 
-private:
-    void destroyContext();
-
-    void activateContext();
-    void deactivateContext();
-
     std::unique_ptr<Impl> impl;
     std::shared_ptr<HeadlessDisplay> display;