Some fixes around GrContext::abandonContext:

include/gpu/GrContextFactory.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrContextFactory_DEFINED
 #define GrContextFactory_DEFINED
 
@@ skipping 88 matching lines @@
             }
             fContexts[i].fGrContext->unref();
             if (NULL != fContexts[i].fGLContext) {
                 fContexts[i].fGLContext->unref();
             }
         }
         fContexts.reset();
     }
 
     void abandonContexts() {
         for (int i = 0; i < fContexts.count(); ++i) {

[robertphillips, 2014/07/29 14:32:31]

NULL != ?

[bsalomon, 2014/07/29 14:43:15]

Done.

-            SkSafeSetNull(fContexts[i].fGLContext);
+            if (fContexts[i].fGLContext) {
+                fContexts[i].fGLContext->testAbandon();

[robertphillips, 2014/07/29 14:32:31]

SkSafeSetNull(fContexts[i].fGLContext); ?

[bsalomon, 2014/07/29 14:43:15]

Done.

+                fContexts[i].fGLContext->unref();
+                fContexts[i].fGLContext = NULL;
+            }
             fContexts[i].fGrContext->abandonContext();
         }
     }
 
     /**
      * Get a GrContext initialized with a type of GL context. It also makes the GL context current.
      */
     GrContext* get(GLContextType type, GrGLStandard forcedGpuAPI = kNone_GrGLStandard) {
         for (int i = 0; i < fContexts.count(); ++i) {
             if (forcedGpuAPI != kNone_GrGLStandard &&
@@ skipping 80 matching lines @@
 private:
     struct GPUContext {
         GLContextType             fType;
         SkGLContextHelper*        fGLContext;
         GrContext*                fGrContext;
     };
     SkTArray<GPUContext, true> fContexts;
 };
 
 #endif