From cbe34ab9f719e36a8953b1b119c96e34985c5493 Mon Sep 17 00:00:00 2001
From: Sotaro Ikeda <sotaro.ikeda.g@gmail.com>
Date: Tue, 25 Apr 2017 08:39:33 -0700
Subject: [PATCH] Bug 1359295 - Call MakeCurrent() before destroying webrender
 renderer r=nical

---
 gfx/webrender_bindings/RendererOGL.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gfx/webrender_bindings/RendererOGL.cpp b/gfx/webrender_bindings/RendererOGL.cpp
index 12d2a1623dfa..ec9d2eb9102c 100644
--- a/gfx/webrender_bindings/RendererOGL.cpp
+++ b/gfx/webrender_bindings/RendererOGL.cpp
@@ -74,6 +74,11 @@ RendererOGL::RendererOGL(RefPtr<RenderThread>&& aThread,
 RendererOGL::~RendererOGL()
 {
   MOZ_COUNT_DTOR(RendererOGL);
+  if (!mGL->MakeCurrent()) {
+    gfxCriticalNote << "Failed to make render context current during destroying.";
+    // Leak resources!
+    return;
+  }
   wr_renderer_delete(mWrRenderer);
 }