GrDrawContext now holds GrRenderTarget pointer

include/gpu/GrContext.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrContext_DEFINED
 #define GrContext_DEFINED
 
@@ skipping 157 matching lines @@
      *         rendering quality for the display. Alternatively returns 0 if
      *         MSAA is not supported or recommended to be used by default.
      */
     int getRecommendedSampleCount(GrPixelConfig config, SkScalar dpi) const;
 
     /**
      * Returns a helper object to orchestrate draws.
      * Callers should take a ref if they rely on the GrDrawContext sticking around.
      * NULL will be returned if the context has been abandoned.
      *
+     * @param  rt           the render target receiving the draws
      * @param  surfaceProps the surface properties (mainly defines text drawing)
      *
      * @return a draw context
      */
-    GrDrawContext* drawContext(const SkSurfaceProps* surfaceProps = NULL) {
-        return fDrawingMgr.drawContext(surfaceProps);
+    GrDrawContext* drawContext(GrRenderTarget* rt, const SkSurfaceProps* surfaceProps = NULL) {
+        return fDrawingMgr.drawContext(rt, surfaceProps);
     }
 
     GrTextContext* textContext(const SkSurfaceProps& surfaceProps, GrRenderTarget* rt) {
         return fDrawingMgr.textContext(surfaceProps, rt);
     }
 
     ///////////////////////////////////////////////////////////////////////////
     // Misc.
 
     /**
@@ skipping 240 matching lines @@
         void init(GrContext* context);
 
         void abandon();
         bool abandoned() const { return NULL == fDrawTarget; }
 
         void reset();
         void flush();
 
         // Callers assume the creation ref of the drawContext!
         // NULL will be returned if the context has been abandoned.
-        GrDrawContext* drawContext(const SkSurfaceProps* surfaceProps);
+        GrDrawContext* drawContext(GrRenderTarget* rt, const SkSurfaceProps* surfaceProps);
 
         GrTextContext* textContext(const SkSurfaceProps& props, GrRenderTarget* rt);
 
     private:
         void cleanup();
 
         friend class GrContext;  // for access to fDrawTarget for testing
 
         static const int kNumPixelGeometries = 5; // The different pixel geometries
         static const int kNumDFTOptions = 2;      // DFT or no DFT
@@ skipping 36 matching lines @@
     /**
      * A callback similar to the above for use by the TextBlobCache
      * TODO move textblob draw calls below context so we can use the call above.
      */
     static void TextBlobCacheOverBudgetCB(void* data);
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif