WindowSurfaceCGL: unregister the SwapLayer on destruction

Previously the SwapLayer was kept in the CALayer hierarchy after WindowSurfaceCGL's destruction which caused SwapLayer's callbacks to be called after the shared data was freed, causing a segfault. BUG=angleproject:1233 Change-Id: I71dce45330e6b7d5f06a41198c10890b1d8d520e Reviewed-on: https://chromium-review.googlesource.com/320711 Tryjob-Request: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Corentin Wallez <cwallez@chromium.org>

WindowSurfaceCGL: unregister the SwapLayer on destruction
da66ed62 · Corentin Wallez · c8c99a0a · da66ed62
Commit da66ed62 authored Jan 08, 2016 by Corentin Wallez
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

WindowSurfaceCGL.mm src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm +1 -0

No files found.
--- a/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm
+++ b/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm
@@ -177,6 +177,7 @@ WindowSurfaceCGL::~WindowSurfaceCGL()

    if (mSwapLayer != nil)
    {
+        [mSwapLayer removeFromSuperlayer];
        [mSwapLayer release];
        mSwapLayer = nil;
    }