Bug 985773 - Destroy SkiaGLGlue in gfxPlatform::Shutdown() instead of relying on destructor r=gwright
authorJames Willcox <snorp@snorp.net>
Wed, 26 Mar 2014 13:21:16 -0500
changeset 175547 6374f5d7525de5b445127eeed3004243fdf1cad5
parent 175546 7ebf21a3322054f859acaeabb9dd0a3f7501906c
child 175548 cf6adb086a9e5064980436f8e70d7b12c4389d60
push id26492
push userryanvm@gmail.com
push dateThu, 27 Mar 2014 00:57:51 +0000
treeherdermozilla-central@441f5fd256e2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgwright
bugs985773
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 985773 - Destroy SkiaGLGlue in gfxPlatform::Shutdown() instead of relying on destructor r=gwright
gfx/thebes/gfxPlatform.cpp
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -467,16 +467,17 @@ gfxPlatform::Shutdown()
 
         NS_ASSERTION(gPlatform->mMemoryPressureObserver, "mMemoryPressureObserver has already gone");
         nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
         if (obs) {
             obs->RemoveObserver(gPlatform->mMemoryPressureObserver, "memory-pressure");
         }
 
         gPlatform->mMemoryPressureObserver = nullptr;
+        gPlatform->mSkiaGlue = nullptr;
     }
 
 #ifdef MOZ_WIDGET_ANDROID
     // Shut down the texture pool
     mozilla::gl::TexturePoolOGL::Shutdown();
 #endif
 
     // Shut down the default GL context provider.