[ios, macos] Fix a memory leak when creating an EAGLContext in MGLMap…

…Snapshotter. (#11193)
mapbox · Feb 27, 2018 · 6d2cbb0 · 6d2cbb0
1 parent aacd55c
commit 6d2cbb0
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/platform/darwin/src/headless_backend_eagl.mm b/platform/darwin/src/headless_backend_eagl.mm
@@ -7,9 +7,13 @@
 namespace mbgl {
 
 struct EAGLImpl : public HeadlessBackend::Impl {
-    EAGLImpl(EAGLContext* glContext_) : glContext(glContext_) {
-        [reinterpret_cast<EAGLContext*>(glContext) retain];
-        reinterpret_cast<EAGLContext*>(glContext).multiThreaded = YES;
+    EAGLImpl() {
+        glContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
+
+        if (glContext == nil) {
+            throw std::runtime_error("Error creating GL context object");
+        }
+        glContext.multiThreaded = YES;
     }
 
     ~EAGLImpl() {
@@ -45,12 +49,9 @@ void deactivateContext() {
 }
 
 void HeadlessBackend::createContext() {
-    EAGLContext* glContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
-    if (glContext == nil) {
-        throw std::runtime_error("Error creating GL context object");
-    }
-
-    impl.reset(new EAGLImpl(glContext));
+    impl.reset();
+    impl = std::make_unique<EAGLImpl>();
+
 }
 
 } // namespace mbgl