ozone: Don't take a self reference in surfaceless adapter dtor

ui/gl/gl_surface_ozone.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gl/gl_surface.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 560 matching lines @@
   }
   GLSurfaceOzoneSurfaceless::SwapBuffersAsync(callback);
   current_surface_ ^= 1;
   BindFramebuffer();
 }
 
 void GLSurfaceOzoneSurfacelessSurfaceImpl::Destroy() {
   if (!context_)
     return;
   scoped_refptr<gfx::GLContext> previous_context = gfx::GLContext::GetCurrent();
-  scoped_refptr<gfx::GLSurface> previous_surface = gfx::GLSurface::GetCurrent();
-  context_->MakeCurrent(this);
+  scoped_refptr<gfx::GLSurface> previous_surface;
+
+  bool was_current = previous_context && previous_context->IsCurrent(nullptr) &&
+                     gfx::GLSurface::GetCurrent() == this;
+  if (!was_current) {
+    // Only take a reference to previous surface if it's not |this|
+    // because otherwise we can take a self reference from our own dtor.
+    previous_surface = gfx::GLSurface::GetCurrent();
+    context_->MakeCurrent(this);
+  }
 
   glBindFramebufferEXT(GL_FRAMEBUFFER, 0);
   if (fbo_) {
     glDeleteTextures(arraysize(textures_), textures_);
     for (auto& texture : textures_)
       texture = 0;
     glDeleteFramebuffersEXT(1, &fbo_);
     fbo_ = 0;
   }
   for (auto image : images_) {
     if (image)
       image->Destroy(true);
   }
 
-  if (previous_context.get()) {
+  if (!was_current) {
     previous_context->MakeCurrent(previous_surface.get());
   } else {
     context_->ReleaseCurrent(this);
   }
 }
 
 bool GLSurfaceOzoneSurfacelessSurfaceImpl::IsSurfaceless() const {
   return false;
 }
 
@@ skipping 164 matching lines @@
   }
 }
 
 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() {
   return ui::OzonePlatform::GetInstance()
       ->GetSurfaceFactoryOzone()
       ->GetNativeDisplay();
 }
 
 }  // namespace gfx