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/gl/GrGLTexture.cpp

diff --git a/src/gpu/gl/GrGLTexture.cpp b/src/gpu/gl/GrGLTexture.cpp
index c7cfa6c..12bab86 100644
--- a/src/gpu/gl/GrGLTexture.cpp
+++ b/src/gpu/gl/GrGLTexture.cpp
@@ -5,12 +5,13 @@
  * found in the LICENSE file.
  */
 
+#include "src/gpu/gl/GrGLTexture.h"
+
 #include "include/core/SkTraceMemoryDump.h"
 #include "src/gpu/GrSemaphore.h"
 #include "src/gpu/GrShaderCaps.h"
-#include "src/gpu/GrTexturePriv.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/gl/GrGLGpu.h"
-#include "src/gpu/gl/GrGLTexture.h"
 
 #define GPUGL static_cast<GrGLGpu*>(this->getGpu())
 #define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X)
@@ -88,9 +89,7 @@
     fTextureIDOwnership = desc.fOwnership;
 }
 
-GrGLenum GrGLTexture::target() const {
-    return target_from_texture_type(this->texturePriv().textureType());
-}
+GrGLenum GrGLTexture::target() const { return target_from_texture_type(this->textureType()); }
 
 void GrGLTexture::onRelease() {
     TRACE_EVENT0("skia.gpu", TRACE_FUNC);
@@ -111,16 +110,15 @@
 
 GrBackendTexture GrGLTexture::getBackendTexture() const {
     GrGLTextureInfo info;
-    info.fTarget = target_from_texture_type(this->texturePriv().textureType());
+    info.fTarget = target_from_texture_type(this->textureType());
     info.fID = fID;
     info.fFormat = GrGLFormatToEnum(fFormat);
-    return GrBackendTexture(this->width(), this->height(), this->texturePriv().mipmapped(), info,
-                            fParameters);
+    return GrBackendTexture(this->width(), this->height(), this->mipmapped(), info, fParameters);
 }
 
 GrBackendFormat GrGLTexture::backendFormat() const {
     return GrBackendFormat::MakeGL(GrGLFormatToEnum(fFormat),
-                                   target_from_texture_type(this->texturePriv().textureType()));
+                                   target_from_texture_type(this->textureType()));
 }
 
 sk_sp<GrGLTexture> GrGLTexture::MakeWrapped(GrGLGpu* gpu,