add paint::getFontBounds()

gm/fontmgr.cpp

 /*
  * Copyright 2013 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 "SkCanvas.h"
 #include "SkFontMgr.h"
 #include "SkGraphics.h"
 #include "SkTypeface.h"
 
 #ifdef SK_BUILD_FOR_WIN
     #include "SkTypeface_win.h"
 #endif
 
-static void scale(SkRect* rect, SkScalar scale) {
-    rect->fLeft *= scale;
-    rect->fTop *= scale;
-    rect->fRight *= scale;
-    rect->fBottom *= scale;
-}
-
 // limit this just so we don't take too long to draw
 #define MAX_FAMILIES    30
 
 static SkScalar drawString(SkCanvas* canvas, const SkString& text, SkScalar x,
                            SkScalar y, const SkPaint& paint) {
     canvas->drawText(text.c_str(), text.size(), x, y, paint);
     return x + paint.measureText(text.c_str(), text.size());
 }
 
 static SkScalar drawCharacter(SkCanvas* canvas, uint32_t character, SkScalar x,
@@ skipping 191 matching lines @@
         // these new styles, so skip tests that exercise that for now.
         return kSkipPicture_Flag | kSkipPipe_Flag;
     }
 
 private:
     typedef GM INHERITED;
 };
 
 class FontMgrBoundsGM : public skiagm::GM {
 public:
-    FontMgrBoundsGM() {
+    FontMgrBoundsGM(double scale, double skew)
+        : fScaleX(SkDoubleToScalar(scale))
+        , fSkewX(SkDoubleToScalar(skew))
+    {
         fName.set("fontmgr_bounds");
+        if (scale != 1 || skew != 0) {
+            fName.appendf("_%g_%g", scale, skew);
+        }
         fFM.reset(SkFontMgr::RefDefault());
     }
 
     static void show_bounds(SkCanvas* canvas, const SkPaint& paint, SkScalar x, SkScalar y,
                             SkColor boundsColor) {
         const char str[] = "jyHO[]{}@-_&%$";
 
-        const SkTypeface* tf = paint.getTypeface();
         for (int i = 0; str[i]; ++i) {
             canvas->drawText(&str[i], 1, x, y, paint);
         }
         
-        SkRect r = tf->getBounds();
-        scale(&r, paint.getTextSize());
+        SkRect r = paint.getFontBounds();
         r.offset(x, y);
         SkPaint p(paint);
         p.setColor(boundsColor);
         canvas->drawRect(r, p);
     }
 
 protected:
     virtual SkString onShortName() {
         return fName;
     }
     
     virtual SkISize onISize() {
         return SkISize::Make(1024, 850);
     }
     
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setSubpixelText(true);
         paint.setTextSize(100);
         paint.setStyle(SkPaint::kStroke_Style);
+        paint.setTextScaleX(fScaleX);
+        paint.setTextSkewX(fSkewX);
 
         const SkColor boundsColors[2] = { SK_ColorRED, SK_ColorBLUE };
         
         SkFontMgr* fm = fFM;
         int count = SkMin32(fm->countFamilies(), 32);
 
         int index = 0;
         SkScalar x = 0, y = 0;
 
         canvas->translate(80, 120);
@@ skipping 24 matching lines @@
         
         // If certain fonts are picked up (e.g. Microsoft Jhenghei 20MB for Regular, 12MB for Bold),
         // the resulting pdf can be ~700MB and crashes Chrome's PDF viewer.
         
         return kSkipPicture_Flag | kSkipPipe_Flag | kSkipPDF_Flag;
     }
     
 private:
     SkAutoTUnref<SkFontMgr> fFM;
     SkString fName;
+    SkScalar fScaleX, fSkewX;
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return SkNEW(FontMgrGM); )
-DEF_GM( return SkNEW(FontMgrBoundsGM); )
 DEF_GM( return SkNEW(FontMgrMatchGM); )
+DEF_GM( return SkNEW(FontMgrBoundsGM(1.0, 0)); )
+DEF_GM( return SkNEW(FontMgrBoundsGM(0.75, 0)); )
+DEF_GM( return SkNEW(FontMgrBoundsGM(1.0, -0.25)); )
 
 #ifdef SK_BUILD_FOR_WIN
     DEF_GM( return SkNEW_ARGS(FontMgrGM, (SkFontMgr_New_DirectWrite())); )
 #endif