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

diff --git a/src/gpu/GrTextureProxy.cpp b/src/gpu/GrTextureProxy.cpp
index 70d13bb..1b3aa82 100644
--- a/src/gpu/GrTextureProxy.cpp
+++ b/src/gpu/GrTextureProxy.cpp
@@ -13,7 +13,7 @@
 #include "src/gpu/GrDeferredProxyUploader.h"
 #include "src/gpu/GrProxyProvider.h"
 #include "src/gpu/GrSurfacePriv.h"
-#include "src/gpu/GrTexturePriv.h"
+#include "src/gpu/GrTexture.h"
 
 // Deferred version - no data
 GrTextureProxy::GrTextureProxy(const GrBackendFormat& format,
@@ -64,8 +64,8 @@
                                UseAllocator useAllocator,
                                GrDDLProvider creatingProvider)
         : INHERITED(std::move(surf), SkBackingFit::kExact, useAllocator)
-        , fMipmapped(fTarget->asTexture()->texturePriv().mipmapped())
-        , fMipmapStatus(fTarget->asTexture()->texturePriv().mipmapStatus())
+        , fMipmapped(fTarget->asTexture()->mipmapped())
+        , fMipmapStatus(fTarget->asTexture()->mipmapStatus())
         SkDEBUGCODE(, fInitialMipmapStatus(fMipmapStatus))
         , fCreatingProvider(creatingProvider)
         , fProxyProvider(nullptr)
@@ -137,7 +137,7 @@
 
 GrMipmapped GrTextureProxy::mipmapped() const {
     if (this->isInstantiated()) {
-        return this->peekTexture()->texturePriv().mipmapped();
+        return this->peekTexture()->mipmapped();
     }
     return fMipmapped;
 }
@@ -205,9 +205,9 @@
     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());
+             GrMipmapped::kYes == surface->asTexture()->mipmapped());
 
-    SkASSERT(surface->asTexture()->texturePriv().textureType() == this->textureType());
+    SkASSERT(surface->asTexture()->textureType() == this->textureType());
 
     GrInternalSurfaceFlags proxyFlags = fSurfaceFlags;
     GrInternalSurfaceFlags surfaceFlags = surface->surfacePriv().flags();