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

src/ports/SkFontHost_FreeType_common.cpp

 /*
  * Copyright 2006-2012 The Android Open Source Project
  * Copyright 2012 Mozilla Foundation
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 159 matching lines @@
  *  FT_PIXEL_MODE_GRAY     N   Y  NR     N       Y
  *  FT_PIXEL_MODE_GRAY2   NP  NP  NR    NP      NP
  *  FT_PIXEL_MODE_GRAY4   NP  NP  NR    NP      NP
  *  FT_PIXEL_MODE_LCD     NP  NP  NR    NP      NP
  *  FT_PIXEL_MODE_LCD_V   NP  NP  NR    NP      NP
  *  FT_PIXEL_MODE_BGRA     N   N  NR     Y       N
  *
  *  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);
     // FT_Bitmap::pitch is an int and allowed to be negative.
     const int srcPitch = srcFTBitmap.pitch;
     const size_t srcRowBytes = SkTAbs(srcPitch);
 
     uint8_t* dst = dstMask.fImage;
     const SkMask::Format dstFormat = static_cast<SkMask::Format>(dstMask.fFormat);
     const size_t dstRowBytes = dstMask.fRowBytes;
@@ skipping 364 matching lines @@
 
     FT_Error err = FT_Outline_Decompose(&face->glyph->outline, &funcs, path);
 
     if (err != 0) {
         path->reset();
         return;
     }
 
     path->close();
 }