Revert of Refactor drawContext/RenderTarget creation

tests/PrimitiveProcessorTest.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This is a GPU-backend specific test. It relies on static intializers to work
 
 #include "SkTypes.h"
@@ skipping 85 matching lines @@
     }
 
     int fNumAttribs;
 
     typedef GrVertexBatch INHERITED;
 };
 }
 
 DEF_GPUTEST_FOR_ALL_GL_CONTEXTS(VertexAttributeCount, reporter, ctxInfo) {
     GrContext* context = ctxInfo.fGrContext;
-
-    sk_sp<GrDrawContext> dc(context->newDrawContext(GrContext::kLoose_BackingFit,
-                                                    1, 1, kRGBA_8888_GrPixelConfig));
+    GrTextureDesc desc;
+    desc.fHeight = 1;
+    desc.fWidth = 1;
+    desc.fFlags = kRenderTarget_GrSurfaceFlag;
+    desc.fConfig = kRGBA_8888_GrPixelConfig;
+    SkAutoTUnref<GrTexture> target(context->textureProvider()->createTexture(desc,
+                                                                             SkBudgeted::kYes));
+    if (!target) {
+        ERRORF(reporter, "Could not create render target.");
+        return;
+    }
+    sk_sp<GrDrawContext> dc(context->drawContext(sk_ref_sp(target->asRenderTarget())));
     if (!dc) {
         ERRORF(reporter, "Could not create draw context.");
         return;
     }
     int attribCnt = context->caps()->maxVertexAttributes();
     if (!attribCnt) {
         ERRORF(reporter, "No attributes allowed?!");
         return;
     }
     context->flush();
     context->resetGpuStats();
 #if GR_GPU_STATS
     REPORTER_ASSERT(reporter, context->getGpu()->stats()->numDraws() == 0);
     REPORTER_ASSERT(reporter, context->getGpu()->stats()->numFailedDraws() == 0);
 #endif
     SkAutoTUnref<GrDrawBatch> batch;
     GrPipelineBuilder pb;
-    pb.setRenderTarget(dc->accessRenderTarget());
+    pb.setRenderTarget(target->asRenderTarget());
     // This one should succeed.
     batch.reset(new Batch(attribCnt));
     dc->drawContextPriv().testingOnly_drawBatch(pb, batch);
     context->flush();
 #if GR_GPU_STATS
     REPORTER_ASSERT(reporter, context->getGpu()->stats()->numDraws() == 1);
     REPORTER_ASSERT(reporter, context->getGpu()->stats()->numFailedDraws() == 0);
 #endif
     context->resetGpuStats();
     // This one should fail.
     batch.reset(new Batch(attribCnt+1));
     dc->drawContextPriv().testingOnly_drawBatch(pb, batch);
     context->flush();
 #if GR_GPU_STATS
     REPORTER_ASSERT(reporter, context->getGpu()->stats()->numDraws() == 0);
     REPORTER_ASSERT(reporter, context->getGpu()->stats()->numFailedDraws() == 1);
 #endif
 }
 #endif