commit 5254ccc1815e1b1bfa066a1ce193ddfdfcf16a55
author Greg Daniel <egdaniel@google.com> Mon Nov 13 11:05:52 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Nov 13 20:39:51 2017 +0000
tree f5a817d95aea258778fe90c09b56e0f0acf4a157
parent 40ef836d9405c60cd1b1a424a799323f7df42fef

Move pixel config getter to private in GrBackendSurface

We eventually want to remove pixel config from GrBackendSurface so this
helps to insure that clients don't rely on it.

Bug: skia:
Change-Id: I6b8435d12347fab62c0f9032addea1211aa703ca
Reviewed-on: https://skia-review.googlesource.com/70642
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

include/gpu/GrBackendSurface.h

diff --git a/include/gpu/GrBackendSurface.h b/include/gpu/GrBackendSurface.h
index bf1e52c..c9d326b 100644
--- a/include/gpu/GrBackendSurface.h
+++ b/include/gpu/GrBackendSurface.h
@@ -51,7 +51,6 @@
 
     int width() const { return fWidth; }
     int height() const { return fHeight; }
-    GrPixelConfig config() const { return fConfig; }
     bool hasMipMaps() const { return GrMipMapped::kYes == fMipMapped; }
     GrBackend backend() const {return fBackend; }
 
@@ -73,6 +72,13 @@
     bool isValid() const { return fConfig != kUnknown_GrPixelConfig; }
 
 private:
+    // Friending for access to the GrPixelConfig
+    friend class SkSurface;
+    friend class GrGpu;
+    friend class GrGLGpu;
+    friend class GrVkGpu;
+    GrPixelConfig config() const { return fConfig; }
+
     int fWidth;         //<! width in pixels
     int fHeight;        //<! height in pixels
     GrPixelConfig fConfig;
@@ -109,7 +115,6 @@
     int height() const { return fHeight; }
     int sampleCnt() const { return fSampleCnt; }
     int stencilBits() const { return fStencilBits; }
-    GrPixelConfig config() const { return fConfig; }
     GrBackend backend() const {return fBackend; }
 
     // If the backend API is GL, this returns a pointer to the GrGLFramebufferInfo struct. Otherwise
@@ -123,6 +128,13 @@
 #endif
 
 private:
+    // Friending for access to the GrPixelConfig
+    friend class SkSurface;
+    friend class GrGpu;
+    friend class GrGLGpu;
+    friend class GrVkGpu;
+    GrPixelConfig config() const { return fConfig; }
+
     int fWidth;         //<! width in pixels
     int fHeight;        //<! height in pixels