From c640d0dc96924699fdbb1a3cbdc907aa07b1cb3c Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Wed, 13 Jun 2018 09:59:02 -0400 Subject: 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 Change-Id: Ida74fbc5c21248a724a5edbf9fae18a33bcb23aa Reviewed-on: https://skia-review.googlesource.com/134506 Reviewed-by: Mike Klein Commit-Queue: Hal Canary --- src/gpu/text/GrTextContext.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/gpu/text/GrTextContext.cpp') 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 -- cgit v1.2.3