From 4fb34e68e9f8d625e4beff26429741d3fc742aa6 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Mon, 27 Sep 2010 16:20:11 -0400
Subject: [PATCH] Bug 592769 - EGL and WGL context providers crash on exit
 because they forget to delete the global context before the glue library dies
 - r=mattwoodrow, a=blocking-beta7

---
 gfx/thebes/GLContextProviderEGL.cpp | 1 +
 gfx/thebes/GLContextProviderWGL.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/gfx/thebes/GLContextProviderEGL.cpp b/gfx/thebes/GLContextProviderEGL.cpp
index a49c4d3dd3e4..32da854ed8c5 100644
--- a/gfx/thebes/GLContextProviderEGL.cpp
+++ b/gfx/thebes/GLContextProviderEGL.cpp
@@ -1608,6 +1608,7 @@ GLContextProviderEGL::GetGlobalContext()
 void
 GLContextProviderEGL::Shutdown()
 {
+    gGlobalContext = nsnull;
 }
 
 } /* namespace gl */
diff --git a/gfx/thebes/GLContextProviderWGL.cpp b/gfx/thebes/GLContextProviderWGL.cpp
index 68d083b10a7d..cc9d9a4fe1db 100644
--- a/gfx/thebes/GLContextProviderWGL.cpp
+++ b/gfx/thebes/GLContextProviderWGL.cpp
@@ -741,6 +741,7 @@ GLContextProviderWGL::GetGlobalContext()
 void
 GLContextProviderWGL::Shutdown()
 {
+    gGlobalContext = nsnull;
 }
 
 } /* namespace gl */