Revert of Make "priv" classes for GrTexure and GrSurface. (patchset #9 id:260001 of https://codereview.chromium.org/596053002/)
Reason for revert:
Breaking the Chrome builds with:
lib/libcc.so: error: undefined reference to 'GrAutoScratchTexture::detach()'
(http://108.170.220.120:10117/builders/Canary-Chrome-Ubuntu13.10-Ninja-x86_64-DRT/builds/2990/steps/Retry_BuildContentShell_1/logs/stdio)
Original issue's description:
> Make "priv" classes for GrTexure and GrSurface.
R=egdaniel@google.com, joshualitt@google.com, bsalomon@google.com
TBR=bsalomon@google.com, egdaniel@google.com, joshualitt@google.com
NOTREECHECKS=true
NOTRY=true
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/618733002
diff --git a/include/gpu/GrSurface.h b/include/gpu/GrSurface.h
index 23311a2..24eb39a 100644
--- a/include/gpu/GrSurface.h
+++ b/include/gpu/GrSurface.h
@@ -11,12 +11,11 @@
#include "GrTypes.h"
#include "GrGpuResource.h"
-#include "SkImageInfo.h"
#include "SkRect.h"
-class GrRenderTarget;
-class GrSurfacePriv;
class GrTexture;
+class GrRenderTarget;
+struct SkImageInfo;
class GrSurface : public GrGpuResource {
public:
@@ -60,6 +59,8 @@
*/
const GrTextureDesc& desc() const { return fDesc; }
+ SkImageInfo info() const;
+
/**
* @return the texture associated with the surface, may be NULL.
*/
@@ -73,6 +74,22 @@
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)
@@ -112,22 +129,17 @@
size_t rowBytes = 0,
uint32_t pixelOpsFlags = 0) = 0;
- /** 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;
+ /**
+ * 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);
+
bool hasPendingRead() const;
bool hasPendingWrite() const;
bool hasPendingIO() const;
- bool isSameAs(const GrSurface* other) const;
- // Provides access to methods that should be public within Skia code.
- friend class GrSurfacePriv;
-
+protected:
GrSurface(GrGpu* gpu, bool isWrapped, const GrTextureDesc& desc)
: INHERITED(gpu, isWrapped)
, fDesc(desc) {
@@ -139,4 +151,4 @@
typedef GrGpuResource INHERITED;
};
-#endif
+#endif // GrSurface_DEFINED