(Mostly) Retract GrRenderTarget from SkGpuDevice

include/gpu/GrDrawContext.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrDrawContext_DEFINED
 #define GrDrawContext_DEFINED
 
@@ skipping 243 matching lines @@
      * Draws a batch
      *
      * @param paint    describes how to color pixels.
      * @param batch    the batch to draw
      */
     void drawBatch(const GrClip&, const GrPaint&, GrDrawBatch*);
 
     const GrSurfaceDesc& desc() const { return fRenderTarget->desc(); }
     int width() const { return fRenderTarget->width(); }
     int height() const { return fRenderTarget->height(); }
+    GrPixelConfig config() const { return fRenderTarget->config(); }
     bool isUnifiedMultisampled() const { return fRenderTarget->isUnifiedMultisampled(); }
     int numColorSamples() const { return fRenderTarget->numColorSamples(); }
     bool isGammaCorrect() const { return fSurfaceProps.isGammaCorrect(); }
+    const SkSurfaceProps& surfaceProps() const { return fSurfaceProps; }
 
     bool wasAbandoned() const;
 
     GrRenderTarget* accessRenderTarget() { return fRenderTarget.get(); }
 
     sk_sp<GrRenderTarget> renderTarget() { return fRenderTarget; }
 
     sk_sp<GrTexture> asTexture() { return sk_ref_sp(fRenderTarget->asTexture()); }
 
     // Provides access to functions that aren't part of the public API.
     GrDrawContextPriv drawContextPriv();
     const GrDrawContextPriv drawContextPriv() const;
 
 protected:
     GrDrawContext(GrContext*, GrDrawingManager*, sk_sp<GrRenderTarget>,
                   const SkSurfaceProps* surfaceProps, GrAuditTrail*, GrSingleOwner*);
 
     GrDrawingManager* drawingManager() { return fDrawingManager; }
     GrAuditTrail* auditTrail() { return fAuditTrail; }
-    const SkSurfaceProps& surfaceProps() const { return fSurfaceProps; }
-    
+
     SkDEBUGCODE(GrSingleOwner* singleOwner() { return fSingleOwner; })
     SkDEBUGCODE(void validate() const;)
 
 private:
     friend class GrAtlasTextBlob; // for access to drawBatch
     friend class GrStencilAndCoverTextContext; // for access to drawBatch
     friend class GrDrawingManager; // for ctor
     friend class GrDrawContextPriv;
 
     bool drawFilledDRRect(const GrClip& clip,
@@ skipping 28 matching lines @@
     GrContext*                        fContext;
 
     SkSurfaceProps                    fSurfaceProps;
     GrAuditTrail*                     fAuditTrail;
 
     // In debug builds we guard against improper thread handling
     SkDEBUGCODE(mutable GrSingleOwner* fSingleOwner;)
 };
 
 #endif