commit 4cfae3bc24aa064c5cc73574d36fb57a31b6e0e2
author Brian Salomon <bsalomon@google.com> Thu Jul 23 10:33:24 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jul 24 13:26:07 2020 +0000
tree 9136f099c7251067953961e7b7f2ee3dfa8942d9
parent 13e3faebc619cd2a448187d48de763b0b5c8e794

Remove GrTexturePriv

This existed because GrTexture used to be public.

Change-Id: I5e507084ae12058a20481b517b9130b41c793d29
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305521
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 fa8d93b..cab0492 100644
--- a/src/gpu/GrTexture.cpp
+++ b/src/gpu/GrTexture.cpp
@@ -15,7 +15,6 @@
 #include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrSurfacePriv.h"
 #include "src/gpu/GrTexture.h"
-#include "src/gpu/GrTexturePriv.h"
 
 #ifdef SK_DEBUG
 #include "include/gpu/GrDirectContext.h"
@@ -36,7 +35,7 @@
 size_t GrTexture::onGpuMemorySize() const {
     const GrCaps& caps = *this->getGpu()->caps();
     return GrSurface::ComputeSize(caps, this->backendFormat(), this->dimensions(), 1,
-                                  this->texturePriv().mipmapped());
+                                  this->mipmapped());
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -94,20 +93,19 @@
             renderable = GrRenderable::kYes;
         }
         auto isProtected = this->isProtected() ? GrProtected::kYes : GrProtected::kNo;
-        GrTexturePriv::ComputeScratchKey(*this->getGpu()->caps(), this->backendFormat(),
-                                         this->dimensions(), renderable, sampleCount,
-                                         this->texturePriv().mipmapped(), isProtected, key);
+        ComputeScratchKey(*this->getGpu()->caps(), this->backendFormat(), this->dimensions(),
+                          renderable, sampleCount, this->mipmapped(), isProtected, key);
     }
 }
 
-void GrTexturePriv::ComputeScratchKey(const GrCaps& caps,
-                                      const GrBackendFormat& format,
-                                      SkISize dimensions,
-                                      GrRenderable renderable,
-                                      int sampleCnt,
-                                      GrMipmapped mipMapped,
-                                      GrProtected isProtected,
-                                      GrScratchKey* key) {
+void GrTexture::ComputeScratchKey(const GrCaps& caps,
+                                  const GrBackendFormat& format,
+                                  SkISize dimensions,
+                                  GrRenderable renderable,
+                                  int sampleCnt,
+                                  GrMipmapped mipMapped,
+                                  GrProtected isProtected,
+                                  GrScratchKey* key) {
     static const GrScratchKey::ResourceType kType = GrScratchKey::GenerateResourceType();
     SkASSERT(!dimensions.isEmpty());
     SkASSERT(sampleCnt > 0);