Simplify bench pictures render target creation.

tools/PictureRenderer.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "PictureRenderer.h"
 #include "picture_utils.h"
 #include "SamplePipeControllers.h"
@@ skipping 94 matching lines @@
             sk_tools::setup_bitmap(&bitmap, width, height);
             canvas = SkNEW_ARGS(SkCanvas, (bitmap));
         }
         break;
 #if SK_SUPPORT_GPU
 #if SK_ANGLE
         case kAngle_DeviceType:
             // fall through
 #endif
         case kGPU_DeviceType: {
-            SkAutoTUnref<GrRenderTarget> rt;
-            bool grSuccess = false;
+            SkAutoTUnref<GrSurface> target;
             if (fGrContext) {
                 // create a render target to back the device
                 GrTextureDesc desc;
                 desc.fConfig = kSkia8888_GrPixelConfig;
                 desc.fFlags = kRenderTarget_GrTextureFlagBit;
                 desc.fWidth = width;
                 desc.fHeight = height;
                 desc.fSampleCnt = 0;
-                GrTexture* tex = fGrContext->createUncachedTexture(desc, NULL, 0);
-                if (tex) {
-                    rt.reset(tex->asRenderTarget());
-                    rt.get()->ref();
-                    tex->unref();
-                    grSuccess = NULL != rt.get();
-                }
+                target.reset(fGrContext->createUncachedTexture(desc, NULL, 0));
             }
-            if (!grSuccess) {
+            if (NULL == target.get()) {
                 SkASSERT(0);
                 return NULL;
             }
 
-            SkAutoTUnref<SkGpuDevice> device(SkNEW_ARGS(SkGpuDevice, (fGrContext, rt)));
+            SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(target));
             canvas = SkNEW_ARGS(SkCanvas, (device.get()));
             break;
         }
 #endif
         default:
             SkASSERT(0);
             return NULL;
     }
     setUpFilter(canvas, fDrawFilters);
     this->scaleToScaleFactor(canvas);
@@ skipping 700 matching lines @@
     virtual SkString getConfigNameInternal() SK_OVERRIDE {
         return SkString("picture_clone");
     }
 };
 
 PictureRenderer* CreatePictureCloneRenderer() {
     return SkNEW(PictureCloneRenderer);
 }
 
 } // namespace sk_tools