commit cdabbcc3b57f7c7e3ef1c28538c9e91b7a1eaa33
author Robert Phillips <robertphillips@google.com> Thu Jun 08 16:03:17 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 08 20:29:44 2017 +0000
tree a3775adc12bca9a8cd8d3b7186d58afefd5bec93
parent ba81af27cff1c1e23051d2957612b2f3e0fbf885

Store context type (rather than backend type) in ContextInfo

Change-Id: I7dbfb735f1f094fa0a025b84f69e06a3533f2815
Reviewed-on: https://skia-review.googlesource.com/19101
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

tools/gpu/GrContextFactory.cpp

diff --git a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp
index 0238898..23ffad1 100644
--- a/tools/gpu/GrContextFactory.cpp
+++ b/tools/gpu/GrContextFactory.cpp
@@ -95,6 +95,10 @@
     }
 }
 
+GrContext* GrContextFactory::get(ContextType type, ContextOverrides overrides) {
+    return this->getContextInfo(type, overrides).grContext();
+}
+
 ContextInfo GrContextFactory::getContextInfoInternal(ContextType type, ContextOverrides overrides,
                                                      GrContext* shareContext, uint32_t shareIndex) {
     // (shareIndex != 0) -> (shareContext != nullptr)
@@ -108,7 +112,7 @@
             context.fShareIndex == shareIndex &&
             !context.fAbandoned) {
             context.fTestContext->makeCurrent();
-            return ContextInfo(context.fBackend, context.fTestContext, context.fGrContext);
+            return ContextInfo(context.fType, context.fTestContext, context.fGrContext);
         }
     }
 
@@ -263,7 +267,7 @@
     context.fAbandoned = false;
     context.fShareContext = shareContext;
     context.fShareIndex = shareIndex;
-    return ContextInfo(context.fBackend, context.fTestContext, context.fGrContext);
+    return ContextInfo(context.fType, context.fTestContext, context.fGrContext);
 }
 
 ContextInfo GrContextFactory::getContextInfo(ContextType type, ContextOverrides overrides) {