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

diff --git a/src/gpu/GrTextureProxy.cpp b/src/gpu/GrTextureProxy.cpp
index 4956b74..50b1487 100644
--- a/src/gpu/GrTextureProxy.cpp
+++ b/src/gpu/GrTextureProxy.cpp
@@ -28,8 +28,8 @@
                                GrDDLProvider creatingProvider)
         : INHERITED(format, dimensions, fit, budgeted, isProtected, surfaceFlags, useAllocator)
         , fMipmapped(mipMapped)
-        , fMipMapsStatus(mipmapStatus)
-        SkDEBUGCODE(, fInitialMipMapsStatus(fMipMapsStatus))
+        , fMipmapStatus(mipmapStatus)
+        SkDEBUGCODE(, fInitialMipmapStatus(fMipmapStatus))
         , fCreatingProvider(creatingProvider)
         , fProxyProvider(nullptr)
         , fDeferredUploader(nullptr) {
@@ -51,8 +51,8 @@
         : INHERITED(std::move(callback), format, dimensions, fit, budgeted, isProtected,
                     surfaceFlags, useAllocator)
         , fMipmapped(mipMapped)
-        , fMipMapsStatus(mipmapStatus)
-        SkDEBUGCODE(, fInitialMipMapsStatus(fMipMapsStatus))
+        , fMipmapStatus(mipmapStatus)
+        SkDEBUGCODE(, fInitialMipmapStatus(fMipmapStatus))
         , fCreatingProvider(creatingProvider)
         , fProxyProvider(nullptr)
         , fDeferredUploader(nullptr) {
@@ -64,9 +64,9 @@
                                UseAllocator useAllocator,
                                GrDDLProvider creatingProvider)
         : INHERITED(std::move(surf), SkBackingFit::kExact, useAllocator)
-        , fMipmapped(fTarget->asTexture()->texturePriv().mipMapped())
-        , fMipMapsStatus(fTarget->asTexture()->texturePriv().mipmapStatus())
-        SkDEBUGCODE(, fInitialMipMapsStatus(fMipMapsStatus))
+        , fMipmapped(fTarget->asTexture()->texturePriv().mipmapped())
+        , fMipmapStatus(fTarget->asTexture()->texturePriv().mipmapStatus())
+        SkDEBUGCODE(, fInitialMipmapStatus(fMipmapStatus))
         , fCreatingProvider(creatingProvider)
         , fProxyProvider(nullptr)
         , fDeferredUploader(nullptr) {
@@ -135,16 +135,16 @@
     fTextureProxy->fDeferredUploader.reset();
 }
 
-GrMipmapped GrTextureProxy::mipMapped() const {
+GrMipmapped GrTextureProxy::mipmapped() const {
     if (this->isInstantiated()) {
-        return this->peekTexture()->texturePriv().mipMapped();
+        return this->peekTexture()->texturePriv().mipmapped();
     }
     return fMipmapped;
 }
 
 size_t GrTextureProxy::onUninstantiatedGpuMemorySize(const GrCaps& caps) const {
     return GrSurface::ComputeSize(caps, this->backendFormat(), this->dimensions(), 1,
-                                  this->proxyMipMapped(), !this->priv().isExact());
+                                  this->proxyMipmapped(), !this->priv().isExact());
 }
 
 GrSamplerState::Filter GrTextureProxy::HighestFilterMode(GrTextureType textureType) {
@@ -209,8 +209,8 @@
     // Anything that is checked here should be duplicated in GrTextureRenderTargetProxy's version
     SkASSERT(surface->asTexture());
     // It is possible to fulfill a non-mipmapped proxy with a mipmapped texture.
-    SkASSERT(GrMipmapped::kNo == this->proxyMipMapped() ||
-             GrMipmapped::kYes == surface->asTexture()->texturePriv().mipMapped());
+    SkASSERT(GrMipmapped::kNo == this->proxyMipmapped() ||
+             GrMipmapped::kYes == surface->asTexture()->texturePriv().mipmapped());
 
     SkASSERT(surface->asTexture()->texturePriv().textureType() == this->textureType());