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

diff --git a/src/gpu/GrRenderTask.cpp b/src/gpu/GrRenderTask.cpp
index 7b294a4..de52086 100644
--- a/src/gpu/GrRenderTask.cpp
+++ b/src/gpu/GrRenderTask.cpp
@@ -72,7 +72,7 @@
                                                                  this->target(0).origin());
         }
         GrTextureProxy* textureProxy = this->target(0).asTextureProxy();
-        if (textureProxy && GrMipMapped::kYes == textureProxy->mipMapped()) {
+        if (textureProxy && GrMipmapped::kYes == textureProxy->mipMapped()) {
             textureProxy->markMipMapsDirty();
         }
     }
@@ -118,7 +118,7 @@
 
 // Convert from a GrSurface-based dependency to a GrRenderTask one
 void GrRenderTask::addDependency(GrDrawingManager* drawingMgr, GrSurfaceProxy* dependedOn,
-                                 GrMipMapped mipMapped,
+                                 GrMipmapped mipMapped,
                                  GrTextureResolveManager textureResolveManager,
                                  const GrCaps& caps) {
     // If it is still receiving dependencies, this GrRenderTask shouldn't be closed
@@ -129,7 +129,7 @@
     if (dependedOnTask == this) {
         // self-read - presumably for dst reads. We don't need to do anything in this case. The
         // XferProcessor will detect what is happening and insert a texture barrier.
-        SkASSERT(GrMipMapped::kNo == mipMapped);
+        SkASSERT(GrMipmapped::kNo == mipMapped);
         // We should never attempt a self-read on a surface that has a separate MSAA renderbuffer.
         SkASSERT(!dependedOn->requiresManualMSAAResolve());
         SkASSERT(!dependedOn->asTextureProxy() ||
@@ -159,12 +159,12 @@
     }
 
     GrTextureProxy* textureProxy = dependedOn->asTextureProxy();
-    if (GrMipMapped::kYes == mipMapped) {
+    if (GrMipmapped::kYes == mipMapped) {
         SkASSERT(textureProxy);
-        if (GrMipMapped::kYes != textureProxy->mipMapped()) {
+        if (GrMipmapped::kYes != textureProxy->mipMapped()) {
             // There are some cases where we might be given a non-mipmapped texture with a mipmap
             // filter. See skbug.com/7094.
-            mipMapped = GrMipMapped::kNo;
+            mipMapped = GrMipmapped::kNo;
         } else if (textureProxy->mipMapsAreDirty()) {
             resolveFlags |= GrSurfaceProxy::ResolveFlags::kMipMaps;
         }