diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index b8e4fcc812b2..68f635a122f4 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -14,6 +14,8 @@ Milestone 113 return true from rectStaysRect(), consistent with rectStaysRect() implying a non-zero scale. * `SkImage::CompressionType` has been renamed to `SkTextureCompressionType` and moved to `include/core/SkTextureCompressionType.h` + * `SkEncodedImageFormat.h` and `SkPngChunkReader.h` are now in include/codec + * `SkICC.h` is now in include/encode * * * diff --git a/bazel/exporter_tool/main.go b/bazel/exporter_tool/main.go index 6bf0f0c0bb7d..4b0767ec9dca 100644 --- a/bazel/exporter_tool/main.go +++ b/bazel/exporter_tool/main.go @@ -35,8 +35,8 @@ var gniExportDescs = []exporter.GNIExportDesc{ {GNI: "gn/core.gni", Vars: []exporter.GNIFileListExportDesc{ {Var: "skia_core_public", Rules: []string{ - "//include/core:public_hdrs", - "//include/core:legacy_draw_looper", + "//include/core:public_hdrs", + "//include/core:legacy_draw_looper", }}, {Var: "skia_core_sources", Rules: []string{ @@ -80,10 +80,11 @@ var gniExportDescs = []exporter.GNIExportDesc{ "//src/core:skpicture_srcs", "//src/shaders:skpicture_srcs", }}, - {Var: "src_images_srcs", - Rules: []string{"//src/encode:srcs"}}, {Var: "skia_encode_srcs", - Rules: []string{"//src/encode:srcs"}}, + Rules: []string{ + "//src/encode:srcs", + "//src/encode:private_hdrs", + }}, {Var: "skia_encode_jpeg_srcs", Rules: []string{"//src/encode:jpeg_encode_srcs", "//src/encode:jpeg_encode_hdrs"}}, {Var: "skia_encode_png_srcs", diff --git a/client_utils/android/BitmapRegionDecoder.cpp b/client_utils/android/BitmapRegionDecoder.cpp index c5262b886aff..ee244a17c913 100644 --- a/client_utils/android/BitmapRegionDecoder.cpp +++ b/client_utils/android/BitmapRegionDecoder.cpp @@ -8,7 +8,7 @@ #include "client_utils/android/BitmapRegionDecoder.h" #include "client_utils/android/BitmapRegionDecoderPriv.h" #include "include/codec/SkAndroidCodec.h" -#include "include/core/SkEncodedImageFormat.h" +#include "include/codec/SkEncodedImageFormat.h" #include "src/codec/SkCodecPriv.h" namespace android { diff --git a/experimental/sktext/tests/FontResolvedText.cpp b/experimental/sktext/tests/FontResolvedText.cpp index 7f647643df49..dcd968d5bab8 100644 --- a/experimental/sktext/tests/FontResolvedText.cpp +++ b/experimental/sktext/tests/FontResolvedText.cpp @@ -1,8 +1,8 @@ // Copyright 2021 Google LLC. +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkCanvas.h" #include "include/core/SkColor.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkFontMgr.h" #include "include/core/SkFontStyle.h" #include "include/core/SkImageEncoder.h" diff --git a/experimental/sktext/tests/SelectableText.cpp b/experimental/sktext/tests/SelectableText.cpp index 4c9e2a2099ad..0cd390ef10c6 100644 --- a/experimental/sktext/tests/SelectableText.cpp +++ b/experimental/sktext/tests/SelectableText.cpp @@ -1,8 +1,8 @@ // Copyright 2021 Google LLC. +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkCanvas.h" #include "include/core/SkColor.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkFontMgr.h" #include "include/core/SkFontStyle.h" #include "include/core/SkImageEncoder.h" diff --git a/experimental/sktext/tests/ShapedText.cpp b/experimental/sktext/tests/ShapedText.cpp index abc84f6b95ce..5cee13a450e3 100644 --- a/experimental/sktext/tests/ShapedText.cpp +++ b/experimental/sktext/tests/ShapedText.cpp @@ -1,8 +1,8 @@ // Copyright 2021 Google LLC. +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkCanvas.h" #include "include/core/SkColor.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkFontMgr.h" #include "include/core/SkFontStyle.h" #include "include/core/SkImageEncoder.h" diff --git a/experimental/sktext/tests/UnicodeText.cpp b/experimental/sktext/tests/UnicodeText.cpp index 95109b18745f..2817482e9d19 100644 --- a/experimental/sktext/tests/UnicodeText.cpp +++ b/experimental/sktext/tests/UnicodeText.cpp @@ -1,8 +1,8 @@ // Copyright 2021 Google LLC. +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkCanvas.h" #include "include/core/SkColor.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkFontMgr.h" #include "include/core/SkFontStyle.h" #include "include/core/SkImageEncoder.h" diff --git a/experimental/sktext/tests/WrappedText.cpp b/experimental/sktext/tests/WrappedText.cpp index 9d62e977ac3c..67cbee10271d 100644 --- a/experimental/sktext/tests/WrappedText.cpp +++ b/experimental/sktext/tests/WrappedText.cpp @@ -1,8 +1,8 @@ // Copyright 2021 Google LLC. +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkCanvas.h" #include "include/core/SkColor.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkFontMgr.h" #include "include/core/SkFontStyle.h" #include "include/core/SkImageEncoder.h" diff --git a/fuzz/FuzzSkParagraph.cpp b/fuzz/FuzzSkParagraph.cpp index b5271ebb38ce..af5e92b8659a 100644 --- a/fuzz/FuzzSkParagraph.cpp +++ b/fuzz/FuzzSkParagraph.cpp @@ -7,10 +7,10 @@ #include "fuzz/Fuzz.h" #include "fuzz/FuzzCommon.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkCanvas.h" #include "include/core/SkColor.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkFontMgr.h" #include "include/core/SkFontStyle.h" #include "include/core/SkImageEncoder.h" diff --git a/gm/encode.cpp b/gm/encode.cpp index c0946b61a864..90ebd22163ac 100644 --- a/gm/encode.cpp +++ b/gm/encode.cpp @@ -6,10 +6,10 @@ */ #include "gm/gm.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkCanvas.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkFont.h" #include "include/core/SkImage.h" #include "include/core/SkImageEncoder.h" diff --git a/gm/encode_color_types.cpp b/gm/encode_color_types.cpp index 8038fab00cda..cef9c9c69c6d 100644 --- a/gm/encode_color_types.cpp +++ b/gm/encode_color_types.cpp @@ -6,10 +6,10 @@ */ #include "gm/gm.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkCanvas.h" #include "include/core/SkColorSpace.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkImage.h" #include "include/core/SkImageInfo.h" #include "include/core/SkSize.h" diff --git a/gm/encode_platform.cpp b/gm/encode_platform.cpp index f2e7cf9cbe00..779971e04127 100644 --- a/gm/encode_platform.cpp +++ b/gm/encode_platform.cpp @@ -6,10 +6,10 @@ */ #include "gm/gm.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkCanvas.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkImage.h" #include "include/core/SkImageInfo.h" #include "include/core/SkPixmap.h" diff --git a/gm/encode_srgb.cpp b/gm/encode_srgb.cpp index c1c00ec069fe..e142cf22880b 100644 --- a/gm/encode_srgb.cpp +++ b/gm/encode_srgb.cpp @@ -7,11 +7,11 @@ #include "gm/gm.h" #include "include/codec/SkCodec.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkCanvas.h" #include "include/core/SkColorSpace.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkImage.h" #include "include/core/SkImageInfo.h" #include "include/core/SkPixmap.h" diff --git a/gm/image.cpp b/gm/image.cpp index 1a0143568696..b00253adb06e 100644 --- a/gm/image.cpp +++ b/gm/image.cpp @@ -6,13 +6,13 @@ */ #include "gm/gm.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkCanvas.h" #include "include/core/SkColor.h" #include "include/core/SkColorPriv.h" #include "include/core/SkColorSpace.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkFont.h" #include "include/core/SkImage.h" #include "include/core/SkImageEncoder.h" diff --git a/gm/image_shader.cpp b/gm/image_shader.cpp index c07587bc2baf..a5c90b2bd681 100644 --- a/gm/image_shader.cpp +++ b/gm/image_shader.cpp @@ -6,12 +6,12 @@ */ #include "gm/gm.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkCanvas.h" #include "include/core/SkColor.h" #include "include/core/SkColorSpace.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkImage.h" #include "include/core/SkImageInfo.h" #include "include/core/SkMatrix.h" diff --git a/gm/jpg_color_cube.cpp b/gm/jpg_color_cube.cpp index d68804a48045..c4da49791d6a 100644 --- a/gm/jpg_color_cube.cpp +++ b/gm/jpg_color_cube.cpp @@ -6,11 +6,11 @@ */ #include "gm/gm.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkCanvas.h" #include "include/core/SkColorPriv.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkImage.h" #include "include/core/SkImageEncoder.h" #include "include/core/SkRefCnt.h" diff --git a/gn/core.gni b/gn/core.gni index 53a0934b9e6c..612aed604f9f 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -85,7 +85,6 @@ skia_core_public = [ "$_include/core/SkPathUtils.h", "$_include/core/SkPixelRef.h", "$_include/core/SkPixmap.h", - "$_include/core/SkPngChunkReader.h", "$_include/core/SkPoint.h", "$_include/core/SkPoint3.h", "$_include/core/SkPromiseImageTexture.h", @@ -379,8 +378,6 @@ skia_core_sources = [ "$_src/core/SkGpuBlurUtils.cpp", "$_src/core/SkGpuBlurUtils.h", "$_src/core/SkGraphics.cpp", - "$_src/core/SkICC.cpp", - "$_src/core/SkICCPriv.h", "$_src/core/SkIDChangeListener.cpp", "$_src/core/SkIPoint16.h", "$_src/core/SkImageFilter.cpp", @@ -738,16 +735,16 @@ skia_skpicture_sources = [ "$_src/shaders/SkPictureShader.cpp", ] -# Generated by Bazel rule //src/encode:srcs -src_images_srcs = [ - "$_src/encode/SkEncoder.cpp", - "$_src/encode/SkImageEncoder.cpp", -] - -# Generated by Bazel rule //src/encode:srcs +# List generated by Bazel rules: +# //src/encode:srcs +# //src/encode:private_hdrs skia_encode_srcs = [ "$_src/encode/SkEncoder.cpp", + "$_src/encode/SkICC.cpp", + "$_src/encode/SkICCPriv.h", "$_src/encode/SkImageEncoder.cpp", + "$_src/encode/SkImageEncoderFns.h", + "$_src/encode/SkImageEncoderPriv.h", ] # List generated by Bazel rules: diff --git a/include/codec/BUILD.bazel b/include/codec/BUILD.bazel index 9eaf74bc69a7..68870802e86a 100644 --- a/include/codec/BUILD.bazel +++ b/include/codec/BUILD.bazel @@ -10,7 +10,9 @@ skia_filegroup( "SkAndroidCodec.h", "SkCodec.h", "SkCodecAnimation.h", + "SkEncodedImageFormat.h", "SkEncodedOrigin.h", + "SkPngChunkReader.h", ], visibility = ["//include:__pkg__"], ) diff --git a/include/codec/SkAndroidCodec.h b/include/codec/SkAndroidCodec.h index 43340cf464a1..2b8a79751cfd 100644 --- a/include/codec/SkAndroidCodec.h +++ b/include/codec/SkAndroidCodec.h @@ -19,9 +19,9 @@ #include "modules/skcms/skcms.h" // TODO(kjlubick, bungeman) Replace these includes with forward declares +#include "include/codec/SkEncodedImageFormat.h" // IWYU pragma: keep #include "include/core/SkAlphaType.h" // IWYU pragma: keep #include "include/core/SkColorType.h" // IWYU pragma: keep -#include "include/core/SkEncodedImageFormat.h" // IWYU pragma: keep #include #include diff --git a/include/codec/SkEncodedImageFormat.h b/include/codec/SkEncodedImageFormat.h new file mode 100644 index 000000000000..99ca44e765c5 --- /dev/null +++ b/include/codec/SkEncodedImageFormat.h @@ -0,0 +1,36 @@ +/* + * Copyright 2015 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef SkEncodedImageFormat_DEFINED +#define SkEncodedImageFormat_DEFINED + +#include + +/** + * Enum describing format of encoded data. + */ +enum class SkEncodedImageFormat { +#ifdef SK_BUILD_FOR_GOOGLE3 + kUnknown, +#endif + kBMP, + kGIF, + kICO, + kJPEG, + kPNG, + kWBMP, + kWEBP, + kPKM, + kKTX, + kASTC, + kDNG, + kHEIF, + kAVIF, + kJPEGXL, +}; + +#endif // SkEncodedImageFormat_DEFINED diff --git a/include/core/SkPngChunkReader.h b/include/codec/SkPngChunkReader.h similarity index 100% rename from include/core/SkPngChunkReader.h rename to include/codec/SkPngChunkReader.h diff --git a/include/core/BUILD.bazel b/include/core/BUILD.bazel index 128dd3cc8b17..3aa2f1ea9647 100644 --- a/include/core/BUILD.bazel +++ b/include/core/BUILD.bazel @@ -43,7 +43,7 @@ skia_filegroup( "SkDeferredDisplayListRecorder.h", "SkDocument.h", "SkDrawable.h", - "SkEncodedImageFormat.h", + "SkEncodedImageFormat.h", # TODO(kjlubick) remove this shim "SkExecutor.h", "SkFlattenable.h", "SkFont.h", @@ -54,7 +54,7 @@ skia_filegroup( "SkFontStyle.h", "SkFontTypes.h", "SkGraphics.h", - "SkICC.h", + "SkICC.h", # Remove shim "SkImage.h", "SkImageEncoder.h", "SkImageFilter.h", @@ -77,7 +77,6 @@ skia_filegroup( "SkPathUtils.h", "SkPixelRef.h", "SkPixmap.h", - "SkPngChunkReader.h", "SkPoint.h", "SkPoint3.h", "SkPromiseImageTexture.h", diff --git a/include/core/SkEncodedImageFormat.h b/include/core/SkEncodedImageFormat.h index 99ca44e765c5..0db3830b9ac7 100644 --- a/include/core/SkEncodedImageFormat.h +++ b/include/core/SkEncodedImageFormat.h @@ -1,36 +1,9 @@ /* - * Copyright 2015 Google Inc. + * Copyright 2023 Google LLC * * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -#ifndef SkEncodedImageFormat_DEFINED -#define SkEncodedImageFormat_DEFINED - -#include - -/** - * Enum describing format of encoded data. - */ -enum class SkEncodedImageFormat { -#ifdef SK_BUILD_FOR_GOOGLE3 - kUnknown, -#endif - kBMP, - kGIF, - kICO, - kJPEG, - kPNG, - kWBMP, - kWEBP, - kPKM, - kKTX, - kASTC, - kDNG, - kHEIF, - kAVIF, - kJPEGXL, -}; - -#endif // SkEncodedImageFormat_DEFINED +// TODO(kjlubick) remove this shim after clients have been moved to the new location +#include "include/codec/SkEncodedImageFormat.h" // IWYU pragma: export diff --git a/include/core/SkICC.h b/include/core/SkICC.h index b14836b2ab6a..c0b458100cf8 100644 --- a/include/core/SkICC.h +++ b/include/core/SkICC.h @@ -1,36 +1,9 @@ /* - * Copyright 2016 Google Inc. + * Copyright 2023 Google LLC * * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -#ifndef SkICC_DEFINED -#define SkICC_DEFINED - -#include "include/core/SkRefCnt.h" -#include "include/private/base/SkAPI.h" - -#include - -class SkData; -struct skcms_ICCProfile; -struct skcms_Matrix3x3; -struct skcms_TransferFunction; - -SK_API sk_sp SkWriteICCProfile(const skcms_TransferFunction&, - const skcms_Matrix3x3& toXYZD50); - -SK_API sk_sp SkWriteICCProfile(const skcms_ICCProfile*, const char* description); - -// Utility function for populating the grid_16 member of skcms_A2B and skcms_B2A -// structures. This converts a point in XYZD50 to its representation in grid_16_lab. -// It will write 6 bytes. The behavior of this function matches how skcms will decode -// values, but might not match the specification, see https://crbug.com/skia/13807. -SK_API void SkICCFloatXYZD50ToGrid16Lab(const float* float_xyz, uint8_t* grid16_lab); - -// Utility function for popluating the table_16 member of skcms_Curve structure. -// This converts a float to its representation in table_16. It will write 2 bytes. -SK_API void SkICCFloatToTable16(const float f, uint8_t* table_16); - -#endif//SkICC_DEFINED +// TODO(kjlubick) remove this shim after clients have been moved to the new location +#include "include/encode/SkICC.h" // IWYU pragma: export diff --git a/include/encode/BUILD.bazel b/include/encode/BUILD.bazel index 9a4c76d7049d..1e14940cc779 100644 --- a/include/encode/BUILD.bazel +++ b/include/encode/BUILD.bazel @@ -8,6 +8,7 @@ skia_filegroup( name = "public_hdrs", srcs = [ "SkEncoder.h", + "SkICC.h", "SkJpegEncoder.h", "SkPngEncoder.h", "SkWebpEncoder.h", diff --git a/include/encode/SkICC.h b/include/encode/SkICC.h new file mode 100644 index 000000000000..b14836b2ab6a --- /dev/null +++ b/include/encode/SkICC.h @@ -0,0 +1,36 @@ +/* + * Copyright 2016 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef SkICC_DEFINED +#define SkICC_DEFINED + +#include "include/core/SkRefCnt.h" +#include "include/private/base/SkAPI.h" + +#include + +class SkData; +struct skcms_ICCProfile; +struct skcms_Matrix3x3; +struct skcms_TransferFunction; + +SK_API sk_sp SkWriteICCProfile(const skcms_TransferFunction&, + const skcms_Matrix3x3& toXYZD50); + +SK_API sk_sp SkWriteICCProfile(const skcms_ICCProfile*, const char* description); + +// Utility function for populating the grid_16 member of skcms_A2B and skcms_B2A +// structures. This converts a point in XYZD50 to its representation in grid_16_lab. +// It will write 6 bytes. The behavior of this function matches how skcms will decode +// values, but might not match the specification, see https://crbug.com/skia/13807. +SK_API void SkICCFloatXYZD50ToGrid16Lab(const float* float_xyz, uint8_t* grid16_lab); + +// Utility function for popluating the table_16 member of skcms_Curve structure. +// This converts a float to its representation in table_16. It will write 2 bytes. +SK_API void SkICCFloatToTable16(const float f, uint8_t* table_16); + +#endif//SkICC_DEFINED diff --git a/modules/canvaskit/canvaskit_bindings.cpp b/modules/canvaskit/canvaskit_bindings.cpp index 5210924edee4..f7b8dc9fbe78 100644 --- a/modules/canvaskit/canvaskit_bindings.cpp +++ b/modules/canvaskit/canvaskit_bindings.cpp @@ -7,6 +7,7 @@ #include "include/android/SkAnimatedImage.h" #include "include/codec/SkAndroidCodec.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBlendMode.h" #include "include/core/SkBlurTypes.h" #include "include/core/SkCanvas.h" @@ -14,7 +15,6 @@ #include "include/core/SkColorFilter.h" #include "include/core/SkColorSpace.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkImage.h" #include "include/core/SkImageFilter.h" #include "include/core/SkImageGenerator.h" diff --git a/modules/skparagraph/tests/SkParagraphTest.cpp b/modules/skparagraph/tests/SkParagraphTest.cpp index 0898052a76ae..f33cf47bed02 100644 --- a/modules/skparagraph/tests/SkParagraphTest.cpp +++ b/modules/skparagraph/tests/SkParagraphTest.cpp @@ -4,10 +4,10 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkCanvas.h" #include "include/core/SkColor.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkFontMgr.h" #include "include/core/SkFontStyle.h" #include "include/core/SkImageEncoder.h" diff --git a/public.bzl b/public.bzl index be7eedf0bdb9..dfdd6f723a52 100644 --- a/public.bzl +++ b/public.bzl @@ -8,6 +8,8 @@ SKIA_PUBLIC_HDRS = [ "include/codec/SkCodecAnimation.h", "include/codec/SkCodec.h", "include/codec/SkEncodedOrigin.h", + "include/codec/SkPngChunkReader.h", + "include/codec/SkEncodedImageFormat.h", "include/config/SkUserConfig.h", "include/core/SkAlphaType.h", "include/core/SkAnnotation.h", @@ -25,45 +27,43 @@ SKIA_PUBLIC_HDRS = [ "include/core/SkColorPriv.h", "include/core/SkColorSpace.h", "include/core/SkColorType.h", - "include/core/SkTextureCompressionType.h", "include/core/SkContourMeasure.h", "include/core/SkCoverageMode.h", "include/core/SkCubicMap.h", - "include/core/SkMesh.h", "include/core/SkData.h", "include/core/SkDataTable.h", "include/core/SkDeferredDisplayList.h", "include/core/SkDeferredDisplayListRecorder.h", "include/core/SkDocument.h", - "include/core/SkDrawable.h", "include/core/SkDrawLooper.h", - "include/core/SkEncodedImageFormat.h", + "include/core/SkDrawable.h", + "include/core/SkEncodedImageFormat.h", # TODO(kjlubick) remove this shim "include/core/SkExecutor.h", "include/core/SkFlattenable.h", - "include/core/SkFontArguments.h", "include/core/SkFont.h", + "include/core/SkFontArguments.h", "include/core/SkFontMetrics.h", "include/core/SkFontMgr.h", "include/core/SkFontParameters.h", "include/core/SkFontStyle.h", "include/core/SkFontTypes.h", "include/core/SkGraphics.h", - "include/core/SkICC.h", + "include/core/SkImage.h", "include/core/SkImageEncoder.h", "include/core/SkImageFilter.h", "include/core/SkImageGenerator.h", - "include/core/SkImage.h", "include/core/SkImageInfo.h", "include/core/SkM44.h", "include/core/SkMallocPixelRef.h", "include/core/SkMaskFilter.h", "include/core/SkMatrix.h", + "include/core/SkMesh.h", "include/core/SkMilestone.h", "include/core/SkOverdrawCanvas.h", "include/core/SkPaint.h", + "include/core/SkPath.h", "include/core/SkPathBuilder.h", "include/core/SkPathEffect.h", - "include/core/SkPath.h", "include/core/SkPathMeasure.h", "include/core/SkPathTypes.h", "include/core/SkPathUtils.h", @@ -71,16 +71,15 @@ SKIA_PUBLIC_HDRS = [ "include/core/SkPictureRecorder.h", "include/core/SkPixelRef.h", "include/core/SkPixmap.h", - "include/core/SkPngChunkReader.h", - "include/core/SkPoint3.h", "include/core/SkPoint.h", + "include/core/SkPoint3.h", "include/core/SkPromiseImageTexture.h", + "include/core/SkRRect.h", + "include/core/SkRSXform.h", "include/core/SkRasterHandleAllocator.h", "include/core/SkRect.h", "include/core/SkRefCnt.h", "include/core/SkRegion.h", - "include/core/SkRRect.h", - "include/core/SkRSXform.h", "include/core/SkSamplingOptions.h", "include/core/SkScalar.h", "include/core/SkSerialProcs.h", @@ -90,11 +89,12 @@ SKIA_PUBLIC_HDRS = [ "include/core/SkStream.h", "include/core/SkString.h", "include/core/SkStrokeRec.h", - "include/core/SkSurfaceCharacterization.h", "include/core/SkSurface.h", + "include/core/SkSurfaceCharacterization.h", "include/core/SkSurfaceProps.h", "include/core/SkSwizzle.h", "include/core/SkTextBlob.h", + "include/core/SkTextureCompressionType.h", "include/core/SkTileMode.h", "include/core/SkTime.h", "include/core/SkTraceMemoryDump.h", @@ -131,6 +131,7 @@ SKIA_PUBLIC_HDRS = [ "include/effects/SkTableMaskFilter.h", "include/effects/SkTrimPathEffect.h", "include/encode/SkEncoder.h", + "include/encode/SkICC.h", "include/encode/SkJpegEncoder.h", "include/encode/SkPngEncoder.h", "include/encode/SkWebpEncoder.h", @@ -489,8 +490,6 @@ BASE_SRCS_ALL = [ "src/core/SkGpuBlurUtils.cpp", "src/core/SkGpuBlurUtils.h", "src/core/SkGraphics.cpp", - "src/core/SkICC.cpp", - "src/core/SkICCPriv.h", "src/core/SkIDChangeListener.cpp", "src/core/SkIPoint16.h", "src/core/SkImageFilter.cpp", @@ -764,12 +763,14 @@ BASE_SRCS_ALL = [ "src/effects/imagefilters/SkShaderImageFilter.cpp", "src/effects/imagefilters/SkTileImageFilter.cpp", "src/encode/SkEncoder.cpp", + "src/encode/SkICCPriv.h", + "src/encode/SkICC.cpp", "src/encode/SkImageEncoder.cpp", "src/encode/SkImageEncoderFns.h", "src/encode/SkImageEncoderPriv.h", + "src/encode/SkJpegEncoder.cpp", "src/encode/SkJPEGWriteUtility.cpp", "src/encode/SkJPEGWriteUtility.h", - "src/encode/SkJpegEncoder.cpp", "src/encode/SkPngEncoder.cpp", "src/encode/SkWebpEncoder.cpp", "src/fonts/SkFontMgr_indirect.cpp", diff --git a/src/BUILD.bazel b/src/BUILD.bazel index b5da222298c1..cea22ab49a21 100644 --- a/src/BUILD.bazel +++ b/src/BUILD.bazel @@ -137,9 +137,9 @@ generate_cpp_files_for_headers( to_generate = [ "src/core/SkColorSpacePriv.h", "src/core/SkDrawProcs.h", - "src/core/SkICCPriv.h", "src/core/SkMatrixPriv.h", "src/core/SkPathPriv.h", + "src/encode/SkICCPriv.h", "src/encode/SkImageEncoderFns.h", "src/encode/SkImageEncoderPriv.h", "src/image/SkImage_Base.h", diff --git a/src/android/SkAnimatedImage.cpp b/src/android/SkAnimatedImage.cpp index ddb7fc1d28f1..fb9588c44ee0 100644 --- a/src/android/SkAnimatedImage.cpp +++ b/src/android/SkAnimatedImage.cpp @@ -8,8 +8,8 @@ #include "include/android/SkAnimatedImage.h" #include "include/codec/SkAndroidCodec.h" #include "include/codec/SkCodec.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkCanvas.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkPicture.h" #include "include/core/SkPictureRecorder.h" #include "include/core/SkPixelRef.h" diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp index d0ae83159860..5c356001126e 100644 --- a/src/codec/SkAndroidCodec.cpp +++ b/src/codec/SkAndroidCodec.cpp @@ -8,11 +8,11 @@ #include "include/codec/SkAndroidCodec.h" #include "include/codec/SkCodec.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkAlphaType.h" #include "include/core/SkColor.h" #include "include/core/SkColorType.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkRect.h" #include "include/core/SkStream.h" #include "include/private/SkGainmapInfo.h" diff --git a/src/codec/SkAvifCodec.h b/src/codec/SkAvifCodec.h index 9e3e1f5a0454..c738553756cd 100644 --- a/src/codec/SkAvifCodec.h +++ b/src/codec/SkAvifCodec.h @@ -8,9 +8,9 @@ #ifndef SkAvifCodec_DEFINED #define SkAvifCodec_DEFINED +#include "include/codec/SkEncodedImageFormat.h" #include "include/codec/SkEncodedOrigin.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkRefCnt.h" #include "include/private/SkEncodedInfo.h" #include "src/codec/SkFrameHolder.h" diff --git a/src/codec/SkBmpCodec.h b/src/codec/SkBmpCodec.h index 6e83fa962f32..345ddc75a0f8 100644 --- a/src/codec/SkBmpCodec.h +++ b/src/codec/SkBmpCodec.h @@ -8,8 +8,8 @@ #define SkBmpCodec_DEFINED #include "include/codec/SkCodec.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkColorType.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkTypes.h" #include "modules/skcms/skcms.h" diff --git a/src/codec/SkHeifCodec.cpp b/src/codec/SkHeifCodec.cpp index 85a3868e988b..4082fa5e4c7c 100644 --- a/src/codec/SkHeifCodec.cpp +++ b/src/codec/SkHeifCodec.cpp @@ -9,7 +9,7 @@ #ifdef SK_HAS_HEIF_LIBRARY #include "include/codec/SkCodec.h" -#include "include/core/SkEncodedImageFormat.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkStream.h" #include "include/private/SkColorData.h" #include "include/private/base/SkTemplates.h" diff --git a/src/codec/SkIcoCodec.h b/src/codec/SkIcoCodec.h index 4991322efab1..d71ec1a82c22 100644 --- a/src/codec/SkIcoCodec.h +++ b/src/codec/SkIcoCodec.h @@ -8,7 +8,7 @@ #define SkIcoCodec_DEFINED #include "include/codec/SkCodec.h" -#include "include/core/SkEncodedImageFormat.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkSize.h" #include "include/core/SkTypes.h" #include "include/private/base/SkTArray.h" diff --git a/src/codec/SkJpegCodec.h b/src/codec/SkJpegCodec.h index 4f5dd0f1c950..2349079056d2 100644 --- a/src/codec/SkJpegCodec.h +++ b/src/codec/SkJpegCodec.h @@ -9,8 +9,8 @@ #define SkJpegCodec_DEFINED #include "include/codec/SkCodec.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/codec/SkEncodedOrigin.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkRect.h" #include "include/core/SkSize.h" #include "include/core/SkTypes.h" diff --git a/src/codec/SkJpegxlCodec.h b/src/codec/SkJpegxlCodec.h index d81d992be754..c8c5a68ead19 100644 --- a/src/codec/SkJpegxlCodec.h +++ b/src/codec/SkJpegxlCodec.h @@ -8,8 +8,8 @@ #ifndef SkJpegxlCodec_DEFINED #define SkJpegxlCodec_DEFINED +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkRefCnt.h" #include "src/codec/SkScalingCodec.h" diff --git a/src/codec/SkPngCodec.cpp b/src/codec/SkPngCodec.cpp index 3c8bf468a653..0ff830b462e3 100644 --- a/src/codec/SkPngCodec.cpp +++ b/src/codec/SkPngCodec.cpp @@ -7,12 +7,12 @@ #include "src/codec/SkPngCodec.h" +#include "include/codec/SkPngChunkReader.h" #include "include/core/SkAlphaType.h" #include "include/core/SkColor.h" #include "include/core/SkColorType.h" #include "include/core/SkData.h" #include "include/core/SkImageInfo.h" -#include "include/core/SkPngChunkReader.h" #include "include/core/SkRect.h" #include "include/core/SkSize.h" #include "include/core/SkStream.h" diff --git a/src/codec/SkPngCodec.h b/src/codec/SkPngCodec.h index 47ce6185d29a..e50c1557448a 100644 --- a/src/codec/SkPngCodec.h +++ b/src/codec/SkPngCodec.h @@ -8,7 +8,7 @@ #define SkPngCodec_DEFINED #include "include/codec/SkCodec.h" -#include "include/core/SkEncodedImageFormat.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkRefCnt.h" #include "include/private/base/SkTemplates.h" diff --git a/src/codec/SkRawCodec.h b/src/codec/SkRawCodec.h index 267341c67560..07985470f139 100644 --- a/src/codec/SkRawCodec.h +++ b/src/codec/SkRawCodec.h @@ -9,7 +9,7 @@ #define SkRawCodec_DEFINED #include "include/codec/SkCodec.h" -#include "include/core/SkEncodedImageFormat.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkSize.h" #include "include/core/SkTypes.h" diff --git a/src/codec/SkSampledCodec.cpp b/src/codec/SkSampledCodec.cpp index 7796990fd79a..95e54abf020a 100644 --- a/src/codec/SkSampledCodec.cpp +++ b/src/codec/SkSampledCodec.cpp @@ -8,7 +8,7 @@ #include "src/codec/SkSampledCodec.h" #include "include/codec/SkCodec.h" -#include "include/core/SkEncodedImageFormat.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkImageInfo.h" #include "include/core/SkRect.h" #include "include/core/SkTypes.h" diff --git a/src/codec/SkWbmpCodec.cpp b/src/codec/SkWbmpCodec.cpp index 66eda525d3a1..6d2de722ec11 100644 --- a/src/codec/SkWbmpCodec.cpp +++ b/src/codec/SkWbmpCodec.cpp @@ -8,8 +8,8 @@ #include "src/codec/SkWbmpCodec.h" #include "include/codec/SkCodec.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkColorType.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkImageInfo.h" #include "include/core/SkSize.h" #include "include/core/SkStream.h" diff --git a/src/codec/SkWebpCodec.h b/src/codec/SkWebpCodec.h index e87d057ff307..2390eb372cba 100644 --- a/src/codec/SkWebpCodec.h +++ b/src/codec/SkWebpCodec.h @@ -8,9 +8,9 @@ #ifndef SkWebpCodec_DEFINED #define SkWebpCodec_DEFINED +#include "include/codec/SkEncodedImageFormat.h" #include "include/codec/SkEncodedOrigin.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkRefCnt.h" #include "include/core/SkTypes.h" #include "include/private/SkEncodedInfo.h" diff --git a/src/codec/SkWuffsCodec.cpp b/src/codec/SkWuffsCodec.cpp index b31fffe40077..2ec9e2e376c3 100644 --- a/src/codec/SkWuffsCodec.cpp +++ b/src/codec/SkWuffsCodec.cpp @@ -8,11 +8,11 @@ #include "src/codec/SkWuffsCodec.h" #include "include/codec/SkCodecAnimation.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkAlphaType.h" #include "include/core/SkBitmap.h" #include "include/core/SkBlendMode.h" #include "include/core/SkColorType.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkImageInfo.h" #include "include/core/SkMatrix.h" #include "include/core/SkPaint.h" diff --git a/src/core/BUILD.bazel b/src/core/BUILD.bazel index 6ed7c024dc44..43abe253a3bc 100644 --- a/src/core/BUILD.bazel +++ b/src/core/BUILD.bazel @@ -158,8 +158,6 @@ CORE_FILES = [ "SkGpuBlurUtils.cpp", "SkGpuBlurUtils.h", "SkGraphics.cpp", - "SkICC.cpp", - "SkICCPriv.h", "SkIDChangeListener.cpp", "SkIPoint16.h", "SkImageFilter.cpp", diff --git a/src/encode/BUILD.bazel b/src/encode/BUILD.bazel index 03ba33a40fb9..80a92bb4f77c 100644 --- a/src/encode/BUILD.bazel +++ b/src/encode/BUILD.bazel @@ -46,6 +46,7 @@ skia_filegroup( srcs = [ "SkEncoder.cpp", "SkImageEncoder.cpp", + "SkICC.cpp", ] + select_multi({ ":jpeg_encode_codec": [":jpeg_encode_srcs"], ":png_encode_codec": [":png_encode_srcs"], @@ -59,6 +60,7 @@ skia_filegroup( srcs = [ "SkImageEncoderFns.h", "SkImageEncoderPriv.h", + "SkICCPriv.h", ] + select({ ":jpeg_encode_codec": [":jpeg_encode_hdrs"], "//conditions:default": [], diff --git a/src/core/SkICC.cpp b/src/encode/SkICC.cpp similarity index 99% rename from src/core/SkICC.cpp rename to src/encode/SkICC.cpp index c12254a8a827..7163563d61cd 100644 --- a/src/core/SkICC.cpp +++ b/src/encode/SkICC.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "include/core/SkICC.h" +#include "include/encode/SkICC.h" #include "include/core/SkColorSpace.h" #include "include/core/SkData.h" @@ -17,8 +17,8 @@ #include "src/base/SkAutoMalloc.h" #include "src/base/SkEndian.h" #include "src/base/SkUtils.h" -#include "src/core/SkICCPriv.h" #include "src/core/SkMD5.h" +#include "src/encode/SkICCPriv.h" #include #include diff --git a/src/core/SkICCPriv.h b/src/encode/SkICCPriv.h similarity index 100% rename from src/core/SkICCPriv.h rename to src/encode/SkICCPriv.h diff --git a/src/encode/SkImageEncoder.cpp b/src/encode/SkImageEncoder.cpp index 29bfcc736581..72c4cf8b286c 100644 --- a/src/encode/SkImageEncoder.cpp +++ b/src/encode/SkImageEncoder.cpp @@ -6,9 +6,9 @@ */ #include "include/core/SkImageEncoder.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkPixmap.h" #include "include/core/SkRefCnt.h" #include "include/core/SkStream.h" diff --git a/src/encode/SkImageEncoderFns.h b/src/encode/SkImageEncoderFns.h index 203c3508232c..c56771628029 100644 --- a/src/encode/SkImageEncoderFns.h +++ b/src/encode/SkImageEncoderFns.h @@ -10,10 +10,10 @@ #include "include/core/SkColorSpace.h" #include "include/core/SkData.h" -#include "include/core/SkICC.h" #include "include/core/SkImageInfo.h" #include "include/core/SkRefCnt.h" #include "include/core/SkTypes.h" +#include "include/encode/SkICC.h" #include "modules/skcms/skcms.h" #include diff --git a/src/encode/SkImageEncoderPriv.h b/src/encode/SkImageEncoderPriv.h index e56cc1789ff5..9fedae51f6a3 100644 --- a/src/encode/SkImageEncoderPriv.h +++ b/src/encode/SkImageEncoderPriv.h @@ -14,7 +14,7 @@ #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) || \ defined(SK_BUILD_FOR_WIN) || defined(SK_ENABLE_NDK_IMAGES) -#include "include/core/SkEncodedImageFormat.h" +#include "include/codec/SkEncodedImageFormat.h" class SkWStream; #endif diff --git a/src/gpu/ganesh/text/GrAtlasManager.cpp b/src/gpu/ganesh/text/GrAtlasManager.cpp index 58b37428d6bd..5af49a1dcf5b 100644 --- a/src/gpu/ganesh/text/GrAtlasManager.cpp +++ b/src/gpu/ganesh/text/GrAtlasManager.cpp @@ -7,8 +7,8 @@ #include "src/gpu/ganesh/text/GrAtlasManager.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkColorSpace.h" -#include "include/core/SkEncodedImageFormat.h" #include "src/base/SkAutoMalloc.h" #include "src/codec/SkMasks.h" #include "src/core/SkDistanceFieldGen.h" diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index fd31e0525aa0..67870444453b 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -7,11 +7,11 @@ #include "include/core/SkImage.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkColorSpace.h" #include "include/core/SkColorType.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkImageEncoder.h" #include "include/core/SkImageGenerator.h" #include "include/core/SkMatrix.h" diff --git a/src/pdf/SkPDFBitmap.cpp b/src/pdf/SkPDFBitmap.cpp index 0da70b7124ec..888c09729ea2 100644 --- a/src/pdf/SkPDFBitmap.cpp +++ b/src/pdf/SkPDFBitmap.cpp @@ -7,9 +7,9 @@ #include "src/pdf/SkPDFBitmap.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkExecutor.h" #include "include/core/SkImage.h" #include "include/core/SkStream.h" diff --git a/src/svg/SkSVGDevice.cpp b/src/svg/SkSVGDevice.cpp index 7059028ffdaf..43feb2f3e655 100644 --- a/src/svg/SkSVGDevice.cpp +++ b/src/svg/SkSVGDevice.cpp @@ -7,13 +7,13 @@ #include "src/svg/SkSVGDevice.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkBlendMode.h" #include "include/core/SkClipOp.h" #include "include/core/SkColor.h" #include "include/core/SkColorFilter.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkFont.h" #include "include/core/SkFontStyle.h" #include "include/core/SkImage.h" diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp index 48ef1917eda5..c017d1faf788 100644 --- a/src/xps/SkXPSDevice.cpp +++ b/src/xps/SkXPSDevice.cpp @@ -22,9 +22,9 @@ #include #include +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkColor.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkImage.h" #include "include/core/SkImageEncoder.h" #include "include/core/SkPaint.h" diff --git a/tests/AndroidCodecTest.cpp b/tests/AndroidCodecTest.cpp index e71c9067a149..6800176fddfa 100644 --- a/tests/AndroidCodecTest.cpp +++ b/tests/AndroidCodecTest.cpp @@ -7,9 +7,9 @@ #include "include/codec/SkAndroidCodec.h" #include "include/codec/SkCodec.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkColorSpace.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkImageInfo.h" #include "include/core/SkRefCnt.h" #include "include/core/SkSize.h" diff --git a/tests/CodecPriv.h b/tests/CodecPriv.h index b36f0eb353a5..c69892d76349 100644 --- a/tests/CodecPriv.h +++ b/tests/CodecPriv.h @@ -8,9 +8,9 @@ #define CodecPriv_DEFINED #include "include/codec/SkCodec.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkImageEncoder.h" #include "include/core/SkStream.h" #include "src/utils/SkOSPath.h" diff --git a/tests/CodecRecommendedTypeTest.cpp b/tests/CodecRecommendedTypeTest.cpp index 9a2a06d1a0e1..de95e578c0b8 100644 --- a/tests/CodecRecommendedTypeTest.cpp +++ b/tests/CodecRecommendedTypeTest.cpp @@ -6,13 +6,13 @@ */ #include "include/codec/SkAndroidCodec.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkAlphaType.h" #include "include/core/SkBitmap.h" #include "include/core/SkColor.h" #include "include/core/SkColorSpace.h" #include "include/core/SkColorType.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkImageEncoder.h" #include "include/core/SkImageInfo.h" #include "include/core/SkStream.h" diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index b1a352958578..196dfcc754be 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -7,6 +7,8 @@ #include "include/codec/SkAndroidCodec.h" #include "include/codec/SkCodec.h" +#include "include/codec/SkEncodedImageFormat.h" +#include "include/codec/SkPngChunkReader.h" #include "include/core/SkAlphaType.h" #include "include/core/SkBitmap.h" #include "include/core/SkCanvas.h" @@ -14,13 +16,11 @@ #include "include/core/SkColorSpace.h" #include "include/core/SkColorType.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkImage.h" #include "include/core/SkImageEncoder.h" #include "include/core/SkImageGenerator.h" #include "include/core/SkImageInfo.h" #include "include/core/SkPixmap.h" -#include "include/core/SkPngChunkReader.h" #include "include/core/SkRect.h" #include "include/core/SkRefCnt.h" #include "include/core/SkSize.h" diff --git a/tests/EncodeTest.cpp b/tests/EncodeTest.cpp index 0c2578346681..cc5ece11a6bb 100644 --- a/tests/EncodeTest.cpp +++ b/tests/EncodeTest.cpp @@ -6,6 +6,7 @@ */ #include "include/codec/SkCodec.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkAlphaType.h" #include "include/core/SkBitmap.h" #include "include/core/SkCanvas.h" @@ -14,7 +15,6 @@ #include "include/core/SkColorType.h" #include "include/core/SkData.h" #include "include/core/SkDataTable.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkImage.h" #include "include/core/SkImageEncoder.h" #include "include/core/SkImageInfo.h" diff --git a/tests/EncodedInfoTest.cpp b/tests/EncodedInfoTest.cpp index a421b80a5307..dcafcfa34699 100644 --- a/tests/EncodedInfoTest.cpp +++ b/tests/EncodedInfoTest.cpp @@ -6,11 +6,11 @@ */ #include "include/codec/SkCodec.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkColorSpace.h" #include "include/core/SkColorType.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkImageEncoder.h" #include "include/core/SkImageInfo.h" #include "include/core/SkStream.h" diff --git a/tests/ICCTest.cpp b/tests/ICCTest.cpp index 29f75f4b716b..e53f35e51545 100644 --- a/tests/ICCTest.cpp +++ b/tests/ICCTest.cpp @@ -7,9 +7,9 @@ #include "include/core/SkColorSpace.h" #include "include/core/SkData.h" -#include "include/core/SkICC.h" #include "include/core/SkRefCnt.h" #include "include/core/SkTypes.h" +#include "include/encode/SkICC.h" #include "modules/skcms/skcms.h" #include "tests/Test.h" #include "tools/Resources.h" diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index cf5926936058..8be4bcf63255 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkAlphaType.h" #include "include/core/SkBitmap.h" #include "include/core/SkBlendMode.h" @@ -14,7 +15,6 @@ #include "include/core/SkColorSpace.h" #include "include/core/SkColorType.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkImage.h" #include "include/core/SkImageEncoder.h" #include "include/core/SkImageGenerator.h" diff --git a/tests/TextBlobCacheTest.cpp b/tests/TextBlobCacheTest.cpp index 84b6eb40c870..3fac5accf171 100644 --- a/tests/TextBlobCacheTest.cpp +++ b/tests/TextBlobCacheTest.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkAlphaType.h" #include "include/core/SkBitmap.h" #include "include/core/SkBlendMode.h" @@ -12,7 +13,6 @@ #include "include/core/SkColor.h" #include "include/core/SkColorType.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkFont.h" #include "include/core/SkFontMgr.h" #include "include/core/SkFontStyle.h" diff --git a/tools/HashAndEncode.cpp b/tools/HashAndEncode.cpp index 68ab69d55a43..8ac63f9c5f2d 100644 --- a/tools/HashAndEncode.cpp +++ b/tools/HashAndEncode.cpp @@ -4,8 +4,8 @@ #include "tools/HashAndEncode.h" #include "include/core/SkColorSpace.h" -#include "include/core/SkICC.h" #include "include/core/SkString.h" +#include "include/encode/SkICC.h" #include "modules/skcms/skcms.h" #include diff --git a/tools/ToolUtils.h b/tools/ToolUtils.h index 778d57a26f91..a68acea9f6a8 100644 --- a/tools/ToolUtils.h +++ b/tools/ToolUtils.h @@ -8,9 +8,9 @@ #ifndef ToolUtils_DEFINED #define ToolUtils_DEFINED +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkColor.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkFont.h" #include "include/core/SkFontStyle.h" #include "include/core/SkFontTypes.h" diff --git a/tools/fonts/TestSVGTypeface.cpp b/tools/fonts/TestSVGTypeface.cpp index d103f106388b..577bdffa25f2 100644 --- a/tools/fonts/TestSVGTypeface.cpp +++ b/tools/fonts/TestSVGTypeface.cpp @@ -9,12 +9,12 @@ #if defined(SK_ENABLE_SVG) +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkCanvas.h" #include "include/core/SkColor.h" #include "include/core/SkData.h" #include "include/core/SkDrawable.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkFontStyle.h" #include "include/core/SkImage.h" #include "include/core/SkImageInfo.h" diff --git a/tools/get_images_from_skps.cpp b/tools/get_images_from_skps.cpp index 3d75e42cf468..24c7281878e2 100644 --- a/tools/get_images_from_skps.cpp +++ b/tools/get_images_from_skps.cpp @@ -6,10 +6,10 @@ */ #include "include/codec/SkCodec.h" +#include "include/codec/SkEncodedImageFormat.h" #include "include/core/SkBitmap.h" #include "include/core/SkColorSpace.h" #include "include/core/SkData.h" -#include "include/core/SkEncodedImageFormat.h" #include "include/core/SkPicture.h" #include "include/core/SkSerialProcs.h" #include "include/core/SkStream.h" diff --git a/tools/rewrite_includes.py b/tools/rewrite_includes.py index a14aeafe723f..1123a53a9ce2 100755 --- a/tools/rewrite_includes.py +++ b/tools/rewrite_includes.py @@ -46,6 +46,9 @@ # Some node_modules/ files (used by CanvasKit et al) have c++ code which we should ignore. 'node_modules', 'include/third_party/skcms', + # Temporary shims + 'SkEncodedImageFormat.h', + 'SkICC.h', ] assert '/' in [os.sep, os.altsep]