Turn ContextInfos returned by GrContextFactory into structs.

tests/ProxyTest.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This is a GPU-backend specific test.
 
 #include "Test.h"
@@ skipping 58 matching lines @@
         REPORTER_ASSERT(reporter, tex->height() == texProxy->height());
     } else {
         REPORTER_ASSERT(reporter, tex->width() >= texProxy->width());
         REPORTER_ASSERT(reporter, tex->height() >= texProxy->height());
     }
     REPORTER_ASSERT(reporter, tex->config() == texProxy->config());
 }
 
 
 DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(AllocedProxyTest, reporter, ctxInfo) {
-    GrTextureProvider* provider = ctxInfo.fGrContext->textureProvider();
+    GrTextureProvider* provider = ctxInfo.grContext()->textureProvider();
 
     for (auto origin : { kBottomLeft_GrSurfaceOrigin, kTopLeft_GrSurfaceOrigin }) {
         for (auto widthHeight : { 100, 128 }) {
             for (auto config : { kAlpha_8_GrPixelConfig, kRGBA_8888_GrPixelConfig }) {
                 for (auto fit : { SkBackingFit::kExact, SkBackingFit::kApprox }) {
                     for (auto budgeted : { SkBudgeted::kYes, SkBudgeted::kNo }) {
                         for (auto numSamples : { 0, 4}) {
-                            bool renderable = ctxInfo.fGrContext->caps()->isConfigRenderable(
+                            bool renderable = ctxInfo.grContext()->caps()->isConfigRenderable(
                                                                       config, numSamples > 0) &&
-                                  numSamples <= ctxInfo.fGrContext->caps()->maxColorSampleCount();
+                                  numSamples <= ctxInfo.grContext()->caps()->maxColorSampleCount();
 
                             GrSurfaceDesc desc;
                             desc.fOrigin = origin;
                             desc.fWidth = widthHeight;
                             desc.fHeight = widthHeight;
                             desc.fConfig = config;
                             desc.fSampleCnt = numSamples;
 
                             if (renderable) {
                                 sk_sp<GrRenderTargetProxy> rtProxy(GrRenderTargetProxy::Make(
-                                                                    *ctxInfo.fGrContext->caps(),
+                                                                    *ctxInfo.grContext()->caps(),
                                                                     desc, 
                                                                     fit,
                                                                     budgeted));
                                 check_surface(reporter, rtProxy.get(), origin,
                                               widthHeight, widthHeight, config);
                                 check_rendertarget(reporter, provider, rtProxy.get(), fit);
                             }
 
                             desc.fSampleCnt = 0;
 
                             sk_sp<GrTextureProxy> texProxy(GrTextureProxy::Make(desc,
                                                                                 fit,
                                                                                 budgeted));
                             check_surface(reporter, texProxy.get(), origin,
                                           widthHeight, widthHeight, config);
                             check_texture(reporter, provider, texProxy.get(), fit);
                         }
                     }
                 }
             }
         }
     }
 }
 
 DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(WrappedProxyTest, reporter, ctxInfo) {
-    GrTextureProvider* provider = ctxInfo.fGrContext->textureProvider();
+    GrTextureProvider* provider = ctxInfo.grContext()->textureProvider();
 
     static const int kWidthHeight = 100;
 
     for (auto origin : { kBottomLeft_GrSurfaceOrigin, kTopLeft_GrSurfaceOrigin }) {
         for (auto config : { kAlpha_8_GrPixelConfig, kRGBA_8888_GrPixelConfig }) {
             for (auto budgeted : { SkBudgeted::kYes, SkBudgeted::kNo }) {
                 for (auto numSamples: { 0, 4}) {
-                    bool renderable = ctxInfo.fGrContext->caps()->isConfigRenderable(
+                    bool renderable = ctxInfo.grContext()->caps()->isConfigRenderable(
                                                                 config, numSamples > 0);
 
                     GrSurfaceDesc desc;
                     desc.fOrigin = origin;
                     desc.fWidth = kWidthHeight;
                     desc.fHeight = kWidthHeight;
                     desc.fConfig = config;
                     desc.fSampleCnt = numSamples;
 
                     sk_sp<GrTexture> tex;
@@ skipping 19 matching lines @@
                     check_surface(reporter, texProxy.get(), origin,
                                   kWidthHeight, kWidthHeight, config);
                     check_texture(reporter, provider, texProxy.get(), SkBackingFit::kExact);
                 }
             }
         }
     }
 }
 
 #endif