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/SkFontHost_win.cpp | |
| 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/SkFontHost_win.cpp')
| -rw-r--r-- | src/ports/SkFontHost_win.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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> |