Make "priv" classes for GrTexure and GrSurface.
R=robertphillips@google.com, egdaniel@google.com, joshualitt@google.com, joshualitt@chromium.org
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/596053002
diff --git a/include/gpu/GrSurface.h b/include/gpu/GrSurface.h
index 24eb39a..23311a2 100644
--- a/include/gpu/GrSurface.h
+++ b/include/gpu/GrSurface.h
@@ -11,11 +11,12 @@
#include "GrTypes.h"
#include "GrGpuResource.h"
+#include "SkImageInfo.h"
#include "SkRect.h"
-class GrTexture;
class GrRenderTarget;
-struct SkImageInfo;
+class GrSurfacePriv;
+class GrTexture;
class GrSurface : public GrGpuResource {
public:
@@ -59,8 +60,6 @@
*/
const GrTextureDesc& desc() const { return fDesc; }
- SkImageInfo info() const;
-
/**
* @return the texture associated with the surface, may be NULL.
*/
@@ -74,22 +73,6 @@
virtual const GrRenderTarget* asRenderTarget() const = 0;
/**
- * Checks whether this GrSurface refers to the same GPU object as other. This
- * catches the case where a GrTexture and GrRenderTarget refer to the same
- * GPU memory.
- */
- bool isSameAs(const GrSurface* other) const {
- const GrRenderTarget* thisRT = this->asRenderTarget();
- if (thisRT) {
- return thisRT == other->asRenderTarget();
- } else {
- const GrTexture* thisTex = this->asTexture();
- SkASSERT(thisTex); // We must be one or the other
- return thisTex == other->asTexture();
- }
- }
-
- /**
* Reads a rectangle of pixels from the surface.
* @param left left edge of the rectangle to read (inclusive)
* @param top top edge of the rectangle to read (inclusive)
@@ -129,17 +112,22 @@
size_t rowBytes = 0,
uint32_t pixelOpsFlags = 0) = 0;
- /**
- * Write the contents of the surface to a PNG. Returns true if successful.
- * @param filename Full path to desired file
- */
- bool savePixels(const char* filename);
+ /** Access methods that are only to be used within Skia code. */
+ inline GrSurfacePriv surfacePriv();
+ inline const GrSurfacePriv surfacePriv() const;
+protected:
+ // Methods made available via GrSurfacePriv
+ SkImageInfo info() const;
+ bool savePixels(const char* filename);
bool hasPendingRead() const;
bool hasPendingWrite() const;
bool hasPendingIO() const;
+ bool isSameAs(const GrSurface* other) const;
-protected:
+ // Provides access to methods that should be public within Skia code.
+ friend class GrSurfacePriv;
+
GrSurface(GrGpu* gpu, bool isWrapped, const GrTextureDesc& desc)
: INHERITED(gpu, isWrapped)
, fDesc(desc) {
@@ -151,4 +139,4 @@
typedef GrGpuResource INHERITED;
};
-#endif // GrSurface_DEFINED
+#endif