Merged https://codereview.chromium.org/922273002/ to M41

src/ports/SkFontHost_FreeType_common.cpp

Index: src/ports/SkFontHost_FreeType_common.cpp
diff --git a/src/ports/SkFontHost_FreeType_common.cpp b/src/ports/SkFontHost_FreeType_common.cpp
index bd3cddf596420ae61a898636945b344d7297fd02..e03599f581fad5172858c736f318a9d71a9f092d 100644
--- a/src/ports/SkFontHost_FreeType_common.cpp
+++ b/src/ports/SkFontHost_FreeType_common.cpp
@@ -177,8 +177,8 @@ static void copyFT2LCD16(const FT_Bitmap& bitmap, const SkMask& mask, int lcdIsB
  *  TODO: All of these N need to be Y or otherwise ruled out.
  */
 static void copyFTBitmap(const FT_Bitmap& srcFTBitmap, SkMask& dstMask) {
-    SkASSERT(dstMask.fBounds.width() == srcFTBitmap.width);
-    SkASSERT(dstMask.fBounds.height() == srcFTBitmap.rows);
+    SkASSERT(dstMask.fBounds.width() == static_cast<int>(srcFTBitmap.width));
+    SkASSERT(dstMask.fBounds.height() == static_cast<int>(srcFTBitmap.rows));

[sugoi1, 2015/03/10 14:58:20]

I had to also add this small fix (that's already in ToT) just to be able to
build in Debug

 
     const uint8_t* src = reinterpret_cast<const uint8_t*>(srcFTBitmap.buffer);
     const FT_Pixel_Mode srcFormat = static_cast<FT_Pixel_Mode>(srcFTBitmap.pixel_mode);