Revert of Modifying TextBlobCacheTest to use SkRandomScalerContext

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"
 #include "SkPoint.h"
 #include "SkTextBlob.h"
 #include "SkFontMgr.h"
 #include "SkGraphics.h"
 #include "SkSurface.h"
 #include "SkTypeface.h"
-#include "../src/fonts/SkRandomScalerContext.h"
-#include "../src/fonts/SkGScalerContext.h"
 
 #ifdef SK_BUILD_FOR_WIN
     #include "SkTypeface_win.h"
 #endif
 
 #include "Test.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContextFactory.h"
 
@@ skipping 25 matching lines @@
 
 static const int kWidth = 1024;
 static const int kHeight = 768;
 
 // This test hammers the GPU textblobcache and font atlas
 DEF_GPUTEST(TextBlobCache, reporter, factory) {
     // setup surface
     uint32_t flags = 0;
     SkSurfaceProps props(flags, SkSurfaceProps::kLegacyFontHost_InitType);
 
-    // We don't typically actually draw with this unittest
-    GrContext* ctx = factory->get(GrContextFactory::kNull_GLContextType);
+    GrContext* ctx = factory->get(GrContextFactory::kNative_GLContextType);
     SkImageInfo info = SkImageInfo::Make(kWidth, kHeight, 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 14 matching lines @@
         paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
         paint.setTextSize(48); // draw big glyphs to really stress the atlas
 
         SkString familyName;
         fm->getFamilyName(i, &familyName);
         SkAutoTUnref<SkFontStyleSet> set(fm->createStyleSet(i));
         for (int j = 0; j < set->count(); ++j) {
             SkFontStyle fs;
             set->getStyle(j, &fs, NULL);
 
-            // We use a typeface which randomy returns unexpected mask formats to fuzz
-            SkAutoTUnref<SkTypeface> orig(set->createTypeface(j));
-            SkAutoTUnref<SkTypeface> typeface(SkNEW_ARGS(SkRandomTypeface, (orig, paint, true)));
-            paint.setTypeface(typeface);
+            SkSafeUnref(paint.setTypeface(set->createTypeface(j)));
 
             SkTextBlobBuilder builder;
             for (int aa = 0; aa < 2; aa++) {
                 for (int subpixel = 0; subpixel < 2; subpixel++) {
                     for (int lcd = 0; lcd < 2; lcd++) {
                         paint.setAntiAlias(SkToBool(aa));
                         paint.setSubpixelText(SkToBool(subpixel));
                         paint.setLCDRenderText(SkToBool(lcd));
-                        if (!SkToBool(lcd)) {
-                            paint.setTextSize(160);
-                        }
                         const SkTextBlobBuilder::RunBuffer& run = builder.allocRun(paint,
                                                                                    MAX_TOTAL_TEXT,
                                                                                    0, 0,
                                                                                    NULL);
                         memcpy(run.glyphs, text, MAX_TOTAL_TEXT * sizeof(uint16_t));
                     }
                 }
             }
             SkNEW_APPEND_TO_TARRAY(&blobs, TextBlobWrapper, (builder.build()));
         }
@@ skipping 19 matching lines @@
     draw(canvas, 1, blobs);
 
     ctx->freeGpuResources();
     draw(canvasNoLCD, 1, blobs);
 
     // test draw after abandon
     ctx->abandonContext();
     draw(canvas, 1, blobs);
 }
 #endif