make dftext gm not overlap itself

gm/dftext.cpp

 /*
  * Copyright 2011 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"
 #include "SkCanvas.h"
 #include "SkStream.h"
@@ skipping 128 matching lines @@
 
         // check gamma-corrected blending
         const SkColor fg[] = {
             0xFFFFFFFF,
             0xFFFFFF00, 0xFFFF00FF, 0xFF00FFFF,
             0xFFFF0000, 0xFF00FF00, 0xFF0000FF,
             0xFF000000,
         };
 
         paint.setColor(0xFFF7F3F7);
-        SkRect r = SkRect::MakeLTRB(670, 250, 820, 460);
+        SkRect r = SkRect::MakeLTRB(670, 215, 820, 397);
         canvas->drawRect(r, paint);
 
         x = SkIntToScalar(680);
-        y = SkIntToScalar(270);
+        y = SkIntToScalar(235);
         paint.setTextSize(SkIntToScalar(19));
         for (size_t i = 0; i < SK_ARRAY_COUNT(fg); ++i) {
             paint.setColor(fg[i]);
 
             canvas->drawText(text, textLen, x, y, paint);
             y += paint.getFontMetrics(NULL);
         }
 
         paint.setColor(0xFF181C18);
-        r = SkRect::MakeLTRB(820, 250, 970, 460);
+        r = SkRect::MakeLTRB(820, 215, 970, 397);
         canvas->drawRect(r, paint);
 
         x = SkIntToScalar(830);
-        y = SkIntToScalar(270);
+        y = SkIntToScalar(235);
         paint.setTextSize(SkIntToScalar(19));
         for (size_t i = 0; i < SK_ARRAY_COUNT(fg); ++i) {
             paint.setColor(fg[i]);
 
             canvas->drawText(text, textLen, x, y, paint);
             y += paint.getFontMetrics(NULL);
         }
 
         // check skew
         {
             paint.setLCDRenderText(false);
             SkAutoCanvasRestore acr(canvas, true);
             canvas->skew(0.0f, 0.151515f);
             paint.setTextSize(SkIntToScalar(32));
             canvas->drawText(text, textLen, 745, 70, paint);
         }
         {
             paint.setLCDRenderText(true);
             SkAutoCanvasRestore acr(canvas, true);
             canvas->skew(0.5f, 0.0f);
             paint.setTextSize(SkIntToScalar(32));
-            canvas->drawText(text, textLen, 580, 230, paint);
+            canvas->drawText(text, textLen, 580, 125, paint);
         }
 
         // check color emoji
         if (fEmojiTypeface) {
             paint.setTypeface(fEmojiTypeface);
             paint.setTextSize(SkIntToScalar(19));
-            canvas->drawText(fEmojiText, strlen(fEmojiText), 670, 100, paint);
+            canvas->drawText(fEmojiText, strlen(fEmojiText), 670, 90, paint);
         }
 #if SK_SUPPORT_GPU
         // render offscreen buffer
         if (surface) {
             SkAutoCanvasRestore acr(inputCanvas, true);
             // since we prepended this matrix already, we blit using identity
             inputCanvas->resetMatrix();
             SkImage* image = surface->newImageSnapshot();
             inputCanvas->drawImage(image, 0, 0, NULL);
             image->unref();
         }
 #endif
     }
 
 private:
     SkAutoTUnref<SkTypeface> fEmojiTypeface;
     const char* fEmojiText;
 
     typedef skiagm::GM INHERITED;
 };
 
 DEF_GM( return SkNEW(DFTextGM); )