Fix crash on exit in OpenGL accelerated mode

Do not try to cleanup on an already destroyed OpenGL context.

Change-Id: I56d2a07700b1f69100be7fc9537dd0bc69449a0c
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

1 files changed, 16 insertions, 15 deletions

diff --git a/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp b/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
index 0c9fddc83..155678d94 100644
--- a/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
+++ b/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
@@ -441,22 +441,23 @@ GraphicsContext3D::~GraphicsContext3D()
     if (!m_private)
         return;
 
-    makeContextCurrent();
-    m_functions->glDeleteTextures(1, &m_texture);
-    m_functions->glDeleteFramebuffers(1, &m_fbo);
-    if (m_attrs.antialias) {
-        m_functions->glDeleteRenderbuffers(1, &m_multisampleColorBuffer);
-        m_functions->glDeleteFramebuffers(1, &m_multisampleFBO);
-        if (m_attrs.stencil || m_attrs.depth)
-            m_functions->glDeleteRenderbuffers(1, &m_multisampleDepthStencilBuffer);
-    } else if (m_attrs.stencil || m_attrs.depth) {
-        if (isGLES2Compliant()) {
-            if (m_attrs.depth)
-                m_functions->glDeleteRenderbuffers(1, &m_depthBuffer);
-            if (m_attrs.stencil)
-                m_functions->glDeleteRenderbuffers(1, &m_stencilBuffer);
+    if (makeContextCurrent()) {
+        m_functions->glDeleteTextures(1, &m_texture);
+        m_functions->glDeleteFramebuffers(1, &m_fbo);
+        if (m_attrs.antialias) {
+            m_functions->glDeleteRenderbuffers(1, &m_multisampleColorBuffer);
+            m_functions->glDeleteFramebuffers(1, &m_multisampleFBO);
+            if (m_attrs.stencil || m_attrs.depth)
+                m_functions->glDeleteRenderbuffers(1, &m_multisampleDepthStencilBuffer);
+        } else if (m_attrs.stencil || m_attrs.depth) {
+            if (isGLES2Compliant()) {
+                if (m_attrs.depth)
+                    m_functions->glDeleteRenderbuffers(1, &m_depthBuffer);
+                if (m_attrs.stencil)
+                    m_functions->glDeleteRenderbuffers(1, &m_stencilBuffer);
+            }
+            m_functions->glDeleteRenderbuffers(1, &m_depthStencilBuffer);
         }
-        m_functions->glDeleteRenderbuffers(1, &m_depthStencilBuffer);
     }
 
     m_functions = 0;