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/GrTextureProxy.h

diff --git a/src/gpu/GrTextureProxy.h b/src/gpu/GrTextureProxy.h
index 7781cc2..2fa7b06 100644
--- a/src/gpu/GrTextureProxy.h
+++ b/src/gpu/GrTextureProxy.h
@@ -31,25 +31,25 @@
     // claim to not need mips at creation time, but the instantiation happens to give us a mipped
     // target. In that case we should use that for our benefit to avoid possible copies/mip
     // generation later.
-    GrMipMapped mipMapped() const;
+    GrMipmapped mipMapped() const;
 
     bool mipMapsAreDirty() const {
-        SkASSERT((GrMipMapped::kNo == fMipMapped) ==
+        SkASSERT((GrMipmapped::kNo == fMipMapped) ==
                  (GrMipMapsStatus::kNotAllocated == fMipMapsStatus));
-        return GrMipMapped::kYes == fMipMapped && GrMipMapsStatus::kValid != fMipMapsStatus;
+        return GrMipmapped::kYes == fMipMapped && GrMipMapsStatus::kValid != fMipMapsStatus;
     }
     void markMipMapsDirty() {
-        SkASSERT(GrMipMapped::kYes == fMipMapped);
+        SkASSERT(GrMipmapped::kYes == fMipMapped);
         fMipMapsStatus = GrMipMapsStatus::kDirty;
     }
     void markMipMapsClean() {
-        SkASSERT(GrMipMapped::kYes == fMipMapped);
+        SkASSERT(GrMipmapped::kYes == fMipMapped);
         fMipMapsStatus = GrMipMapsStatus::kValid;
     }
 
-    // Returns the GrMipMapped value of the proxy from creation time regardless of whether it has
+    // Returns the GrMipmapped value of the proxy from creation time regardless of whether it has
     // been instantiated or not.
-    GrMipMapped proxyMipMapped() const { return fMipMapped; }
+    GrMipmapped proxyMipMapped() const { return fMipMapped; }
 
     GrTextureType textureType() const { return this->backendFormat().textureType(); }
 
@@ -113,7 +113,7 @@
     // Deferred version - no data.
     GrTextureProxy(const GrBackendFormat&,
                    SkISize,
-                   GrMipMapped,
+                   GrMipmapped,
                    GrMipMapsStatus,
                    SkBackingFit,
                    SkBudgeted,
@@ -135,7 +135,7 @@
     GrTextureProxy(LazyInstantiateCallback&&,
                    const GrBackendFormat&,
                    SkISize,
-                   GrMipMapped,
+                   GrMipmapped,
                    GrMipMapsStatus,
                    SkBackingFit,
                    SkBudgeted,
@@ -165,7 +165,7 @@
     // that particular class don't require it. Changing the size of this object can move the start
     // address of other types, leading to this problem.
 
-    GrMipMapped      fMipMapped;
+    GrMipmapped      fMipMapped;
 
     // This tracks the mipmap status at the proxy level and is thus somewhat distinct from the
     // backing GrTexture's mipmap status. In particular, this status is used to determine when