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/gpu/text | |
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/gpu/text')
-rw-r--r-- | src/gpu/text/GrTextContext.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gpu/text/GrTextContext.cpp b/src/gpu/text/GrTextContext.cpp index b63b726079..2fc1f5bca4 100644 --- a/src/gpu/text/GrTextContext.cpp +++ b/src/gpu/text/GrTextContext.cpp @@ -4,9 +4,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ - #include "GrTextContext.h" - #include "GrCaps.h" #include "GrContext.h" #include "GrContextPriv.h" @@ -17,14 +15,14 @@ #include "SkDrawFilter.h" #include "SkDrawProcs.h" #include "SkFindAndPlaceGlyph.h" -#include "SkGlyphRun.h" #include "SkGr.h" #include "SkGraphics.h" +#include "SkGlyphRun.h" #include "SkMakeUnique.h" #include "SkMaskFilterBase.h" #include "SkPaintPriv.h" #include "SkTextMapStateProc.h" -#include "SkTo.h" + #include "ops/GrMeshDrawOp.h" // DF sizes and thresholds for usage of the small and medium sizes. For example, above |