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 /modules/skshaper | |
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 'modules/skshaper')
-rw-r--r-- | modules/skshaper/src/SkShaper_harfbuzz.cpp | 1 | ||||
-rw-r--r-- | modules/skshaper/src/SkShaper_primitive.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/modules/skshaper/src/SkShaper_harfbuzz.cpp b/modules/skshaper/src/SkShaper_harfbuzz.cpp index 40414d9a79..94c899d01e 100644 --- a/modules/skshaper/src/SkShaper_harfbuzz.cpp +++ b/modules/skshaper/src/SkShaper_harfbuzz.cpp @@ -23,6 +23,7 @@ #include "SkTLazy.h" #include "SkTemplates.h" #include "SkTextBlob.h" +#include "SkTo.h" #include "SkTypeface.h" #include "SkUtils.h" diff --git a/modules/skshaper/src/SkShaper_primitive.cpp b/modules/skshaper/src/SkShaper_primitive.cpp index 06a8bec41c..e6b42771c0 100644 --- a/modules/skshaper/src/SkShaper_primitive.cpp +++ b/modules/skshaper/src/SkShaper_primitive.cpp @@ -4,9 +4,12 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + #include "SkShaper.h" + #include "SkStream.h" #include "SkTextBlob.h" +#include "SkTo.h" #include "SkTypeface.h" struct SkShaper::Impl { |