commit 7e67dcaea6e43d614959d23972b386f4e8d72a74
author Brian Salomon <bsalomon@google.com> Tue Jul 21 09:27:25 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 21 14:06:35 2020 +0000
tree 01ab01062b9b563a8803366ec9b820d2195aa4f2
parent a524ea266d721948b91723148241674c48a19fa9

Rename GrMipMapped GrMipmapped

Change-Id: Ia2cfbca8982b57399b6681cbb4501c2933ab4df7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/304576
Auto-Submit: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@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 62b1308..e587b0a 100644
--- a/src/gpu/GrBitmapTextureMaker.cpp
+++ b/src/gpu/GrBitmapTextureMaker.cpp
@@ -54,7 +54,7 @@
     }
 }
 
-GrSurfaceProxyView GrBitmapTextureMaker::refOriginalTextureProxyView(GrMipMapped mipMapped) {
+GrSurfaceProxyView GrBitmapTextureMaker::refOriginalTextureProxyView(GrMipmapped mipMapped) {
     GrProxyProvider* proxyProvider = this->context()->priv().proxyProvider();
     sk_sp<GrTextureProxy> proxy;
     GrSwizzle swizzle;
@@ -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());
             }
@@ -101,8 +101,8 @@
     }
 
     if (proxy) {
-        SkASSERT(mipMapped == GrMipMapped::kYes);
-        SkASSERT(proxy->mipMapped() == GrMipMapped::kNo);
+        SkASSERT(mipMapped == GrMipmapped::kYes);
+        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