From 2a2f67592602b18527bc3fd449132d420cd5b62e Mon Sep 17 00:00:00 2001
From: Hal Canary <halcanary@google.com>
Date: Mon, 11 Jun 2018 21:44:01 -0400
Subject: SkTypes: extract SkTo

Change-Id: I8de790d5013db2105ad885fa2683303d7c250b09
Reviewed-on: https://skia-review.googlesource.com/133620
Reviewed-by: Mike Klein <mtklein@google.com>
---
 tools/fonts/SkTestTypeface.cpp                | 3 ++-
 tools/gpu/GrTest.cpp                          | 5 +++--
 tools/gpu/gl/debug/DebugGLTestContext.cpp     | 5 ++---
 tools/sk_app/android/surface_glue_android.cpp | 1 +
 tools/skpinfo.cpp                             | 5 +++--
 tools/skqp/jni/org_skia_skqp_SkQPRunner.cpp   | 1 +
 tools/viewer/Viewer.cpp                       | 8 +++++---
 7 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'tools')

diff --git a/tools/fonts/SkTestTypeface.cpp b/tools/fonts/SkTestTypeface.cpp
index bf3a1a3e9e..79108ce150 100644
--- a/tools/fonts/SkTestTypeface.cpp
+++ b/tools/fonts/SkTestTypeface.cpp
@@ -19,8 +19,9 @@
 #include "SkRect.h"
 #include "SkScalerContext.h"
 #include "SkString.h"
-#include "SkTestTypeface.h"
 #include "SkTDArray.h"
+#include "SkTestTypeface.h"
+#include "SkTo.h"
 #include "SkUtils.h"
 
 #include <utility>
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp
index 14ba7a0035..00abd957e0 100644
--- a/tools/gpu/GrTest.cpp
+++ b/tools/gpu/GrTest.cpp
@@ -5,8 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "GrTest.h"
-#include <algorithm>
 #include "GrBackendSurface.h"
 #include "GrContextOptions.h"
 #include "GrContextPriv.h"
@@ -20,14 +18,17 @@
 #include "GrResourceCache.h"
 #include "GrSemaphore.h"
 #include "GrSurfaceContextPriv.h"
+#include "GrTest.h"
 #include "GrTexture.h"
 #include "SkGr.h"
 #include "SkImage_Gpu.h"
 #include "SkMathPriv.h"
 #include "SkString.h"
+#include "SkTo.h"
 #include "ops/GrMeshDrawOp.h"
 #include "text/GrGlyphCache.h"
 #include "text/GrTextBlobCache.h"
+#include <algorithm>
 
 namespace GrTest {
 
diff --git a/tools/gpu/gl/debug/DebugGLTestContext.cpp b/tools/gpu/gl/debug/DebugGLTestContext.cpp
index 2b05693366..59f3c93fa2 100644
--- a/tools/gpu/gl/debug/DebugGLTestContext.cpp
+++ b/tools/gpu/gl/debug/DebugGLTestContext.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2012 Google Inc.
  *
@@ -16,9 +15,9 @@
 #include "GrTextureObj.h"
 #include "GrTextureUnitObj.h"
 #include "GrVertexArrayObj.h"
-#include "gl/GrGLTestInterface.h"
-
 #include "SkMutex.h"
+#include "SkTo.h"
+#include "gl/GrGLTestInterface.h"
 
 namespace {
 
diff --git a/tools/sk_app/android/surface_glue_android.cpp b/tools/sk_app/android/surface_glue_android.cpp
index 9766d3a56d..04f8eeaa4c 100644
--- a/tools/sk_app/android/surface_glue_android.cpp
+++ b/tools/sk_app/android/surface_glue_android.cpp
@@ -22,6 +22,7 @@
 
 #include "../Application.h"
 #include "ResourceFactory.h"
+#include "SkTo.h"
 #include "SkTypes.h"
 #include "SkUtils.h"
 #include "Window_android.h"
diff --git a/tools/skpinfo.cpp b/tools/skpinfo.cpp
index 93834bb3a8..53ea8f326d 100644
--- a/tools/skpinfo.cpp
+++ b/tools/skpinfo.cpp
@@ -6,11 +6,12 @@
  */
 
 #include "SkCommandLineFlags.h"
+#include "SkFontDescriptor.h"
 #include "SkPicture.h"
-#include "SkPictureData.h"
 #include "SkPictureCommon.h"
+#include "SkPictureData.h"
 #include "SkStream.h"
-#include "SkFontDescriptor.h"
+#include "SkTo.h"
 
 DEFINE_string2(input, i, "", "skp on which to report");
 DEFINE_bool2(version, v, true, "version");
diff --git a/tools/skqp/jni/org_skia_skqp_SkQPRunner.cpp b/tools/skqp/jni/org_skia_skqp_SkQPRunner.cpp
index b59af6a8d4..4eb01d4fac 100644
--- a/tools/skqp/jni/org_skia_skqp_SkQPRunner.cpp
+++ b/tools/skqp/jni/org_skia_skqp_SkQPRunner.cpp
@@ -16,6 +16,7 @@
 #include "ResourceFactory.h"
 #include "SkOSPath.h"
 #include "SkStream.h"
+#include "SkTo.h"
 #include "gm_knowledge.h"
 #include "gm_runner.h"
 #include "skqp_asset_manager.h"
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index 65280bc4af..5a5489e67d 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -5,9 +5,6 @@
 * found in the LICENSE file.
 */
 
-#include "Viewer.h"
-#include <stdlib.h>
-#include <map>
 #include "BisectSlide.h"
 #include "GMSlide.h"
 #include "GrContext.h"
@@ -37,10 +34,15 @@
 #include "SkTaskGroup.h"
 #include "SkTestFontMgr.h"
 #include "SkThreadedBMPDevice.h"
+#include "SkTo.h"
 #include "SvgSlide.h"
+#include "Viewer.h"
 #include "ccpr/GrCoverageCountingPathRenderer.h"
 #include "imgui.h"
 
+#include <stdlib.h>
+#include <map>
+
 #if defined(SK_HAS_SKSG)
     #include "SlideDir.h"
 #endif
-- 
cgit v1.2.3