diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/skjson/src/SkJSON.cpp | 1 | ||||
-rw-r--r-- | modules/skottie/src/Skottie.cpp | 11 | ||||
-rw-r--r-- | modules/skottie/src/SkottieAdapter.cpp | 3 | ||||
-rw-r--r-- | modules/sksg/include/SkSGGroup.h | 2 | ||||
-rw-r--r-- | modules/sksg/tests/SGTest.cpp | 6 | ||||
-rw-r--r-- | modules/skshaper/src/SkShaper_harfbuzz.cpp | 1 | ||||
-rw-r--r-- | modules/skshaper/src/SkShaper_primitive.cpp | 3 |
7 files changed, 9 insertions, 18 deletions
diff --git a/modules/skjson/src/SkJSON.cpp b/modules/skjson/src/SkJSON.cpp index 8af85ba695..c9a4d7c51d 100644 --- a/modules/skjson/src/SkJSON.cpp +++ b/modules/skjson/src/SkJSON.cpp @@ -9,7 +9,6 @@ #include "SkStream.h" #include "SkString.h" -#include "SkTo.h" #include <cmath> #include <vector> diff --git a/modules/skottie/src/Skottie.cpp b/modules/skottie/src/Skottie.cpp index 229b5c600a..93c71e936a 100644 --- a/modules/skottie/src/Skottie.cpp +++ b/modules/skottie/src/Skottie.cpp @@ -8,6 +8,10 @@ #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" @@ -34,13 +38,8 @@ #include "SkSGTrimEffect.h" #include "SkStream.h" #include "SkTArray.h" -#include "SkTHash.h" #include "SkTime.h" -#include "SkTo.h" -#include "SkottieAdapter.h" -#include "SkottieAnimator.h" -#include "SkottieJson.h" -#include "SkottieValue.h" +#include "SkTHash.h" #include <cmath> #include <vector> diff --git a/modules/skottie/src/SkottieAdapter.cpp b/modules/skottie/src/SkottieAdapter.cpp index 2caf570eff..a01599ccf6 100644 --- a/modules/skottie/src/SkottieAdapter.cpp +++ b/modules/skottie/src/SkottieAdapter.cpp @@ -8,6 +8,7 @@ #include "SkottieAdapter.h" #include "SkMatrix.h" +#include "SkottieValue.h" #include "SkPath.h" #include "SkRRect.h" #include "SkSGGradient.h" @@ -15,8 +16,6 @@ #include "SkSGRect.h" #include "SkSGTransform.h" #include "SkSGTrimEffect.h" -#include "SkTo.h" -#include "SkottieValue.h" #include <cmath> diff --git a/modules/sksg/include/SkSGGroup.h b/modules/sksg/include/SkSGGroup.h index b32f9af24f..482f10db8c 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 e098171db8..1228e666e7 100644 --- a/modules/sksg/tests/SGTest.cpp +++ b/modules/sksg/tests/SGTest.cpp @@ -5,19 +5,17 @@ * found in the LICENSE file. */ -#include "SkTypes.h" +#include "SkRect.h" +#include "SkRectPriv.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 94c899d01e..40414d9a79 100644 --- a/modules/skshaper/src/SkShaper_harfbuzz.cpp +++ b/modules/skshaper/src/SkShaper_harfbuzz.cpp @@ -23,7 +23,6 @@ #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 e6b42771c0..06a8bec41c 100644 --- a/modules/skshaper/src/SkShaper_primitive.cpp +++ b/modules/skshaper/src/SkShaper_primitive.cpp @@ -4,12 +4,9 @@ * 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 { |