Revert of Add BW masks to random scaler context

gm/textblobrandomfont.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 "gm.h"
 
 #include "Resources.h"
@@ skipping 31 matching lines @@
         SkAutoTUnref<SkTypeface> orig(sk_tool_utils::create_portable_typeface("sans-serif",
                                                                               SkTypeface::kBold));
         if (NULL == orig) {
             orig.reset(SkTypeface::RefDefault());
         }
         SkAutoTUnref<SkTypeface> random(SkNEW_ARGS(SkRandomTypeface, (orig, paint, false)));
         paint.setTypeface(random);
 
         SkRect bounds;
         paint.measureText(text, strlen(text), &bounds);
+
+        SkScalar yOffset = bounds.height();
         sk_tool_utils::add_to_text_blob(&builder, text, paint, 0, 0);
 
         // A8
-        const char* bigtext1 = "The quick brown fox";
-        const char* bigtext2 = "jumps over the lazy dog.";
-        paint.setTextSize(160);
         paint.setSubpixelText(false);
         paint.setLCDRenderText(false);
-        paint.measureText(bigtext1, strlen(bigtext1), &bounds);
-        SkScalar offset = bounds.height();
-        sk_tool_utils::add_to_text_blob(&builder, bigtext1, paint, 0, offset);
-
-        paint.measureText(bigtext2, strlen(bigtext2), &bounds);
-        offset += bounds.height();
-        sk_tool_utils::add_to_text_blob(&builder, bigtext2, paint, 0, offset);
-
-        // color emoji
-        SkAutoTUnref<SkTypeface> origEmoji;
-        sk_tool_utils::emoji_typeface(&origEmoji);
-        if (origEmoji) {
-            const char* emojiText = sk_tool_utils::emoji_sample_text();
-            paint.measureText(emojiText, strlen(emojiText), &bounds);
-            offset += bounds.height();
-            SkAutoTUnref<SkTypeface> randomEmoji(SkNEW_ARGS(SkRandomTypeface, (orig, paint,
-                                                                               false)));
-            paint.setTypeface(randomEmoji);
-            sk_tool_utils::add_to_text_blob(&builder, emojiText, paint, 0, offset);
-        }
+        sk_tool_utils::add_to_text_blob(&builder, text, paint, 0, yOffset - 32);
 
         // build
         fBlob.reset(builder.build());
     }
 
     SkString onShortName() override {
         return SkString("textblobrandomfont");
     }
 
     SkISize onISize() override {
@@ skipping 11 matching lines @@
 
         SkImageInfo info = SkImageInfo::MakeN32Premul(kWidth, kHeight);
         SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
         SkAutoTUnref<SkSurface> surface(canvas->newSurface(info, &props));
         if (surface) {
             SkPaint paint;
             paint.setAntiAlias(true);
 
             SkCanvas* c = surface->getCanvas();
 
-            int stride = SkScalarCeilToInt(fBlob->bounds().height());
-            int yOffset = stride / 8;
-            for (int i = 0; i < 1; i++) {
+            int stride = SkScalarCeilToInt(fBlob->bounds().height() / 2) + 10;
+            int yOffset = stride;
+            for (int i = 0; i < 10; i++) {
                 // fiddle the canvas to force regen of textblobs
                 canvas->rotate(i % 2 ? 0.0f : -0.05f);
                 canvas->drawTextBlob(fBlob, 10.0f, SkIntToScalar(yOffset), paint);
                 yOffset += stride;
 
                 // This will draw as black boxes
                 c->drawTextBlob(fBlob, 10, SkIntToScalar(yOffset), paint);
                 surface->draw(canvas, 0, 0, nullptr);
 
                 // free gpu resources and verify
                 yOffset += stride;
                 canvas->getGrContext()->freeGpuResources();
                 canvas->drawTextBlob(fBlob, 10, SkIntToScalar(yOffset), paint);
 
                 yOffset += stride;
             }
 
         } else {
             const char* text = "This test requires a surface";
             size_t len = strlen(text);
             SkPaint paint;
             canvas->drawText(text, len, 10, 100, paint);
         }
     }
 
 private:
     SkAutoTUnref<const SkTextBlob> fBlob;
 
-    static const int kWidth = 2000;
-    static const int kHeight = 1600;
+    static const int kWidth = 1000;
+    static const int kHeight = 1000;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return SkNEW(TextBlobRandomFont); )
 }
 #endif