Move some codec-related headers out of core

- `SkEncodedImageFormat.h` -> include/codec - `SkPngChunkReader.h` -> include/codec - `SkICC.h` -> include/encode - `SkICC.cpp` -> src/encode - `SkICCPriv.h` -> src/encode Bug: skia:13983 Change-Id: I92d09820587804dc7e3abd3a88a7679e0b56b809 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/660381 Reviewed-by: Ben Wagner <[email protected]> Owners-Override: Kevin Lubick <[email protected]>
armansito · Mar 23, 2023 · 3b23392 · 3b23392
1 parent c42320d
commit 3b23392
Show file tree

Hide file tree

Showing 71 changed files with 177 additions and 153 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <cstddef>
 #include <memory>

diff --git a/include/codec/SkEncodedImageFormat.h 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 <stdint.h>
+
+/**
+ *  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 → include/codec/SkPngChunkReader.h b/include/core/SkPngChunkReader.h → include/codec/SkPngChunkReader.h
diff --git 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
@@ -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 <stdint.h>
-
-/**
- *  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