Revert of stop calling SkScalarDiv

src/effects/gradients/SkTwoPointConicalGradient_gpu.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 "SkTwoPointConicalGradient_gpu.h"
 
@@ skipping 339 matching lines @@
     // If the focal point is touching the edge of the circle it will
     // cause a degenerate case that must be handled separately
     // kEdgeErrorTol = 5 * kErrorTol was picked after manual testing the
     // stability trade off versus the linear approx used in the Edge Shader
     if (SkScalarAbs(1.f - (*focalX)) < kEdgeErrorTol) {
         return kEdge_ConicalType;
     }
 
     // Scale factor 1 / (1 - focalX * focalX)
     SkScalar oneMinusF2 = 1.f - SkScalarMul(*focalX, *focalX);
-    SkScalar s = SkScalarInvert(oneMinusF2);
+    SkScalar s = SkScalarDiv(1.f, oneMinusF2);
 
 
     if (s >= 0.f) {
         conicalType = kInside_ConicalType;
         matrix.postScale(s, s * SkScalarSqrt(oneMinusF2));
     } else {
         conicalType = kOutside_ConicalType;
         matrix.postScale(s, s);
     }
 
@@ skipping 737 matching lines @@
     }
 
     CircleOutside2PtConicalEffect(GrContext* ctx,
                                   const SkTwoPointConicalGradient& shader,
                                   const SkMatrix& matrix,
                                   SkShader::TileMode tm,
                                   const CircleConicalInfo& info)
         : INHERITED(ctx, shader, matrix, tm), fInfo(info) {
         this->initClassID<CircleOutside2PtConicalEffect>();
         if (shader.getStartRadius() != shader.getEndRadius()) {
-            fTLimit = shader.getStartRadius() / (shader.getStartRadius() - shader.getEndRadius());
+            fTLimit = SkScalarDiv(shader.getStartRadius(),
+                                  (shader.getStartRadius() - shader.getEndRadius()));
         } else {
             fTLimit = SK_ScalarMin;
         }
 
         fIsFlipped = shader.isFlippedGrad();
     }
 
     GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     const CircleConicalInfo fInfo;
@@ skipping 242 matching lines @@
         return CircleInside2PtConicalEffect::Create(ctx, shader, matrix, tm, info);
     } else if (type == kEdge_ConicalType) {
         set_matrix_edge_conical(shader, &matrix);
         return Edge2PtConicalEffect::Create(ctx, shader, matrix, tm);
     } else {
         return CircleOutside2PtConicalEffect::Create(ctx, shader, matrix, tm, info);
     }
 }
 
 #endif