replace deprecated SkScalarRound/Floor/Ceil calls with more explicit variants

skia/ext/vector_platform_device_emf_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "skia/ext/vector_platform_device_emf_win.h"
 
 #include <windows.h>
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
@@ skipping 183 matching lines @@
 
     // Draw the calculated path.
     drawPath(draw, path_modified, paint_no_effet);
     return;
   }
 
   if (!ApplyPaint(paint)) {
     return;
   }
   HDC dc = BeginPlatformPaint();
-  if (!Rectangle(dc, SkScalarRound(rect.fLeft),
-                 SkScalarRound(rect.fTop),
-                 SkScalarRound(rect.fRight),
-                 SkScalarRound(rect.fBottom))) {
+  if (!Rectangle(dc, SkScalarRoundToInt(rect.fLeft),
+                 SkScalarRoundToInt(rect.fTop),
+                 SkScalarRoundToInt(rect.fRight),
+                 SkScalarRoundToInt(rect.fBottom))) {
     SkASSERT(false);
   }
   EndPlatformPaint();
   Cleanup();
 }
 
 void VectorPlatformDeviceEmf::drawRRect(const SkDraw& draw, const SkRRect& rr,
                                         const SkPaint& paint) {
   SkPath path;
   path.addRRect(rr);
@@ skipping 175 matching lines @@
   SkASSERT(!fUseGDIHasBeenCalled);
   SkDEBUGCODE(fUseGDIHasBeenCalled = true;)
 
   fUseGDI = gdiCanHandleText(paint);
   if (fUseGDI) {
     fSavedTextColor = GetTextColor(hdc);
     SetTextColor(hdc, skia::SkColorToCOLORREF(paint.getColor()));
 
     LOGFONT lf;
     SkLOGFONTFromTypeface(paint.getTypeface(), &lf);
-    lf.lfHeight = -SkScalarRound(paint.getTextSize());
+    lf.lfHeight = -SkScalarRoundToInt(paint.getTextSize());
     fNewFont = CreateFontIndirect(&lf);
     fSavedFont = (HFONT)::SelectObject(hdc, fNewFont);
     fHDC = hdc;
   }
   return fUseGDI;
 }
 
 SkGDIFontSetup::~SkGDIFontSetup() {
   if (fUseGDI) {
     ::SelectObject(fHDC, fSavedFont);
@@ skipping 67 matching lines @@
                                        SkScalar x,
                                        SkScalar y,
                                        const SkPaint& paint) {
   SkGDIFontSetup setup;
   bool useDrawPath = true;
 
   if (SkPaint::kUTF8_TextEncoding != paint.getTextEncoding()
       && setup.useGDI(hdc_, paint)) {
     UINT options = getTextOutOptions(paint);
     UINT count = byteLength >> 1;
-    useDrawPath = !EnsureExtTextOut(hdc_, SkScalarRound(x),
-        SkScalarRound(y + getAscent(paint)), options, 0,
+    useDrawPath = !EnsureExtTextOut(hdc_, SkScalarRoundToInt(x),
+        SkScalarRoundToInt(y + getAscent(paint)), options, 0,
         reinterpret_cast<const wchar_t*>(text), count, NULL,
         paint.getTypeface());
   }
 
   if (useDrawPath) {
     SkPath path;
     paint.getTextPath(text, byteLength, x, y, &path);
     drawPath(draw, path, paint);
   }
 }
@@ skipping 17 matching lines @@
                                           const SkScalar pos[],
                                           SkScalar constY,
                                           int scalarsPerPos,
                                           const SkPaint& paint) {
   SkGDIFontSetup setup;
   bool useDrawText = true;
 
   if (2 == scalarsPerPos
       && SkPaint::kUTF8_TextEncoding != paint.getTextEncoding()
       && setup.useGDI(hdc_, paint)) {
-    int startX = SkScalarRound(pos[0]);
-    int startY = SkScalarRound(pos[1] + getAscent(paint));
+    int startX = SkScalarRoundToInt(pos[0]);
+    int startY = SkScalarRoundToInt(pos[1] + getAscent(paint));
     const int count = len >> 1;
     SkAutoSTMalloc<64, INT> storage(count);
     INT* advances = storage.get();
     for (int i = 0; i < count - 1; ++i) {
-      advances[i] = SkScalarRound(pos[2] - pos[0]);
+      advances[i] = SkScalarRoundToInt(pos[2] - pos[0]);
       pos += 2;
     }
     useDrawText = !EnsureExtTextOut(hdc_, startX, startY,
         getTextOutOptions(paint), 0, reinterpret_cast<const wchar_t*>(text),
         count, advances, paint.getTypeface());
   }
 
   if (useDrawText) {
     size_t (*bytesPerCodePoint)(const char*);
     switch (paint.getTextEncoding()) {
@@ skipping 306 matching lines @@
       // Begin/end contours with a half square extension.
       pen_style |= PS_ENDCAP_SQUARE;
       break;
     default:
       SkASSERT(false);
       break;
   }
 
   return CreatePen(use_pen,
                    SkColorToCOLORREF(paint.getColor()),
-                   SkScalarRound(paint.getStrokeWidth()),
+                   SkScalarRoundToInt(paint.getStrokeWidth()),
                    paint.getStrokeMiter(),
                    pen_style);
 }
 
 void VectorPlatformDeviceEmf::InternalDrawBitmap(const SkBitmap& bitmap,
                                                  int x, int y,
                                                  const SkPaint& paint) {
   unsigned char alpha = paint.getAlpha();
   if (alpha == 0)
     return;
@@ skipping 111 matching lines @@
                                 pixels,
                                 reinterpret_cast<const BITMAPINFO*>(&hdr),
                                 DIB_RGB_COLORS,
                                 SRCCOPY);
   }
   EndPlatformPaint();
   Cleanup();
 }
 
 }  // namespace skia