commit 8c82a87a6bcd97dbd8d04f05f7c592949770c869
author Brian Salomon <bsalomon@google.com> Tue Jul 21 12:09:58 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 21 17:43:17 2020 +0000
tree 5182470b3f23e8893962612b6118fc8f86a367af
parent 7f0129d424a45f87653f6d0d83141e10fa96cba3

Rename GrTexture/Proxy/Priv mip map members/functions

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

src/gpu/GrBitmapTextureMaker.cpp

diff --git a/src/gpu/GrBitmapTextureMaker.cpp b/src/gpu/GrBitmapTextureMaker.cpp
index e587b0a..b3745c8 100644
--- a/src/gpu/GrBitmapTextureMaker.cpp
+++ b/src/gpu/GrBitmapTextureMaker.cpp
@@ -70,7 +70,7 @@
         if (proxy) {
             swizzle = this->context()->priv().caps()->getReadSwizzle(proxy->backendFormat(),
                                                                      this->colorType());
-            if (mipMapped == GrMipmapped::kNo || proxy->mipMapped() == GrMipmapped::kYes) {
+            if (mipMapped == GrMipmapped::kNo || proxy->mipmapped() == GrMipmapped::kYes) {
                 return {std::move(proxy), kTopLeft_GrSurfaceOrigin, swizzle};
             }
         }
@@ -92,7 +92,7 @@
         if (proxy) {
             swizzle = this->context()->priv().caps()->getReadSwizzle(proxy->backendFormat(),
                                                                      this->colorType());
-            SkASSERT(mipMapped == GrMipmapped::kNo || proxy->mipMapped() == GrMipmapped::kYes);
+            SkASSERT(mipMapped == GrMipmapped::kNo || proxy->mipmapped() == GrMipmapped::kYes);
             if (fKey.isValid()) {
                 installKey(proxy.get());
             }
@@ -102,7 +102,7 @@
 
     if (proxy) {
         SkASSERT(mipMapped == GrMipmapped::kYes);
-        SkASSERT(proxy->mipMapped() == GrMipmapped::kNo);
+        SkASSERT(proxy->mipmapped() == GrMipmapped::kNo);
         SkASSERT(fKey.isValid());
         // We need a mipped proxy, but we found a proxy earlier that wasn't mipped. Thus we generate
         // a new mipped surface and copy the original proxy into the base layer. We will then let