diff options
| author |  Hal Canary <halcanary@google.com> | 2018-06-13 09:42:32 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-13 13:45:47 +0000 |
| commit | fdcfb8b7c23fbf18f872d2c31d27978235033876 (patch) | |
| tree | 3e3ad1c6ffe8647f45b08a560ab99384437dc2ba /src/ports | |
| parent | bb9ee9b4aa7d80e8a85832a462a3123060d4bd64 (diff) | |
Revert "SkTypes: extract SkTo"
This reverts commit 2a2f67592602b18527bc3fd449132d420cd5b62e.
Reason for revert: this appears to be what is holding up the Chrome roll.
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>
TBR=mtklein@google.com,halcanary@google.com
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Iafd738aedfb679a23c061a51afe4b98a8d4cdfae
Reviewed-on: https://skia-review.googlesource.com/134504
Reviewed-by: Hal Canary <halcanary@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, 6 insertions, 12 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index e75ef2d6a4..3e8e9576dd 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,8 +26,6 @@ #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 5627304956..2a7a4baaac 100644 --- a/src/ports/SkFontHost_FreeType_common.cpp +++ b/src/ports/SkFontHost_FreeType_common.cpp @@ -13,7 +13,6 @@ #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 4c06e960a6..3cc51d43f6 100644 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -42,7 +42,6 @@ #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 85e92ce840..93e1cadbf3 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 "SkTo.h" -#include "SkTypefaceCache.h" #include "SkTypeface_win.h" +#include "SkTypefaceCache.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 fa6b9101ea..98d8ca812e 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,7 +29,6 @@ #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 a7bad0d24e..d67350af09 100644 --- a/src/ports/SkTypeface_win_dw.cpp +++ b/src/ports/SkTypeface_win_dw.cpp @@ -18,15 +18,14 @@ #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" |