Revert "Remove GrSurfaceDesc member from GrSurface."

This reverts commit 84911546b9535a2fff6c5e07f588f175d5a04f45.

Reason for revert: Breaking bots possibly?

Original change's description:
> Remove GrSurfaceDesc member from GrSurface.
> 
> Change-Id: I0fe979994e1e3fc457b952dfb5e0090c45fad771
> Reviewed-on: https://skia-review.googlesource.com/17273
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> 

TBR=bsalomon@google.com,robertphillips@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: I404e509fcd3e3d5527b3bc6e286b7d436c12e879
Reviewed-on: https://skia-review.googlesource.com/17364
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

1 files changed, 12 insertions, 4 deletions

diff --git a/src/gpu/GrTexturePriv.h b/src/gpu/GrTexturePriv.h
index 67631fc2c4..042061129d 100644
--- a/src/gpu/GrTexturePriv.h
+++ b/src/gpu/GrTexturePriv.h
@@ -17,6 +17,18 @@
     implemented privately in GrTexture with a inline public method here). */
 class GrTexturePriv {
 public:
+    void setFlag(GrSurfaceFlags flags) {
+        fTexture->fDesc.fFlags = fTexture->fDesc.fFlags | flags;
+    }
+
+    void resetFlag(GrSurfaceFlags flags) {
+        fTexture->fDesc.fFlags = fTexture->fDesc.fFlags & ~flags;
+    }
+
+    bool isSetFlag(GrSurfaceFlags flags) const {
+        return 0 != (fTexture->fDesc.fFlags & flags);
+    }
+
     void dirtyMipMaps(bool mipMapsDirty) {
         fTexture->dirtyMipMaps(mipMapsDirty);
     }
@@ -58,10 +70,6 @@ public:
     static void ComputeScratchKey(const GrSurfaceDesc&, GrScratchKey*);
 
 private:
-    static void ComputeScratchKey(GrPixelConfig config, int width, int height,
-                                  GrSurfaceOrigin origin, bool isRenderTarget, int sampleCnt,
-                                  bool isMipMapped, GrScratchKey* key);
-
     GrTexturePriv(GrTexture* texture) : fTexture(texture) { }
     GrTexturePriv(const GrTexturePriv& that) : fTexture(that.fTexture) { }
     GrTexturePriv& operator=(const GrTexturePriv&); // unimpl