From 2a2f67592602b18527bc3fd449132d420cd5b62e Mon Sep 17 00:00:00 2001 From: Hal Canary 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 --- modules/skjson/src/SkJSON.cpp | 1 + modules/skottie/src/Skottie.cpp | 11 ++++++----- modules/skottie/src/SkottieAdapter.cpp | 3 ++- modules/sksg/include/SkSGGroup.h | 2 +- modules/sksg/tests/SGTest.cpp | 6 ++++-- modules/skshaper/src/SkShaper_harfbuzz.cpp | 1 + modules/skshaper/src/SkShaper_primitive.cpp | 3 +++ 7 files changed, 18 insertions(+), 9 deletions(-) (limited to 'modules') diff --git a/modules/skjson/src/SkJSON.cpp b/modules/skjson/src/SkJSON.cpp index c9a4d7c51d..8af85ba695 100644 --- a/modules/skjson/src/SkJSON.cpp +++ b/modules/skjson/src/SkJSON.cpp @@ -9,6 +9,7 @@ #include "SkStream.h" #include "SkString.h" +#include "SkTo.h" #include #include diff --git a/modules/skottie/src/Skottie.cpp b/modules/skottie/src/Skottie.cpp index 93c71e936a..229b5c600a 100644 --- a/modules/skottie/src/Skottie.cpp +++ b/modules/skottie/src/Skottie.cpp @@ -8,10 +8,6 @@ #include "Skottie.h" #include "SkCanvas.h" -#include "SkottieAdapter.h" -#include "SkottieAnimator.h" -#include "SkottieJson.h" -#include "SkottieValue.h" #include "SkData.h" #include "SkImage.h" #include "SkMakeUnique.h" @@ -38,8 +34,13 @@ #include "SkSGTrimEffect.h" #include "SkStream.h" #include "SkTArray.h" -#include "SkTime.h" #include "SkTHash.h" +#include "SkTime.h" +#include "SkTo.h" +#include "SkottieAdapter.h" +#include "SkottieAnimator.h" +#include "SkottieJson.h" +#include "SkottieValue.h" #include #include diff --git a/modules/skottie/src/SkottieAdapter.cpp b/modules/skottie/src/SkottieAdapter.cpp index a01599ccf6..2caf570eff 100644 --- a/modules/skottie/src/SkottieAdapter.cpp +++ b/modules/skottie/src/SkottieAdapter.cpp @@ -8,7 +8,6 @@ #include "SkottieAdapter.h" #include "SkMatrix.h" -#include "SkottieValue.h" #include "SkPath.h" #include "SkRRect.h" #include "SkSGGradient.h" @@ -16,6 +15,8 @@ #include "SkSGRect.h" #include "SkSGTransform.h" #include "SkSGTrimEffect.h" +#include "SkTo.h" +#include "SkottieValue.h" #include diff --git a/modules/sksg/include/SkSGGroup.h b/modules/sksg/include/SkSGGroup.h index 482f10db8c..b32f9af24f 100644 --- a/modules/sksg/include/SkSGGroup.h +++ b/modules/sksg/include/SkSGGroup.h @@ -9,8 +9,8 @@ #define SkSGGroup_DEFINED #include "SkSGRenderNode.h" - #include "SkTArray.h" +#include "SkTo.h" namespace sksg { diff --git a/modules/sksg/tests/SGTest.cpp b/modules/sksg/tests/SGTest.cpp index 1228e666e7..e098171db8 100644 --- a/modules/sksg/tests/SGTest.cpp +++ b/modules/sksg/tests/SGTest.cpp @@ -5,17 +5,19 @@ * found in the LICENSE file. */ -#include "SkRect.h" -#include "SkRectPriv.h" +#include "SkTypes.h" #if !defined(SK_BUILD_FOR_GOOGLE3) +#include "SkRect.h" +#include "SkRectPriv.h" #include "SkSGColor.h" #include "SkSGDraw.h" #include "SkSGGroup.h" #include "SkSGInvalidationController.h" #include "SkSGRect.h" #include "SkSGTransform.h" +#include "SkTo.h" #include "Test.h" diff --git a/modules/skshaper/src/SkShaper_harfbuzz.cpp b/modules/skshaper/src/SkShaper_harfbuzz.cpp index 40414d9a79..94c899d01e 100644 --- a/modules/skshaper/src/SkShaper_harfbuzz.cpp +++ b/modules/skshaper/src/SkShaper_harfbuzz.cpp @@ -23,6 +23,7 @@ #include "SkTLazy.h" #include "SkTemplates.h" #include "SkTextBlob.h" +#include "SkTo.h" #include "SkTypeface.h" #include "SkUtils.h" diff --git a/modules/skshaper/src/SkShaper_primitive.cpp b/modules/skshaper/src/SkShaper_primitive.cpp index 06a8bec41c..e6b42771c0 100644 --- a/modules/skshaper/src/SkShaper_primitive.cpp +++ b/modules/skshaper/src/SkShaper_primitive.cpp @@ -4,9 +4,12 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + #include "SkShaper.h" + #include "SkStream.h" #include "SkTextBlob.h" +#include "SkTo.h" #include "SkTypeface.h" struct SkShaper::Impl { -- cgit v1.2.3