Enable the Sky compositor again

mojo/skia/ganesh_context.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 "mojo/skia/ganesh_context.h"
 
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
 
@@ skipping 28 matching lines @@
   DCHECK(interface);
 
   context_ = skia::AdoptRef(GrContext::Create(
       kOpenGL_GrBackend, reinterpret_cast<GrBackendContext>(interface.get())));
   DCHECK(context_);
   context_->setResourceCacheLimits(kMaxGaneshResourceCacheCount,
                                    kMaxGaneshResourceCacheBytes);
 }
 
 GaneshContext::~GaneshContext() {
+  if (context_) {
+    Scope scope(this);
+    context_.clear();
+  }
   if (gl_context_.get())
     gl_context_->RemoveObserver(this);
 }
 
 bool GaneshContext::InScope() const {
   return gles2::GetGLContext() == gl_context_->gl();
 }
 
 void GaneshContext::OnContextLost() {
   context_->abandonContext();
   context_.clear();
   gl_context_.reset();
 }
 
 }  // namespace mojo