commit f7f5433a4590ce7437f66306dbe576646a78e437
author Brian Salomon <bsalomon@google.com> Tue Jul 28 09:23:35 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 28 13:52:07 2020 +0000
tree bec5a0647dcd4a3be1a04ee8f2d6f5fd5b8a0c6f
parent 07b00998203f2ff9b037275a4ea9dc1fb4e24a20

Remove GrSurfacePriv and GrRenderTargetPriv

No longer needed as GrSurface and GrRenderTarget are private.

Change-Id: I2ec653b2d9daa115233bb7eaa1f2b7f880772c0a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305730
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/GrTextureRenderTargetProxy.cpp

diff --git a/src/gpu/GrTextureRenderTargetProxy.cpp b/src/gpu/GrTextureRenderTargetProxy.cpp
index 9899cae..3680f22 100644
--- a/src/gpu/GrTextureRenderTargetProxy.cpp
+++ b/src/gpu/GrTextureRenderTargetProxy.cpp
@@ -10,7 +10,7 @@
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrRenderTargetProxyPriv.h"
-#include "src/gpu/GrSurfacePriv.h"
+#include "src/gpu/GrSurface.h"
 #include "src/gpu/GrSurfaceProxyPriv.h"
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxyPriv.h"
@@ -82,7 +82,7 @@
         , GrTextureProxy(surf, useAllocator, creatingProvider) {
     SkASSERT(surf->asTexture());
     SkASSERT(surf->asRenderTarget());
-    SkASSERT(fSurfaceFlags == fTarget->surfacePriv().flags());
+    SkASSERT(fSurfaceFlags == fTarget->flags());
     SkASSERT((this->numSamples() <= 1 ||
               fTarget->getContext()->priv().caps()->msaaResolvesAutomatically()) !=
              this->requiresManualMSAAResolve());
@@ -186,7 +186,7 @@
     SkASSERT(surface->asTexture()->textureType() == this->textureType());
 
     GrInternalSurfaceFlags proxyFlags = fSurfaceFlags;
-    GrInternalSurfaceFlags surfaceFlags = surface->surfacePriv().flags();
+    GrInternalSurfaceFlags surfaceFlags = surface->flags();
 
     // Only non-RT textures can be read only.
     SkASSERT(!(proxyFlags & GrInternalSurfaceFlags::kReadOnly));