hack

include/gpu/GrContext.h

Index: include/gpu/GrContext.h
===================================================================
--- include/gpu/GrContext.h	(revision 14079)
+++ include/gpu/GrContext.h	(working copy)
@@ -129,7 +129,7 @@
      *                  for different wrap modes on GPUs with limited NPOT
      *                  texture support). NULL implies clamp wrap modes.
      * @param desc      Description of the texture properties.
-     * @param cacheID Cache-specific properties (e.g., texture gen ID)
+     * @param cacheID   Cache-specific properties (e.g., texture gen ID)
      * @param srcData   Pointer to the pixel values.
      * @param rowBytes  The number of bytes between rows of the texture. Zero
      *                  implies tightly packed rows.
@@ -147,7 +147,7 @@
      * value will be NULL if not found. The caller must balance with a call to unref.
      *
      *  @param desc     Description of the texture properties.
-     *  @param cacheID Cache-specific properties (e.g., texture gen ID)
+     *  @param cacheID  Cache-specific properties (e.g., texture gen ID)
      *  @param params   The texture params used to draw a texture may help determine
      *                  the cache entry used. (e.g. different versions may exist
      *                  for different wrap modes on GPUs with limited NPOT
@@ -283,15 +283,16 @@
      * @param target    the render target to set.
      */
     void setRenderTarget(GrRenderTarget* target) {
-        fRenderTarget.reset(SkSafeRef(target));
+//        SkDebugf("GrContext::setRenderTarget\n");
+        fRenderTarget1.reset(SkSafeRef(target));
     }
 
     /**
      * Gets the current render target.
      * @return the currently bound render target.
      */
-    const GrRenderTarget* getRenderTarget() const { return fRenderTarget.get(); }
-    GrRenderTarget* getRenderTarget() { return fRenderTarget.get(); }
+    const GrRenderTarget* getRenderTarget() const { return fRenderTarget1.get(); }
+    GrRenderTarget* getRenderTarget() { return fRenderTarget1.get(); }
 
     GrAARectRenderer* getAARectRenderer() { return fAARectRenderer; }
 
@@ -903,7 +904,7 @@
 
     GrGpu*                          fGpu;
     SkMatrix                        fViewMatrix;
-    SkAutoTUnref<GrRenderTarget>    fRenderTarget;
+    SkAutoTUnref<GrRenderTarget>    fRenderTarget1;
     const GrClipData*               fClip;  // TODO: make this ref counted
     GrDrawState*                    fDrawState;