commit 03b8ab225fd782d2023f17e40185476ce865914e
author Jim Van Verth <jvanverth@google.com> Mon Feb 24 11:36:15 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Feb 24 17:41:55 2020 +0000
tree c86497752bf9fc51d4a8dec3870e677968869e51
parent 6dd3b73f1b635f264990413357e723fc66de72d4

Reland "Create D3D device and queue"

This is a reland of 29dc430f43e1b27a26d2413ca427109f616539db

Original change's description:
> Create D3D device and queue
> 
> Bug: skia:9935
> Change-Id: Ib6548f413ca3a8befb553d2d47354b400c9162b9
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/272520
> Commit-Queue: Jim Van Verth <jvanverth@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>

Bug: skia:9935
Change-Id: I1c8797e09cdeb3694ea7f47b2236ab7d91d9519f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/272996
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

src/gpu/GrLegacyDirectContext.cpp

diff --git a/src/gpu/GrLegacyDirectContext.cpp b/src/gpu/GrLegacyDirectContext.cpp
index 6b23633..fc1d671 100644
--- a/src/gpu/GrLegacyDirectContext.cpp
+++ b/src/gpu/GrLegacyDirectContext.cpp
@@ -125,9 +125,9 @@
 };
 
 #ifdef SK_GL
-sk_sp<GrContext> GrContext::MakeGL(sk_sp<const GrGLInterface> interface) {
+sk_sp<GrContext> GrContext::MakeGL(sk_sp<const GrGLInterface> glInterface) {
     GrContextOptions defaultOptions;
-    return MakeGL(std::move(interface), defaultOptions);
+    return MakeGL(std::move(glInterface), defaultOptions);
 }
 
 sk_sp<GrContext> GrContext::MakeGL(const GrContextOptions& options) {
@@ -139,11 +139,11 @@
     return MakeGL(nullptr, defaultOptions);
 }
 
-sk_sp<GrContext> GrContext::MakeGL(sk_sp<const GrGLInterface> interface,
+sk_sp<GrContext> GrContext::MakeGL(sk_sp<const GrGLInterface> glInterface,
                                    const GrContextOptions& options) {
     sk_sp<GrContext> context(new GrLegacyDirectContext(GrBackendApi::kOpenGL, options));
 
-    context->fGpu = GrGLGpu::Make(std::move(interface), options, context.get());
+    context->fGpu = GrGLGpu::Make(std::move(glInterface), options, context.get());
     if (!context->fGpu) {
         return nullptr;
     }