aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/text/GrTextContext.cpp
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2018-06-13 09:59:02 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-14 14:55:17 +0000
commitc640d0dc96924699fdbb1a3cbdc907aa07b1cb3c (patch)
treed8973c4700da0bbe95c73bb3bc0c7d8f4589186d /src/gpu/text/GrTextContext.cpp
parent4d4665436e540bd2ca393c139cbaff1eabd62ee2 (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/gpu/text/GrTextContext.cpp')
-rw-r--r--src/gpu/text/GrTextContext.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/text/GrTextContext.cpp b/src/gpu/text/GrTextContext.cpp
index 2fc1f5bca4..b63b726079 100644
--- a/src/gpu/text/GrTextContext.cpp
+++ b/src/gpu/text/GrTextContext.cpp
@@ -4,7 +4,9 @@
* 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"
@@ -15,14 +17,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