diff --git a/gn/core.gni b/gn/core.gni index a24a9fc54fe4..69202ea4b77d 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -250,11 +250,11 @@ skia_core_sources = [ "$_src/core/SkATrace.h", "$_src/core/SkAdvancedTypefaceMetrics.h", "$_src/core/SkAlphaRuns.cpp", + "$_src/core/SkAlphaRuns.h", "$_src/core/SkAnalyticEdge.cpp", "$_src/core/SkAnalyticEdge.h", "$_src/core/SkAnnotation.cpp", "$_src/core/SkAnnotationKeys.h", - "$_src/core/SkAntiRun.h", "$_src/core/SkAutoBlitterChoose.h", "$_src/core/SkAutoPixmapStorage.cpp", "$_src/core/SkAutoPixmapStorage.h", diff --git a/public.bzl b/public.bzl index 5b4e056a7d6d..db6c85ffac99 100644 --- a/public.bzl +++ b/public.bzl @@ -345,7 +345,7 @@ BASE_SRCS_ALL = [ "src/core/SkAnalyticEdge.h", "src/core/SkAnnotation.cpp", "src/core/SkAnnotationKeys.h", - "src/core/SkAntiRun.h", + "src/core/SkAlphaRuns.h", "src/core/SkAutoBlitterChoose.h", "src/core/SkAutoPixmapStorage.cpp", "src/core/SkAutoPixmapStorage.h", diff --git a/src/BUILD.bazel b/src/BUILD.bazel index 47df3ef68ae8..1f7eeed391d1 100644 --- a/src/BUILD.bazel +++ b/src/BUILD.bazel @@ -148,6 +148,7 @@ generate_cpp_files_for_headers( # compile it. This allows us to run IWYU on these files. to_generate = [ "src/codec/SkPixmapUtilsPriv.h", + "src/core/SkAdvancedTypefaceMetrics.h", "src/core/SkColorSpacePriv.h", "src/core/SkDrawProcs.h", "src/core/SkMatrixPriv.h", diff --git a/src/core/BUILD.bazel b/src/core/BUILD.bazel index c9a60f2eaf55..c3ffb338ab53 100644 --- a/src/core/BUILD.bazel +++ b/src/core/BUILD.bazel @@ -33,11 +33,11 @@ CORE_FILES = [ "SkATrace.h", "SkAdvancedTypefaceMetrics.h", "SkAlphaRuns.cpp", + "SkAlphaRuns.h", "SkAnalyticEdge.cpp", "SkAnalyticEdge.h", "SkAnnotation.cpp", "SkAnnotationKeys.h", - "SkAntiRun.h", "SkAutoBlitterChoose.h", "SkAutoPixmapStorage.cpp", "SkAutoPixmapStorage.h", diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp index cadfc2be3330..12a38f3a69d1 100644 --- a/src/core/SkAAClip.cpp +++ b/src/core/SkAAClip.cpp @@ -7,16 +7,25 @@ #include "src/core/SkAAClip.h" +#include "include/core/SkClipOp.h" #include "include/core/SkPath.h" +#include "include/core/SkRegion.h" +#include "include/core/SkTypes.h" #include "include/private/SkColorData.h" +#include "include/private/base/SkCPUTypes.h" +#include "include/private/base/SkDebug.h" #include "include/private/base/SkMacros.h" +#include "include/private/base/SkMalloc.h" +#include "include/private/base/SkMath.h" #include "include/private/base/SkTDArray.h" #include "include/private/base/SkTo.h" #include "src/core/SkBlitter.h" -#include "src/core/SkRectPriv.h" +#include "src/core/SkMask.h" #include "src/core/SkScan.h" + +#include #include -#include +#include namespace { diff --git a/src/core/SkAAClip.h b/src/core/SkAAClip.h index 4b935968642a..5469a09e0ac4 100644 --- a/src/core/SkAAClip.h +++ b/src/core/SkAAClip.h @@ -8,13 +8,17 @@ #ifndef SkAAClip_DEFINED #define SkAAClip_DEFINED -#include "include/core/SkClipOp.h" +#include "include/core/SkColor.h" #include "include/core/SkRect.h" +#include "include/private/base/SkAssert.h" #include "src/base/SkAutoMalloc.h" #include "src/core/SkBlitter.h" +#include class SkPath; class SkRegion; +enum class SkClipOp; +struct SkMask; class SkAAClip { public: diff --git a/src/core/SkATrace.cpp b/src/core/SkATrace.cpp index f5c56be7b4cb..f7e5e8e8f7a4 100644 --- a/src/core/SkATrace.cpp +++ b/src/core/SkATrace.cpp @@ -7,8 +7,7 @@ #include "src/core/SkATrace.h" -#include "src/core/SkTraceEvent.h" -#include "src/core/SkTraceEventCommon.h" +#include "include/utils/SkTraceEventPhase.h" #ifdef SK_BUILD_FOR_ANDROID #include diff --git a/src/core/SkATrace.h b/src/core/SkATrace.h index e0e642aa1017..0d27be0ac67e 100644 --- a/src/core/SkATrace.h +++ b/src/core/SkATrace.h @@ -10,6 +10,8 @@ #include "include/utils/SkEventTracer.h" +#include + /** * This class is used to support ATrace in android apps. It hooks into the SkEventTracer system. It * currently supports the macros TRACE_EVENT*, TRACE_EVENT_INSTANT*, and TRACE_EVENT_BEGIN/END*. diff --git a/src/core/SkAdvancedTypefaceMetrics.h b/src/core/SkAdvancedTypefaceMetrics.h index 4c05ce218444..80491e38ff13 100644 --- a/src/core/SkAdvancedTypefaceMetrics.h +++ b/src/core/SkAdvancedTypefaceMetrics.h @@ -10,7 +10,10 @@ #include "include/core/SkRect.h" #include "include/core/SkString.h" -#include "include/private/SkBitmaskEnum.h" +#include "include/private/SkBitmaskEnum.h" // IWYU pragma: keep + +#include +#include /** \class SkAdvancedTypefaceMetrics diff --git a/src/core/SkAlphaRuns.cpp b/src/core/SkAlphaRuns.cpp index 378f93b60e38..aab02754bdd4 100644 --- a/src/core/SkAlphaRuns.cpp +++ b/src/core/SkAlphaRuns.cpp @@ -4,9 +4,8 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ +#include "src/core/SkAlphaRuns.h" -#include "include/private/base/SkTo.h" -#include "src/core/SkAntiRun.h" #include "src/core/SkOpts.h" void SkAlphaRuns::reset(int width) { diff --git a/src/core/SkAntiRun.h b/src/core/SkAlphaRuns.h similarity index 96% rename from src/core/SkAntiRun.h rename to src/core/SkAlphaRuns.h index 5a9800b79663..222b57adcef7 100644 --- a/src/core/SkAntiRun.h +++ b/src/core/SkAlphaRuns.h @@ -5,11 +5,16 @@ * found in the LICENSE file. */ -#ifndef SkAntiRun_DEFINED -#define SkAntiRun_DEFINED +#ifndef SkAlphaRuns_DEFINED +#define SkAlphaRuns_DEFINED +#include "include/core/SkColor.h" +#include "include/core/SkTypes.h" +#include "include/private/base/SkCPUTypes.h" +#include "include/private/base/SkDebug.h" #include "include/private/base/SkTo.h" -#include "src/core/SkBlitter.h" + +#include /** Sparse array of run-length-encoded alpha (supersampling coverage) values. Sparseness allows us to independently compose several paths into the diff --git a/src/core/SkAnalyticEdge.cpp b/src/core/SkAnalyticEdge.cpp index 16b31bf3565d..64ef8bf78f19 100644 --- a/src/core/SkAnalyticEdge.cpp +++ b/src/core/SkAnalyticEdge.cpp @@ -5,11 +5,16 @@ * found in the LICENSE file. */ -#include "include/private/base/SkTo.h" -#include "src/base/SkMathPriv.h" #include "src/core/SkAnalyticEdge.h" + +#include "include/core/SkPoint.h" +#include "include/private/base/SkMath.h" +#include "include/private/base/SkTo.h" #include "src/core/SkFDot6.h" -#include + +#include +#include +#include static const int kInverseTableSize = 1024; // SK_FDot6One * 16 diff --git a/src/core/SkAnalyticEdge.h b/src/core/SkAnalyticEdge.h index eb2fa567550c..8f07f0624d7b 100644 --- a/src/core/SkAnalyticEdge.h +++ b/src/core/SkAnalyticEdge.h @@ -8,10 +8,15 @@ #ifndef SkAnalyticEdge_DEFINED #define SkAnalyticEdge_DEFINED -#include "include/private/base/SkTo.h" +#include "include/private/base/SkAssert.h" +#include "include/private/base/SkDebug.h" +#include "include/private/base/SkFixed.h" +#include "include/private/base/SkSafe32.h" #include "src/core/SkEdge.h" -#include +#include + +struct SkPoint; struct SkAnalyticEdge { // Similar to SkEdge, the conic edges will be converted to quadratic edges diff --git a/src/core/SkAutoPixmapStorage.cpp b/src/core/SkAutoPixmapStorage.cpp index 9b7a886d8b4c..858bb8e09572 100644 --- a/src/core/SkAutoPixmapStorage.cpp +++ b/src/core/SkAutoPixmapStorage.cpp @@ -4,9 +4,13 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ +#include "src/core/SkAutoPixmapStorage.h" #include "include/core/SkData.h" -#include "src/core/SkAutoPixmapStorage.h" +#include "include/core/SkImageInfo.h" +#include "include/private/base/SkAssert.h" + +#include SkAutoPixmapStorage::SkAutoPixmapStorage() : fStorage(nullptr) {} diff --git a/src/core/SkAutoPixmapStorage.h b/src/core/SkAutoPixmapStorage.h index 5d651f141c58..345d657a4f9d 100644 --- a/src/core/SkAutoPixmapStorage.h +++ b/src/core/SkAutoPixmapStorage.h @@ -9,9 +9,15 @@ #define SkAutoPixmapStorage_DEFINED #include "include/core/SkPixmap.h" +#include "include/core/SkRefCnt.h" +#include "include/private/base/SkAttributes.h" #include "include/private/base/SkMalloc.h" +#include + class SkData; +struct SkImageInfo; +struct SkMask; class SkAutoPixmapStorage : public SkPixmap { public: diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp index 2857d9a38502..fd03b4417b2b 100644 --- a/src/core/SkBitmapProcState.cpp +++ b/src/core/SkBitmapProcState.cpp @@ -5,17 +5,24 @@ * found in the LICENSE file. */ -#include "include/core/SkPaint.h" -#include "include/core/SkShader.h" -#include "include/private/SkColorData.h" +#include "src/core/SkBitmapProcState.h" + +#include "include/core/SkAlphaType.h" +#include "include/core/SkColorPriv.h" +#include "include/core/SkColorType.h" +#include "include/core/SkImageInfo.h" +#include "include/core/SkTileMode.h" #include "include/private/base/SkMacros.h" #include "include/private/base/SkTPin.h" -#include "src/core/SkBitmapCache.h" -#include "src/core/SkBitmapProcState.h" -#include "src/core/SkMipmap.h" #include "src/core/SkMipmapAccessor.h" #include "src/core/SkOpts.h" -#include "src/core/SkResourceCache.h" + +#include +#include +#include + +class SkImage; +class SkImage_Base; // One-stop-shop shader for, // - nearest-neighbor sampling (_nofilter_), diff --git a/src/core/SkBitmapProcState.h b/src/core/SkBitmapProcState.h index c6ab4c4bc696..fcfff5b110aa 100644 --- a/src/core/SkBitmapProcState.h +++ b/src/core/SkBitmapProcState.h @@ -8,15 +8,23 @@ #ifndef SkBitmapProcState_DEFINED #define SkBitmapProcState_DEFINED -#include "include/core/SkBitmap.h" -#include "include/core/SkPaint.h" -#include "include/core/SkShader.h" +#include "include/core/SkColor.h" +#include "include/core/SkMatrix.h" +#include "include/core/SkPixmap.h" +#include "include/core/SkPoint.h" +#include "include/core/SkSamplingOptions.h" +#include "include/core/SkScalar.h" +#include "include/private/base/SkAssert.h" +#include "include/private/base/SkCPUTypes.h" #include "include/private/base/SkFixed.h" -#include "include/private/base/SkFloatBits.h" -#include "include/private/base/SkTemplates.h" #include "src/base/SkArenaAlloc.h" #include "src/core/SkMatrixPriv.h" -#include "src/core/SkMipmapAccessor.h" + +#include +#include + +class SkImage_Base; +enum class SkTileMode; typedef SkFixed3232 SkFractionalInt; #define SkScalarToFractionalInt(x) SkScalarToFixed3232(x) @@ -24,8 +32,6 @@ typedef SkFixed3232 SkFractionalInt; #define SkFixedToFractionalInt(x) SkFixedToFixed3232(x) #define SkFractionalIntToInt(x) SkFixed3232ToInt(x) -class SkPaint; - struct SkBitmapProcState { SkBitmapProcState(const SkImage_Base* image, SkTileMode tmx, SkTileMode tmy); diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp index 036072820c1b..1a35c5afe217 100644 --- a/src/core/SkBlitter.cpp +++ b/src/core/SkBlitter.cpp @@ -14,7 +14,7 @@ #include "include/private/base/SkTo.h" #include "src/base/SkArenaAlloc.h" #include "src/base/SkTLazy.h" -#include "src/core/SkAntiRun.h" +#include "src/core/SkAlphaRuns.h" #include "src/core/SkMask.h" #include "src/core/SkMaskFilterBase.h" #include "src/core/SkMatrixProvider.h" diff --git a/src/core/SkMipmapAccessor.cpp b/src/core/SkMipmapAccessor.cpp index c6f64a30f5f3..4d321db1f867 100644 --- a/src/core/SkMipmapAccessor.cpp +++ b/src/core/SkMipmapAccessor.cpp @@ -5,15 +5,21 @@ * found in the LICENSE file. */ +#include "src/core/SkMipmapAccessor.h" + #include "include/core/SkBitmap.h" #include "include/core/SkMatrix.h" -#include "include/private/base/SkTemplates.h" +#include "include/core/SkSamplingOptions.h" +#include "include/core/SkScalar.h" +#include "include/core/SkSize.h" +#include "include/private/base/SkFloatingPoint.h" #include "src/base/SkArenaAlloc.h" #include "src/core/SkBitmapCache.h" #include "src/core/SkMipmap.h" -#include "src/core/SkMipmapAccessor.h" #include "src/image/SkImage_Base.h" +class SkImage; + // Try to load from the base image, or from the cache static sk_sp try_load_mips(const SkImage_Base* image) { sk_sp mips = image->refMips(); diff --git a/src/core/SkMipmapAccessor.h b/src/core/SkMipmapAccessor.h index 36b742a27ae7..b8ba73df5127 100644 --- a/src/core/SkMipmapAccessor.h +++ b/src/core/SkMipmapAccessor.h @@ -9,12 +9,19 @@ #define SkMipmapAccessor_DEFINED #include "include/core/SkBitmap.h" -#include "include/core/SkImage.h" #include "include/core/SkMatrix.h" +#include "include/core/SkPixmap.h" +#include "include/core/SkRefCnt.h" +#include "include/private/base/SkAssert.h" +#include "include/private/base/SkNoncopyable.h" #include "src/core/SkMipmap.h" -#include +#include + +class SkArenaAlloc; +class SkImage; class SkImage_Base; +enum class SkMipmapMode; class SkMipmapAccessor : ::SkNoncopyable { public: diff --git a/src/core/SkScan_AAAPath.cpp b/src/core/SkScan_AAAPath.cpp index 0e7ff978a362..a9081151c6c4 100644 --- a/src/core/SkScan_AAAPath.cpp +++ b/src/core/SkScan_AAAPath.cpp @@ -11,8 +11,8 @@ #include "include/private/base/SkTo.h" #include "src/base/SkAutoMalloc.h" #include "src/base/SkTSort.h" +#include "src/core/SkAlphaRuns.h" #include "src/core/SkAnalyticEdge.h" -#include "src/core/SkAntiRun.h" #include "src/core/SkBlitter.h" #include "src/core/SkEdge.h" #include "src/core/SkEdgeBuilder.h" diff --git a/src/core/SkScan_SAAPath.cpp b/src/core/SkScan_SAAPath.cpp index ec9b1ecea0f9..77334904989a 100644 --- a/src/core/SkScan_SAAPath.cpp +++ b/src/core/SkScan_SAAPath.cpp @@ -11,7 +11,7 @@ #include "include/core/SkPath.h" #include "include/core/SkRegion.h" #include "include/private/base/SkTo.h" -#include "src/core/SkAntiRun.h" +#include "src/core/SkAlphaRuns.h" #include "src/core/SkBlitter.h" #if defined(SK_FORCE_AAA) diff --git a/toolchain/linux_trampolines/clang_trampoline_linux.sh b/toolchain/linux_trampolines/clang_trampoline_linux.sh index 013166688f73..54dbc1987dfd 100755 --- a/toolchain/linux_trampolines/clang_trampoline_linux.sh +++ b/toolchain/linux_trampolines/clang_trampoline_linux.sh @@ -35,8 +35,10 @@ supported_files_or_dirs=( "tests/" "tools/debugger/" "tools/viewer/" + "src/core/SkA" "src/core/SkBitmap.cpp" "src/core/SkBitmapCache.cpp" + "src/core/SkBitmapProcState.cpp" "src/core/SkCachedData.cpp" "src/core/SkCanvas.cpp" "src/core/SkCanvas_Raster.cpp" @@ -60,8 +62,9 @@ supported_files_or_dirs=( "src/core/SkLineClipper.cpp" "src/core/SkMD5.cpp" "src/core/SkMaskFilter.cpp" - "src/core/SkMipmapBuilder.cpp" "src/core/SkMatrix.cpp" + "src/core/SkMipmapAccessor.cpp" + "src/core/SkMipmapBuilder.cpp" "src/core/SkPaint.cpp" "src/core/SkPath.cpp" "src/core/SkPathBuilder.cpp"