Bug 985773 - Destroy SkiaGLGlue in gfxPlatform::Shutdown() instead of relying on destructor r=gwright

This commit is contained in:
James Willcox 2014-03-26 09:12:19 -05:00
parent 8678be73d5
commit 49433cb15f
2 changed files with 9 additions and 0 deletions

View File

@ -474,6 +474,8 @@ gfxPlatform::Shutdown()
gPlatform->mMemoryPressureObserver = nullptr;
}
gPlatform->DestroySkiaGLGlue();
#ifdef MOZ_WIDGET_ANDROID
// Shut down the texture pool
mozilla::gl::TexturePoolOGL::Shutdown();
@ -881,6 +883,12 @@ gfxPlatform::GetSkiaGLGlue()
return mSkiaGlue;
}
void
gfxPlatform::DestroySkiaGLGlue()
{
mSkiaGlue = nullptr;
}
void
gfxPlatform::PurgeSkiaCache()
{

View File

@ -589,6 +589,7 @@ public:
bool UseDeprecatedTextures() const { return mLayersUseDeprecated; }
mozilla::gl::SkiaGLGlue* GetSkiaGLGlue();
void DestroySkiaGLGlue();
void PurgeSkiaCache();
protected: