Simple cleanups related to SkFixed.

src/core/SkScan_Hairline.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkScan.h"
 #include "SkBlitter.h"
 #include "SkRasterClip.h"
@@ skipping 124 matching lines @@
             SkFixed slope = SkFixedDiv(dx, dy);
             SkFixed startX = SkFDot6ToFixed(x0) + (slope * ((32 - y0) & 63) >> 6);
 
             vertline(iy0, iy1, startX, slope, blitter);
         }
     }
 }
 
 // we don't just draw 4 lines, 'cause that can leave a gap in the bottom-right
 // and double-hit the top-left.
-// TODO: handle huge coordinates on rect (before calling SkScalarToFixed)
+// TODO: handle huge coordinates on rect (before calling SkScalarFloorToInt)
 void SkScan::HairRect(const SkRect& rect, const SkRasterClip& clip,
                       SkBlitter* blitter) {
     SkAAClipBlitterWrapper wrapper;
     SkBlitterClipper    clipper;
     SkIRect             r;
 
-    r.set(SkScalarToFixed(rect.fLeft) >> 16,
-          SkScalarToFixed(rect.fTop) >> 16,
-          (SkScalarToFixed(rect.fRight) >> 16) + 1,
-          (SkScalarToFixed(rect.fBottom) >> 16) + 1);
+    r.set(SkScalarFloorToInt(rect.fLeft),
+          SkScalarFloorToInt(rect.fTop),
+          SkScalarFloorToInt(rect.fRight) + 1,
+          SkScalarFloorToInt(rect.fBottom) + 1);
 
     if (clip.quickReject(r)) {
         return;
     }
     if (!clip.quickContains(r)) {
         const SkRegion* clipRgn;
         if (clip.isBW()) {
             clipRgn = &clip.bwRgn();
         } else {
             wrapper.init(clip, blitter);
@@ skipping 513 matching lines @@
 
         SkAAClipBlitterWrapper wrap;
         if (!clip.quickContains(r.roundOut().makeOutset(1, 1))) {
             wrap.init(clip, blitter);
             blitter = wrap.getBlitter();
             clipRgn = &wrap.getRgn();
         }
         AntiHairLineRgn(pts, count, clipRgn, blitter);
     }
 }