Revert of stop calling SkScalarDiv

src/device/xps/SkXPSDevice.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 "SkTypes.h"
 
 #ifndef UNICODE
@@ skipping 494 matching lines @@
         stop.fX = SkScalarMul(end.fX - start.fX, stopOffsets[i]);
         stop.fY = SkScalarMul(end.fY - start.fY, stopOffsets[i]);
 
         SkPoint stopTransformed;
         transform.mapXY(stop.fX, stop.fY, &stopTransformed);
 
         //Manhattan distance between transformed start and stop.
         SkScalar startToStop = (stopTransformed.fX - startTransformed.fX)
                              + (stopTransformed.fY - startTransformed.fY);
         //Percentage along transformed line.
-        stopOffsets[i] = startToStop / startToEnd;
+        stopOffsets[i] = SkScalarDiv(startToStop, startToEnd);
     }
 }
 
 HRESULT SkXPSDevice::createXpsTransform(const SkMatrix& matrix,
                                         IXpsOMMatrixTransform** xpsTransform) {
     SkScalar affine[6];
     if (!matrix.asAffine(affine)) {
         *xpsTransform = NULL;
         return S_FALSE;
     }
@@ skipping 863 matching lines @@
                         xpsFigure.get(), xpsFigures));
     }
     return S_OK;
 }
 
 void SkXPSDevice::convertToPpm(const SkMaskFilter* filter,
                                SkMatrix* matrix,
                                SkVector* ppuScale,
                                const SkIRect& clip, SkIRect* clipIRect) {
     //This action is in unit space, but the ppm is specified in physical space.
-    ppuScale->set(fCurrentPixelsPerMeter.fX / fCurrentUnitsPerMeter.fX,
-                  fCurrentPixelsPerMeter.fY / fCurrentUnitsPerMeter.fY);
+    ppuScale->fX = SkScalarDiv(this->fCurrentPixelsPerMeter.fX,
+                               this->fCurrentUnitsPerMeter.fX);
+    ppuScale->fY = SkScalarDiv(this->fCurrentPixelsPerMeter.fY,
+                               this->fCurrentUnitsPerMeter.fY);
 
     matrix->postScale(ppuScale->fX, ppuScale->fY);
 
     const SkIRect& irect = clip;
     SkRect clipRect = SkRect::MakeLTRB(
         SkScalarMul(SkIntToScalar(irect.fLeft), ppuScale->fX),
         SkScalarMul(SkIntToScalar(irect.fTop), ppuScale->fY),
         SkScalarMul(SkIntToScalar(irect.fRight), ppuScale->fX),
         SkScalarMul(SkIntToScalar(irect.fBottom), ppuScale->fY));
     clipRect.roundOut(clipIRect);
@@ skipping 856 matching lines @@
              CLSID_XpsOMObjectFactory,
              NULL,
              CLSCTX_INPROC_SERVER,
              IID_PPV_ARGS(&this->fXpsFactory)),
          "Could not create factory for layer.");
 
     HRVM(this->fXpsFactory->CreateCanvas(&this->fCurrentXpsCanvas),
          "Could not create canvas for layer.");
 }