From fdcfb8b7c23fbf18f872d2c31d27978235033876 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Wed, 13 Jun 2018 09:42:32 -0400 Subject: 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 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 Commit-Queue: Hal Canary --- tools/fonts/SkTestTypeface.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tools/fonts') diff --git a/tools/fonts/SkTestTypeface.cpp b/tools/fonts/SkTestTypeface.cpp index 79108ce150..bf3a1a3e9e 100644 --- a/tools/fonts/SkTestTypeface.cpp +++ b/tools/fonts/SkTestTypeface.cpp @@ -19,9 +19,8 @@ #include "SkRect.h" #include "SkScalerContext.h" #include "SkString.h" -#include "SkTDArray.h" #include "SkTestTypeface.h" -#include "SkTo.h" +#include "SkTDArray.h" #include "SkUtils.h" #include -- cgit v1.2.3