commit ca9dbe295ddf0e4ac6d1f7d3d911ab783145958e
author Greg Daniel <egdaniel@google.com> Thu Jan 02 13:44:30 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 03 18:22:17 2020 +0000
tree b2a794d8c176239d2a7fe389426037332c760463
parent c22967e74f5ec6aae3ff495dd293255e752ab204

Updated proxy isProtected to return a GrProtected enum.

Change-Id: Iad19712ff60e47a7dab9895f34348f9ce1c8087e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/261949
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

src/gpu/GrSurfaceProxy.cpp

diff --git a/src/gpu/GrSurfaceProxy.cpp b/src/gpu/GrSurfaceProxy.cpp
index 060a97a..944f979 100644
--- a/src/gpu/GrSurfaceProxy.cpp
+++ b/src/gpu/GrSurfaceProxy.cpp
@@ -289,7 +289,6 @@
                                            SkBudgeted budgeted,
                                            RectsMustMatch rectsMustMatch) {
     SkASSERT(!src->isFullyLazy());
-    GrProtected isProtected = src->isProtected() ? GrProtected::kYes : GrProtected::kNo;
     int width;
     int height;
 
@@ -322,9 +321,9 @@
     GrSurfaceOrigin origin = src->origin();
     if (src->backendFormat().textureType() != GrTextureType::kExternal) {
         auto dstContext = GrSurfaceContext::Make(context, {width, height}, format,
-                                                 GrRenderable::kNo, 1, mipMapped, isProtected,
-                                                 origin, colorType, kUnknown_SkAlphaType, nullptr,
-                                                 fit, budgeted);
+                                                 GrRenderable::kNo, 1, mipMapped,
+                                                 src->isProtected(), origin, colorType,
+                                                 kUnknown_SkAlphaType, nullptr, fit, budgeted);
         if (dstContext && dstContext->copy(src, srcRect, dstPoint)) {
             return dstContext->asTextureProxyRef();
         }