Fix up textblobcachetest

tests/TextBlobCacheTest.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "sk_tool_utils.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
@@ skipping 14 matching lines @@
 #include "GrContextFactory.h"
 
 struct TextBlobWrapper {
     explicit TextBlobWrapper(const SkTextBlob* blob) : fBlob(SkRef(blob)) {}
     TextBlobWrapper(const TextBlobWrapper& blob) : fBlob(SkRef(blob.fBlob.get())) {}
 
     SkAutoTUnref<const SkTextBlob> fBlob;
 };
 
 static void draw(SkCanvas* canvas, int redraw, const SkTArray<TextBlobWrapper>& blobs) {
+    int yOffset = 0;
     for (int r = 0; r < redraw; r++) {
         for (int i = 0; i < blobs.count(); i++) {
+            const SkTextBlob* blob = blobs[i].fBlob.get();
+            const SkRect& bounds = blob->bounds();
+            yOffset += SkScalarCeilToInt(bounds.height());
             SkPaint paint;
-            canvas->drawTextBlob(blobs[i].fBlob.get(), 0, 0, paint);
+            canvas->drawTextBlob(blob, 0, SkIntToScalar(yOffset), paint);
         }
     }
 }
 
 // limit this just so we don't take too long to draw
 #define MAX_TOTAL_TEXT 4096
 #define MAX_CHAR 256
 #define MAX_FAMILIES 5
 
 // This test hammers the GPU textblobcache and font atlas
-DEF_TEST(TextBlobCache, reporter) {
-    SkAutoTDelete<GrContextFactory> grFactory(SkNEW(GrContextFactory));
-
+DEF_GPUTEST(TextBlobCache, reporter, factory) {
     // setup surface
     uint32_t flags = 0;
     SkSurfaceProps props(flags, SkSurfaceProps::kLegacyFontHost_InitType);
 
-    GrContext* ctx = grFactory->get(GrContextFactory::kNative_GLContextType);
+    GrContext* ctx = factory->get(GrContextFactory::kNative_GLContextType);
     SkImageInfo info = SkImageInfo::Make(1024, 768, kN32_SkColorType, kPremul_SkAlphaType);
     SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkSurface::kNo_Budgeted, info,
                                                                0, &props));
     REPORTER_ASSERT(reporter, surface);
     if (!surface) {
         return;
     }
 
     SkCanvas* canvas = surface->getCanvas();
 
@@ skipping 47 matching lines @@
 
     // test draw after free
     ctx->freeGpuResources();
     draw(canvas, 1, blobs);
 
     // test draw after abandon
     ctx->abandonContext();
     draw(canvas, 1, blobs);
 }
 #endif