Revert of Revert of stop calling SkScalarDiv

gm/glyph_pos.cpp

 /*
  * Copyright 2014 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 "SkTypeface.h"
@@ skipping 64 matching lines @@
         canvas->scale(3.0f, 6.0f);
         drawTestCase(canvas, 1.0f);
         canvas->restore();
 
         // Skew test.
         canvas->translate(0.0f, 80.0f);
         canvas->save();
         canvas->scale(3.0f, 3.0f);
         SkMatrix skew;
         skew.setIdentity();
-        skew.setSkewX(SkScalarDiv(8.0f,
-                                  25.0f));
-        skew.setSkewY(SkScalarDiv(2.0f,
-                                  25.0f));
+        skew.setSkewX(8.0f / 25.0f);
+        skew.setSkewY(2.0f / 25.0f);
         canvas->concat(skew);
         drawTestCase(canvas, 1.0f);
         canvas->restore();
 
         // Perspective test.
         canvas->translate(0.0f, 80.0f);
         canvas->save();
         SkMatrix perspective;
         perspective.setIdentity();
-        perspective.setPerspX(-SkScalarDiv(SK_Scalar1, 340.0f));
-        perspective.setSkewX(SkScalarDiv(8.0f,
-                                         25.0f));
-        perspective.setSkewY(SkScalarDiv(2.0f,
-                                         25.0f));
+        perspective.setPerspX(-SkScalarInvert(340));
+        perspective.setSkewX(8.0f / 25.0f);
+        perspective.setSkewY(2.0f / 25.0f);
 
 
         canvas->concat(perspective);
         drawTestCase(canvas, 1.0f);
         canvas->restore();
     }
 
     void drawTestCase(SkCanvas* canvas, SkScalar textScale) {
         SkPaint paint;
         paint.setColor(SK_ColorBLACK);
@@ skipping 79 matching lines @@
 
 static GMRegistry reg1(GlyphPosHairlineStrokeAndFillFactory);
 static GMRegistry reg2(GlyphPosStrokeAndFillFactory);
 static GMRegistry reg3(GlyphPosHairlineStrokeFactory);
 static GMRegistry reg4(GlyphPosStrokeFactory);
 static GMRegistry reg5(GlyphPosHairlineFillFactory);
 static GMRegistry reg6(GlyphPosFillFactory);
 
 
 }