michael@0: diff --git a/gfx/skia/include/core/SkPostConfig.h b/gfx/skia/include/core/SkPostConfig.h
michael@0: index 0135b85..bb108f8 100644
michael@0: --- a/gfx/skia/include/core/SkPostConfig.h
michael@0: +++ b/gfx/skia/include/core/SkPostConfig.h
michael@0: @@ -253,7 +253,7 @@
michael@0:  //////////////////////////////////////////////////////////////////////
michael@0:  
michael@0:  #ifndef SK_OVERRIDE
michael@0: -#if defined(SK_BUILD_FOR_WIN)
michael@0: +#if defined(_MSC_VER)
michael@0:  #define SK_OVERRIDE override
michael@0:  #elif defined(__clang__)
michael@0:  // Some documentation suggests we should be using __attribute__((override)),
michael@0: diff --git a/gfx/skia/src/ports/SkFontHost_win.cpp b/gfx/skia/src/ports/SkFontHost_win.cpp
michael@0: index dd9c5dc..ca2c3dc 100644
michael@0: --- a/gfx/skia/src/ports/SkFontHost_win.cpp
michael@0: +++ b/gfx/skia/src/ports/SkFontHost_win.cpp
michael@0: @@ -22,7 +22,7 @@
michael@0:  #ifdef WIN32
michael@0:  #include "windows.h"
michael@0:  #include "tchar.h"
michael@0: -#include "Usp10.h"
michael@0: +#include "usp10.h"
michael@0:  
michael@0:  // always packed xxRRGGBB
michael@0:  typedef uint32_t SkGdiRGB;
michael@0: @@ -1033,6 +1033,10 @@ SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics(
michael@0:      HFONT savefont = (HFONT)SelectObject(hdc, font);
michael@0:      HFONT designFont = NULL;
michael@0:  
michael@0: +    const char stem_chars[] = {'i', 'I', '!', '1'};
michael@0: +    int16_t min_width;
michael@0: +    unsigned glyphCount;
michael@0: +
michael@0:      // To request design units, create a logical font whose height is specified
michael@0:      // as unitsPerEm.
michael@0:      OUTLINETEXTMETRIC otm;
michael@0: @@ -1046,7 +1050,7 @@ SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics(
michael@0:      if (!GetOutlineTextMetrics(hdc, sizeof(otm), &otm)) {
michael@0:          goto Error;
michael@0:      }
michael@0: -    const unsigned glyphCount = calculateGlyphCount(hdc);
michael@0: +    glyphCount = calculateGlyphCount(hdc);
michael@0:  
michael@0:      info = new SkAdvancedTypefaceMetrics;
michael@0:      info->fEmSize = otm.otmEMSquare;
michael@0: @@ -1115,9 +1119,8 @@ SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics(
michael@0:  
michael@0:      // Figure out a good guess for StemV - Min width of i, I, !, 1.
michael@0:      // This probably isn't very good with an italic font.
michael@0: -    int16_t min_width = SHRT_MAX;
michael@0: +    min_width = SHRT_MAX;
michael@0:      info->fStemV = 0;
michael@0: -    char stem_chars[] = {'i', 'I', '!', '1'};
michael@0:      for (size_t i = 0; i < SK_ARRAY_COUNT(stem_chars); i++) {
michael@0:          ABC abcWidths;
michael@0:          if (GetCharABCWidths(hdc, stem_chars[i], stem_chars[i], &abcWidths)) {