Revert of Return GrGLContext from GrTestTarget

gm/imagefromyuvtextures.cpp

 
 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This test only works with the GPU backend.
 
@@ skipping 87 matching lines @@
 
     void createYUVTextures(GrContext* context, GrGLuint yuvIDs[3]) {
         GrTestTarget tt;
         context->getTestTarget(&tt);
         if (!tt.target()) {
             SkDEBUGFAIL("Couldn't get Gr test target.");
             return;
         }
 
         // We currently hav only implemented the texture uploads for GL.
-        const GrGLInterface* gl = tt.glContext()->interface();
+        const GrGLInterface* gl = tt.glInterface();
         if (!gl) {
             return;
         }
 
         GR_GL_CALL(gl, GenTextures(3, yuvIDs));
         GR_GL_CALL(gl, ActiveTexture(GR_GL_TEXTURE0));
         GR_GL_CALL(gl, PixelStorei(GR_GL_UNPACK_ALIGNMENT, 1));
         for (int i = 0; i < 3; ++i) {
             GR_GL_CALL(gl, BindTexture(GR_GL_TEXTURE_2D, yuvIDs[i]));
             GR_GL_CALL(gl, TexParameteri(GR_GL_TEXTURE_2D, GR_GL_TEXTURE_MAG_FILTER,
@@ skipping 13 matching lines @@
     }
 
     void deleteYUVTextures(GrContext* context, const GrGLuint yuvIDs[3]) {
         GrTestTarget tt;
         context->getTestTarget(&tt);
         if (!tt.target()) {
             SkDEBUGFAIL("Couldn't get Gr test target.");
             return;
         }
 
-        const GrGLInterface* gl = tt.glContext()->interface();
+        const GrGLInterface* gl = tt.glInterface();
         if (!gl) {
             return;
         }
         GR_GL_CALL(gl, DeleteTextures(3, yuvIDs));
         context->resetContext();
     }
 
     void onDraw(SkCanvas* canvas) override {
         GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget();
         GrContext* context;
@@ skipping 42 matching lines @@
 
     static const int kBmpSize = 32;
 
     typedef GM INHERITED;
 };
 
 DEF_GM( return SkNEW(ImageFromYUVTextures); )
 }
 
 #endif