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

diff --git a/src/gpu/GrRenderTargetProxy.cpp b/src/gpu/GrRenderTargetProxy.cpp
index 8e50566..52a97b6 100644
--- a/src/gpu/GrRenderTargetProxy.cpp
+++ b/src/gpu/GrRenderTargetProxy.cpp
@@ -11,9 +11,9 @@
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrGpuResourcePriv.h"
 #include "src/gpu/GrOpsTask.h"
-#include "src/gpu/GrRenderTargetPriv.h"
+#include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrResourceProvider.h"
-#include "src/gpu/GrSurfacePriv.h"
+#include "src/gpu/GrSurface.h"
 #include "src/gpu/GrTextureRenderTargetProxy.h"
 
 #ifdef SK_DEBUG
@@ -156,7 +156,7 @@
     SkASSERT(surface->asRenderTarget()->numSamples() == this->numSamples());
 
     GrInternalSurfaceFlags proxyFlags = fSurfaceFlags;
-    GrInternalSurfaceFlags surfaceFlags = surface->surfacePriv().flags();
+    GrInternalSurfaceFlags surfaceFlags = surface->flags();
     if (proxyFlags & GrInternalSurfaceFlags::kGLRTFBOIDIs0 && this->numSamples() == 1) {
         // Ganesh never internally creates FBO0 proxies or surfaces so this must be a wrapped
         // proxy. In this case, with no MSAA, rendering to FBO0 is strictly more limited than