Merge the Framebuffer onDestroy and onDestroyDefault methods.

src/libANGLE/Display.cpp

@@ -530,8 +530,6 @@ Error Display::terminate()
 
     mMemoryProgramCache.clear();
 
-    mProxyContext.reset(nullptr);
-
     while (!mContextSet.empty())
     {
         ANGLE_TRY(destroyContext(*mContextSet.begin()));
@@ -555,6 +553,9 @@ Error Display::terminate()
         ANGLE_TRY(destroySurface(*mState.surfaceSet.begin()));
     }
 
+    // Allow the EGL objects that are being deleted to use the proxy context.
+    mProxyContext.reset(nullptr);
+
     mConfigSet.clear();
 
     if (mDevice != nullptr && mDevice->getOwningDisplay() != nullptr)

src/libANGLE/Framebuffer.cpp

@@ -700,11 +700,6 @@ void Framebuffer::onDestroy(const Context *context)
     mImpl->destroy(context);
 }
 
-void Framebuffer::destroyDefault(const egl::Display *display)
-{
-    mImpl->destroyDefault(display);
-}
-
 void Framebuffer::setLabel(const std::string &label)
 {
     mState.mLabel = label;

src/libANGLE/Framebuffer.h

@@ -144,7 +144,6 @@ class Framebuffer final : public angle::ObserverInterface, public LabeledObject
 
     ~Framebuffer() override;
     void onDestroy(const Context *context);
-    void destroyDefault(const egl::Display *display);
 
     void setLabel(const std::string &label) override;
     const std::string &getLabel() const override;

src/libANGLE/Surface.cpp

@@ -119,7 +119,7 @@ Error Surface::destroyImpl(const Display *display)
 {
     if (mState.defaultFramebuffer)
     {
-        mState.defaultFramebuffer->destroyDefault(display);
+        mState.defaultFramebuffer->onDestroy(display->getProxyContext());
     }
     if (mImplementation)
     {

src/libANGLE/renderer/FramebufferImpl.h

@@ -32,7 +32,6 @@ class FramebufferImpl : angle::NonCopyable
     explicit FramebufferImpl(const gl::FramebufferState &state) : mState(state) {}
     virtual ~FramebufferImpl() {}
     virtual void destroy(const gl::Context *context) {}
-    virtual void destroyDefault(const egl::Display *display) {}
 
     virtual gl::Error discard(const gl::Context *context,
                               size_t count,

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -85,13 +85,6 @@ void FramebufferVk::destroy(const gl::Context *context)
     renderer->releaseResource(*this, &mMaskedClearUniformBuffer.memory);
 }
 
-void FramebufferVk::destroyDefault(const egl::Display *display)
-{
-    VkDevice device = vk::GetImpl(display)->getRenderer()->getDevice();
-
-    mFramebuffer.destroy(device);
-}
-
 gl::Error FramebufferVk::discard(const gl::Context *context,
                                  size_t count,
                                  const GLenum *attachments)

src/libANGLE/renderer/vulkan/FramebufferVk.h

@@ -35,7 +35,6 @@ class FramebufferVk : public FramebufferImpl, public vk::CommandGraphResource
 
     ~FramebufferVk() override;
     void destroy(const gl::Context *context) override;
-    void destroyDefault(const egl::Display *display) override;
 
     gl::Error discard(const gl::Context *context, size_t count, const GLenum *attachments) override;
     gl::Error invalidate(const gl::Context *context,