commit 404d9d620d98b186890f9dbdd3498557206c2793
author joshualitt <joshualitt@chromium.org> Wed Jul 22 11:00:32 2015 -0700
committer Commit bot <commit-bot@chromium.org> Wed Jul 22 11:00:32 2015 -0700
tree ed0bd31e8a67d2f7fdb84dc8347350a09c4261c3
parent ced1585149d4ac8a68efd80e11dbc23bca6620d4

Fix up textblobcachetest

TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/1250003003

tests/TextBlobCacheTest.cpp

diff --git a/tests/TextBlobCacheTest.cpp b/tests/TextBlobCacheTest.cpp
index b15af90..1c65962 100644
--- a/tests/TextBlobCacheTest.cpp
+++ b/tests/TextBlobCacheTest.cpp
@@ -32,10 +32,14 @@
 };
 
 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);
         }
     }
 }
@@ -46,14 +50,12 @@
 #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));