From 2a2f67592602b18527bc3fd449132d420cd5b62e Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Mon, 11 Jun 2018 21:44:01 -0400 Subject: SkTypes: extract SkTo Change-Id: I8de790d5013db2105ad885fa2683303d7c250b09 Reviewed-on: https://skia-review.googlesource.com/133620 Reviewed-by: Mike Klein --- src/ports/SkFontHost_FreeType.cpp | 4 +++- src/ports/SkFontHost_FreeType_common.cpp | 1 + src/ports/SkFontHost_mac.cpp | 1 + src/ports/SkFontHost_win.cpp | 6 +++--- src/ports/SkScalerContext_win_dw.cpp | 3 ++- src/ports/SkTypeface_win_dw.cpp | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) (limited to 'src/ports') diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index 3e8e9576dd..e75ef2d6a4 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -15,10 +15,10 @@ #include "SkFontHost_FreeType_common.h" #include "SkGlyph.h" #include "SkMakeUnique.h" +#include "SkMalloc.h" #include "SkMask.h" #include "SkMaskGamma.h" #include "SkMatrix22.h" -#include "SkMalloc.h" #include "SkMutex.h" #include "SkOTUtils.h" #include "SkPath.h" @@ -26,6 +26,8 @@ #include "SkStream.h" #include "SkString.h" #include "SkTemplates.h" +#include "SkTo.h" + #include #include diff --git a/src/ports/SkFontHost_FreeType_common.cpp b/src/ports/SkFontHost_FreeType_common.cpp index 2a7a4baaac..5627304956 100644 --- a/src/ports/SkFontHost_FreeType_common.cpp +++ b/src/ports/SkFontHost_FreeType_common.cpp @@ -13,6 +13,7 @@ #include "SkFDot6.h" #include "SkFontHost_FreeType_common.h" #include "SkPath.h" +#include "SkTo.h" #include #include FT_FREETYPE_H diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index 3cc51d43f6..4c06e960a6 100644 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -42,6 +42,7 @@ #include "SkStream.h" #include "SkString.h" #include "SkTemplates.h" +#include "SkTo.h" #include "SkTypefaceCache.h" #include "SkTypeface_mac.h" #include "SkUtils.h" diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index f1da8053f2..d98e68fc9f 100644 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -19,21 +19,21 @@ #include "SkMakeUnique.h" #include "SkMaskGamma.h" #include "SkMatrix22.h" -#include "SkOnce.h" #include "SkOTTable_OS_2.h" #include "SkOTTable_maxp.h" #include "SkOTTable_name.h" #include "SkOTUtils.h" +#include "SkOnce.h" #include "SkPath.h" #include "SkSFNTHeader.h" #include "SkStream.h" #include "SkString.h" #include "SkTemplates.h" -#include "SkTypeface_win.h" +#include "SkTo.h" #include "SkTypefaceCache.h" +#include "SkTypeface_win.h" #include "SkUtils.h" -#include "SkTypes.h" #include #include #include diff --git a/src/ports/SkScalerContext_win_dw.cpp b/src/ports/SkScalerContext_win_dw.cpp index 98d8ca812e..fa6b9101ea 100644 --- a/src/ports/SkScalerContext_win_dw.cpp +++ b/src/ports/SkScalerContext_win_dw.cpp @@ -10,9 +10,9 @@ #undef GetGlyphIndices -#include "SkDraw.h" #include "SkDWrite.h" #include "SkDWriteGeometrySink.h" +#include "SkDraw.h" #include "SkEndian.h" #include "SkGlyph.h" #include "SkHRESULT.h" @@ -29,6 +29,7 @@ #include "SkScalerContext_win_dw.h" #include "SkSharedMutex.h" #include "SkTScopedComPtr.h" +#include "SkTo.h" #include "SkTypeface_win_dw.h" #include diff --git a/src/ports/SkTypeface_win_dw.cpp b/src/ports/SkTypeface_win_dw.cpp index 281355e6a0..aa88c4c911 100644 --- a/src/ports/SkTypeface_win_dw.cpp +++ b/src/ports/SkTypeface_win_dw.cpp @@ -18,14 +18,15 @@ #include "SkDWriteFontFileStream.h" #include "SkFontDescriptor.h" #include "SkFontStream.h" +#include "SkOTTable_OS_2.h" #include "SkOTTable_fvar.h" #include "SkOTTable_head.h" #include "SkOTTable_hhea.h" -#include "SkOTTable_OS_2.h" #include "SkOTTable_post.h" #include "SkOTUtils.h" #include "SkScalerContext.h" #include "SkScalerContext_win_dw.h" +#include "SkTo.h" #include "SkTypeface_win_dw.h" #include "SkUtils.h" -- cgit v1.2.3