Destroy surfaces from Display::terminate instead of the DisplayImpl destructor.

Previously, the parent display impl would be destroyed before the surface impls. It is useful to call helper functions in the parent display during surface destruction. BUG=540829 Change-Id: I0884826d2e360319da896f049d46bfc01a2481a0 Reviewed-on: https://chromium-review.googlesource.com/316801Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Destroy surfaces from Display::terminate instead of the DisplayImpl destructor.
41ae31c4 · Geoff Lang · 1b3979b9 · 41ae31c4 · 41ae31c4
Commit 41ae31c4 authored Dec 08, 2015 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

Display.cpp src/libANGLE/Display.cpp +5 -0

DisplayImpl.cpp src/libANGLE/renderer/DisplayImpl.cpp +1 -4

No files found.
--- a/src/libANGLE/Display.cpp
+++ b/src/libANGLE/Display.cpp
@@ -420,6 +420,11 @@ void Display::terminate()
        destroyImage(*mImageSet.begin());
    }
+    while (!mImplementation->getSurfaceSet().empty())
+    {
+        destroySurface(*mImplementation->getSurfaceSet().begin());
+    }
    mConfigSet.clear();
    if (mDevice != nullptr && mDevice->getOwningDisplay() != nullptr)

--- a/src/libANGLE/renderer/DisplayImpl.cpp
+++ b/src/libANGLE/renderer/DisplayImpl.cpp
@@ -21,10 +21,7 @@ DisplayImpl::DisplayImpl()
 DisplayImpl::~DisplayImpl()
 {
-    while (!mSurfaceSet.empty())
+    ASSERT(mSurfaceSet.empty());
-    {
-        destroySurface(*mSurfaceSet.begin());
-    }
 }
 void DisplayImpl::destroySurface(egl::Surface *surface)