Fix order of TearDown of EGLSurfaceTest

Previously the OS window was deleted before the EGL window surface which caused the GLX window to be deleted after its X window was deleted. All this was invalid and resulted in a crash. BUG=angleproject:892 Change-Id: I394795b6ebce947ad7eeab9a70ad5f80fcd89241 Reviewed-on: https://chromium-review.googlesource.com/273055Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Corentin Wallez <cwallez@chromium.org>

Fix order of TearDown of EGLSurfaceTest
e6d82c6d · Corentin Wallez · aaa9eb94 · e6d82c6d
Commit e6d82c6d authored May 25, 2015 by Corentin Wallez
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

EGLSurfaceTest.cpp src/tests/egl_tests/EGLSurfaceTest.cpp +3 -3

No files found.
--- a/src/tests/egl_tests/EGLSurfaceTest.cpp
+++ b/src/tests/egl_tests/EGLSurfaceTest.cpp
@@ -39,9 +39,6 @@ class EGLSurfaceTest : public testing::Test
    // Release any resources created in the test body
    void TearDown() override
    {
-        mOSWindow->destroy();
-        SafeDelete(mOSWindow);
        if (mDisplay != EGL_NO_DISPLAY)
        {
            eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
@@ -74,6 +71,9 @@ class EGLSurfaceTest : public testing::Test
            mDisplay = EGL_NO_DISPLAY;
        }
+        mOSWindow->destroy();
+        SafeDelete(mOSWindow);
        ASSERT_TRUE(mWindowSurface == EGL_NO_SURFACE && mContext == EGL_NO_CONTEXT);
    }