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/GrTexture.cpp

diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp
index 8cf48c3..fa8d93b 100644
--- a/src/gpu/GrTexture.cpp
+++ b/src/gpu/GrTexture.cpp
@@ -22,21 +22,21 @@
 #include "src/gpu/GrContextPriv.h"
 #endif
 
-void GrTexture::markMipMapsDirty() {
-    if (GrMipmapStatus::kValid == fMipMapsStatus) {
-        fMipMapsStatus = GrMipmapStatus::kDirty;
+void GrTexture::markMipmapsDirty() {
+    if (GrMipmapStatus::kValid == fMipmapStatus) {
+        fMipmapStatus = GrMipmapStatus::kDirty;
     }
 }
 
-void GrTexture::markMipMapsClean() {
-    SkASSERT(GrMipmapStatus::kNotAllocated != fMipMapsStatus);
-    fMipMapsStatus = GrMipmapStatus::kValid;
+void GrTexture::markMipmapsClean() {
+    SkASSERT(GrMipmapStatus::kNotAllocated != fMipmapStatus);
+    fMipmapStatus = GrMipmapStatus::kValid;
 }
 
 size_t GrTexture::onGpuMemorySize() const {
     const GrCaps& caps = *this->getGpu()->caps();
     return GrSurface::ComputeSize(caps, this->backendFormat(), this->dimensions(), 1,
-                                  this->texturePriv().mipMapped());
+                                  this->texturePriv().mipmapped());
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -47,11 +47,11 @@
                      GrMipmapStatus mipmapStatus)
         : INHERITED(gpu, dimensions, isProtected)
         , fTextureType(textureType)
-        , fMipMapsStatus(mipmapStatus) {
-    if (GrMipmapStatus::kNotAllocated == fMipMapsStatus) {
-        fMaxMipMapLevel = 0;
+        , fMipmapStatus(mipmapStatus) {
+    if (fMipmapStatus == GrMipmapStatus::kNotAllocated) {
+        fMaxMipmapLevel = 0;
     } else {
-        fMaxMipMapLevel = SkMipmap::ComputeLevelCount(this->width(), this->height());
+        fMaxMipmapLevel = SkMipmap::ComputeLevelCount(this->width(), this->height());
     }
 }
 
@@ -96,7 +96,7 @@
         auto isProtected = this->isProtected() ? GrProtected::kYes : GrProtected::kNo;
         GrTexturePriv::ComputeScratchKey(*this->getGpu()->caps(), this->backendFormat(),
                                          this->dimensions(), renderable, sampleCount,
-                                         this->texturePriv().mipMapped(), isProtected, key);
+                                         this->texturePriv().mipmapped(), isProtected, key);
     }
 }