diff options
author | Hal Canary <halcanary@google.com> | 2018-06-13 09:59:02 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-14 14:55:17 +0000 |
commit | c640d0dc96924699fdbb1a3cbdc907aa07b1cb3c (patch) | |
tree | d8973c4700da0bbe95c73bb3bc0c7d8f4589186d /src/ports | |
parent | 4d4665436e540bd2ca393c139cbaff1eabd62ee2 (diff) |
Revert "Revert "SkTypes: extract SkTo""
This reverts commit fdcfb8b7c23fbf18f872d2c31d27978235033876.
> Original change's description:
> > SkTypes: extract SkTo
> >
> > Change-Id: I8de790d5013db2105ad885fa2683303d7c250b09
> > Reviewed-on: https://skia-review.googlesource.com/133620
> > Reviewed-by: Mike Klein <mtklein@google.com>
Change-Id: Ida74fbc5c21248a724a5edbf9fae18a33bcb23aa
Reviewed-on: https://skia-review.googlesource.com/134506
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/ports')
-rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 4 | ||||
-rw-r--r-- | src/ports/SkFontHost_FreeType_common.cpp | 1 | ||||
-rw-r--r-- | src/ports/SkFontHost_mac.cpp | 1 | ||||
-rw-r--r-- | src/ports/SkFontHost_win.cpp | 6 | ||||
-rw-r--r-- | src/ports/SkScalerContext_win_dw.cpp | 3 | ||||
-rw-r--r-- | src/ports/SkTypeface_win_dw.cpp | 3 |
6 files changed, 12 insertions, 6 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index d1a47f8197..c3cedf11b0 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 <memory> #include <ft2build.h> 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 <ft2build.h> #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 a202a72df6..a9c0afcf28 100644 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -20,21 +20,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 <tchar.h> #include <usp10.h> #include <objbase.h> 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 <dwrite.h> diff --git a/src/ports/SkTypeface_win_dw.cpp b/src/ports/SkTypeface_win_dw.cpp index d67350af09..a7bad0d24e 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" |