Revert "Move src/images to src/encode"
This reverts commit cdb0955534cd7400c67dc82b8e549a2892853e87.
Reason for revert: Chrome has reverted https://chromium-review.googlesource.com/c/chromium/src/+/4262691
Original change's description:
> Move src/images to src/encode
>
> This better aligns to include/encode and more accurately describes what
> files in the folder do (encode pixels into .png, .jpeg, etc).
>
> Change-Id: Ib85a6417ed4b03b9a02cc19582fddfc7d3802dbd
> Bug: skia:13983
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/644318
> Reviewed-by: Leon Scroggins <scroggo@google.com>
> Commit-Queue: Kevin Lubick <kjlubick@google.com>
Bug: skia:13983
Change-Id: Ic241d061edcd84e2ff3791a7df127014a483803a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/645058
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
diff --git a/.bazelrc b/.bazelrc
index 22132f5..1a6c857 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -45,7 +45,7 @@
build --flag_alias=fontmgr_factory=//bazel/common_config_settings:fontmgr_factory
build --flag_alias=gpu_backend=//src/gpu:gpu_backend
build --flag_alias=include_decoder=//src/codec:include_decoder
-build --flag_alias=include_encoder=//src/encode:include_encoder
+build --flag_alias=include_encoder=//src/images:include_encoder
build --flag_alias=include_fontmgr=//bazel/common_config_settings:include_fontmgr
build --flag_alias=with_gl_standard=//src/gpu:with_gl_standard
diff --git a/BUILD.gn b/BUILD.gn
index 6bea5a0..110f4ac 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1248,7 +1248,7 @@
if (skia_use_jpeg_gainmaps) {
deps += [ ":jpeg_mpf" ]
- sources += [ "src/encode/SkJpegGainmapEncoder.cpp" ]
+ sources += [ "src/images/SkJpegGainmapEncoder.cpp" ]
}
}
diff --git a/bazel/cc_binary_with_flags.bzl b/bazel/cc_binary_with_flags.bzl
index 4c2d368..b381905 100644
--- a/bazel/cc_binary_with_flags.bzl
+++ b/bazel/cc_binary_with_flags.bzl
@@ -32,7 +32,7 @@
_string_list_flags = [
"//src/gpu:gpu_backend",
"//src/codec:include_decoder",
- "//src/encode:include_encoder",
+ "//src/images:include_encoder",
"//bazel/common_config_settings:include_fontmgr",
]
diff --git a/bazel/exporter_tool/main.go b/bazel/exporter_tool/main.go
index 2045bbf..03332ea 100644
--- a/bazel/exporter_tool/main.go
+++ b/bazel/exporter_tool/main.go
@@ -76,16 +76,16 @@
"//src/core:skpicture_srcs",
"//src/shaders:skpicture_srcs",
}},
- {Var: "src_images_srcs",
- Rules: []string{"//src/encode:srcs"}},
+ {Var: "src_images_srcs", // TODO(kjlubick) Remove after Chrome uses new name
+ Rules: []string{"//src/images:srcs"}},
{Var: "skia_encode_srcs",
- Rules: []string{"//src/encode:srcs"}},
+ Rules: []string{"//src/images:srcs"}},
{Var: "skia_encode_jpeg_srcs",
- Rules: []string{"//src/encode:jpeg_encode_srcs", "//src/encode:jpeg_encode_hdrs"}},
+ Rules: []string{"//src/images:jpeg_encode_srcs", "//src/images:jpeg_encode_hdrs"}},
{Var: "skia_encode_png_srcs",
- Rules: []string{"//src/encode:png_encode_srcs"}},
+ Rules: []string{"//src/images:png_encode_srcs"}},
{Var: "skia_encode_webp_srcs",
- Rules: []string{"//src/encode:webp_encode_srcs"}},
+ Rules: []string{"//src/images:webp_encode_srcs"}},
{Var: "skia_discardable_memory_chromium",
Rules: []string{"//include/private/chromium:discardable_memory_hdrs"}},
},
diff --git a/defines.bzl b/defines.bzl
index dd0b37b..f03f1b4 100644
--- a/defines.bzl
+++ b/defines.bzl
@@ -101,15 +101,15 @@
"//src/codec:avif_decode_codec": ["SK_CODEC_DECODES_AVIF"],
"//src/codec:gif_decode_codec": ["SK_HAS_WUFFS_LIBRARY"],
"//src/codec:jpeg_decode_codec": ["SK_CODEC_DECODES_JPEG"],
- "//src/encode:jpeg_encode_codec": ["SK_ENCODE_JPEG"],
+ "//src/images:jpeg_encode_codec": ["SK_ENCODE_JPEG"],
"//src/codec:png_decode_codec": ["SK_CODEC_DECODES_PNG"],
- "//src/encode:png_encode_codec": ["SK_ENCODE_PNG"],
+ "//src/images:png_encode_codec": ["SK_ENCODE_PNG"],
"//src/codec:raw_decode_codec": [
"SK_CODEC_DECODES_RAW",
"SK_CODEC_DECODES_JPEG",
],
"//src/codec:webp_decode_codec": ["SK_CODEC_DECODES_WEBP"],
- "//src/encode:webp_encode_codec": ["SK_ENCODE_WEBP"],
+ "//src/images:webp_encode_codec": ["SK_ENCODE_WEBP"],
},
)
diff --git a/gm/encode_platform.cpp b/gm/encode_platform.cpp
index f2e7cf9..b724de7 100644
--- a/gm/encode_platform.cpp
+++ b/gm/encode_platform.cpp
@@ -26,7 +26,7 @@
#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) || defined(SK_BUILD_FOR_WIN) \
|| defined(SK_ENABLE_NDK_IMAGES)
-#include "src/encode/SkImageEncoderPriv.h"
+#include "src/images/SkImageEncoderPriv.h"
#endif
namespace {
diff --git a/gn/core.gni b/gn/core.gni
index f760913..a613ebe 100644
--- a/gn/core.gni
+++ b/gn/core.gni
@@ -9,8 +9,8 @@
# //include/private/chromium/BUILD.bazel
# //src/base/BUILD.bazel
# //src/core/BUILD.bazel
-# //src/encode/BUILD.bazel
# //src/image/BUILD.bazel
+# //src/images/BUILD.bazel
# //src/lazy/BUILD.bazel
# //src/opts/BUILD.bazel
# //src/pathops/BUILD.bazel
@@ -724,32 +724,32 @@
"$_src/shaders/SkPictureShader.cpp",
]
-# Generated by Bazel rule //src/encode:srcs
+# Generated by Bazel rule //src/images:srcs
src_images_srcs = [
- "$_src/encode/SkEncoder.cpp",
- "$_src/encode/SkImageEncoder.cpp",
+ "$_src/images/SkEncoder.cpp",
+ "$_src/images/SkImageEncoder.cpp",
]
-# Generated by Bazel rule //src/encode:srcs
+# Generated by Bazel rule //src/images:srcs
skia_encode_srcs = [
- "$_src/encode/SkEncoder.cpp",
- "$_src/encode/SkImageEncoder.cpp",
+ "$_src/images/SkEncoder.cpp",
+ "$_src/images/SkImageEncoder.cpp",
]
# List generated by Bazel rules:
-# //src/encode:jpeg_encode_srcs
-# //src/encode:jpeg_encode_hdrs
+# //src/images:jpeg_encode_srcs
+# //src/images:jpeg_encode_hdrs
skia_encode_jpeg_srcs = [
- "$_src/encode/SkJPEGWriteUtility.cpp",
- "$_src/encode/SkJPEGWriteUtility.h",
- "$_src/encode/SkJpegEncoder.cpp",
+ "$_src/images/SkJPEGWriteUtility.cpp",
+ "$_src/images/SkJPEGWriteUtility.h",
+ "$_src/images/SkJpegEncoder.cpp",
]
-# Generated by Bazel rule //src/encode:png_encode_srcs
-skia_encode_png_srcs = [ "$_src/encode/SkPngEncoder.cpp" ]
+# Generated by Bazel rule //src/images:png_encode_srcs
+skia_encode_png_srcs = [ "$_src/images/SkPngEncoder.cpp" ]
-# Generated by Bazel rule //src/encode:webp_encode_srcs
-skia_encode_webp_srcs = [ "$_src/encode/SkWebpEncoder.cpp" ]
+# Generated by Bazel rule //src/images:webp_encode_srcs
+skia_encode_webp_srcs = [ "$_src/images/SkWebpEncoder.cpp" ]
# Generated by Bazel rule //include/private/chromium:discardable_memory_hdrs
skia_discardable_memory_chromium =
diff --git a/public.bzl b/public.bzl
index 39590b1..d460e81 100644
--- a/public.bzl
+++ b/public.bzl
@@ -755,15 +755,6 @@
"src/effects/imagefilters/SkRuntimeImageFilter.h",
"src/effects/imagefilters/SkShaderImageFilter.cpp",
"src/effects/imagefilters/SkTileImageFilter.cpp",
- "src/encode/SkEncoder.cpp",
- "src/encode/SkImageEncoder.cpp",
- "src/encode/SkImageEncoderFns.h",
- "src/encode/SkImageEncoderPriv.h",
- "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",
"src/fonts/SkRemotableFontMgr.cpp",
"src/gpu/AsyncReadTypes.h",
@@ -1245,6 +1236,15 @@
"src/image/SkSurface_Gpu.cpp",
"src/image/SkSurface_Gpu.h",
"src/image/SkSurface_Raster.cpp",
+ "src/images/SkEncoder.cpp",
+ "src/images/SkImageEncoder.cpp",
+ "src/images/SkImageEncoderFns.h",
+ "src/images/SkImageEncoderPriv.h",
+ "src/images/SkJPEGWriteUtility.cpp",
+ "src/images/SkJPEGWriteUtility.h",
+ "src/images/SkJpegEncoder.cpp",
+ "src/images/SkPngEncoder.cpp",
+ "src/images/SkWebpEncoder.cpp",
"src/opts/SkBitmapProcState_opts.h",
"src/opts/SkBlitMask_opts.h",
"src/opts/SkBlitRow_opts.h",
diff --git a/src/BUILD.bazel b/src/BUILD.bazel
index b679bb3..0bec8c1 100644
--- a/src/BUILD.bazel
+++ b/src/BUILD.bazel
@@ -20,7 +20,7 @@
"//src/core:srcs",
"//src/effects:srcs",
"//src/image:srcs",
- "//src/encode:srcs",
+ "//src/images:srcs",
"//src/pathops:srcs",
"//src/ports:srcs",
"//src/sfnt:srcs",
@@ -65,7 +65,7 @@
"//src/core:private_hdrs",
"//src/effects:private_hdrs",
"//src/image:private_hdrs",
- "//src/encode:private_hdrs",
+ "//src/images:private_hdrs",
"//src/opts:private_hdrs",
"//src/pathops:private_hdrs",
"//src/ports:private_hdrs",
@@ -106,7 +106,7 @@
visibility = ["//:__pkg__"],
deps = [
"//src/codec:deps",
- "//src/encode:deps",
+ "//src/images:deps",
"//src/ports:deps",
"//src/opts:deps",
"//modules/skcms:skcms",
@@ -139,8 +139,8 @@
"src/core/SkMatrixPriv.h",
"src/core/SkPathPriv.h",
"src/image/SkImage_Base.h",
- "src/encode/SkImageEncoderFns.h",
- "src/encode/SkImageEncoderPriv.h",
+ "src/images/SkImageEncoderFns.h",
+ "src/images/SkImageEncoderPriv.h",
],
)
diff --git a/src/codec/BUILD.bazel b/src/codec/BUILD.bazel
index 79e1b50..51f650f 100644
--- a/src/codec/BUILD.bazel
+++ b/src/codec/BUILD.bazel
@@ -183,7 +183,7 @@
name = "needs_jpeg_priv",
match_any = [
":needs_jpeg",
- "//src/encode:jpeg_encode_codec",
+ "//src/images:jpeg_encode_codec",
],
)
@@ -191,7 +191,7 @@
name = "needs_png_priv",
match_any = [
":png_decode_codec",
- "//src/encode:png_encode_codec",
+ "//src/images:png_encode_codec",
],
)
@@ -222,10 +222,10 @@
":decode_bmp_hdrs",
":core_hdrs",
] + select({
- ":needs_jpeg_priv": ["SkJpegPriv.h"], # used by src/encode/SkJPEGWriteUtility
+ ":needs_jpeg_priv": ["SkJpegPriv.h"], # used by src/images/SkJPEGWriteUtility
"//conditions:default": [],
}) + select({
- ":needs_png_priv": ["SkPngPriv.h"], # used by src/encode/SkPngEncoder
+ ":needs_png_priv": ["SkPngPriv.h"], # used by src/images/SkPngEncoder
"//conditions:default": [],
}) + select_multi(
{
diff --git a/src/encode/BUILD.bazel b/src/images/BUILD.bazel
similarity index 100%
rename from src/encode/BUILD.bazel
rename to src/images/BUILD.bazel
diff --git a/src/encode/SkEncoder.cpp b/src/images/SkEncoder.cpp
similarity index 100%
rename from src/encode/SkEncoder.cpp
rename to src/images/SkEncoder.cpp
diff --git a/src/encode/SkImageEncoder.cpp b/src/images/SkImageEncoder.cpp
similarity index 98%
rename from src/encode/SkImageEncoder.cpp
rename to src/images/SkImageEncoder.cpp
index 29bfcc7..7580205 100644
--- a/src/encode/SkImageEncoder.cpp
+++ b/src/images/SkImageEncoder.cpp
@@ -18,7 +18,7 @@
#include "include/encode/SkWebpEncoder.h"
#if SK_ENABLE_NDK_IMAGES || SK_USE_CG_ENCODER || SK_USE_WIC_ENCODER
-#include "src/encode/SkImageEncoderPriv.h"
+#include "src/images/SkImageEncoderPriv.h"
#endif
#if !defined(SK_ENCODE_JPEG)|| !defined(SK_ENCODE_PNG) || !defined(SK_ENCODE_WEBP)
diff --git a/src/encode/SkImageEncoderFns.h b/src/images/SkImageEncoderFns.h
similarity index 100%
rename from src/encode/SkImageEncoderFns.h
rename to src/images/SkImageEncoderFns.h
diff --git a/src/encode/SkImageEncoderPriv.h b/src/images/SkImageEncoderPriv.h
similarity index 100%
rename from src/encode/SkImageEncoderPriv.h
rename to src/images/SkImageEncoderPriv.h
diff --git a/src/encode/SkJPEGWriteUtility.cpp b/src/images/SkJPEGWriteUtility.cpp
similarity index 97%
rename from src/encode/SkJPEGWriteUtility.cpp
rename to src/images/SkJPEGWriteUtility.cpp
index 312e81d..c4c824d 100644
--- a/src/encode/SkJPEGWriteUtility.cpp
+++ b/src/images/SkJPEGWriteUtility.cpp
@@ -6,7 +6,7 @@
*/
-#include "src/encode/SkJPEGWriteUtility.h"
+#include "src/images/SkJPEGWriteUtility.h"
#include "include/core/SkData.h"
#include "include/core/SkStream.h"
diff --git a/src/encode/SkJPEGWriteUtility.h b/src/images/SkJPEGWriteUtility.h
similarity index 100%
rename from src/encode/SkJPEGWriteUtility.h
rename to src/images/SkJPEGWriteUtility.h
diff --git a/src/encode/SkJpegEncoder.cpp b/src/images/SkJpegEncoder.cpp
similarity index 98%
rename from src/encode/SkJpegEncoder.cpp
rename to src/images/SkJpegEncoder.cpp
index b8d23bf..ad8f05f 100644
--- a/src/encode/SkJpegEncoder.cpp
+++ b/src/images/SkJpegEncoder.cpp
@@ -22,9 +22,9 @@
#include "src/base/SkMSAN.h"
#include "src/codec/SkJpegConstants.h"
#include "src/codec/SkJpegPriv.h"
-#include "src/encode/SkImageEncoderFns.h"
-#include "src/encode/SkImageEncoderPriv.h"
-#include "src/encode/SkJPEGWriteUtility.h"
+#include "src/images/SkImageEncoderFns.h"
+#include "src/images/SkImageEncoderPriv.h"
+#include "src/images/SkJPEGWriteUtility.h"
#include <csetjmp>
#include <cstdint>
diff --git a/src/encode/SkJpegGainmapEncoder.cpp b/src/images/SkJpegGainmapEncoder.cpp
similarity index 100%
rename from src/encode/SkJpegGainmapEncoder.cpp
rename to src/images/SkJpegGainmapEncoder.cpp
diff --git a/src/encode/SkPngEncoder.cpp b/src/images/SkPngEncoder.cpp
similarity index 99%
rename from src/encode/SkPngEncoder.cpp
rename to src/images/SkPngEncoder.cpp
index b2a2f66..d473bdc 100644
--- a/src/encode/SkPngEncoder.cpp
+++ b/src/images/SkPngEncoder.cpp
@@ -27,8 +27,8 @@
#include "modules/skcms/skcms.h"
#include "src/base/SkMSAN.h"
#include "src/codec/SkPngPriv.h"
-#include "src/encode/SkImageEncoderFns.h"
-#include "src/encode/SkImageEncoderPriv.h"
+#include "src/images/SkImageEncoderFns.h"
+#include "src/images/SkImageEncoderPriv.h"
#include <algorithm>
#include <csetjmp>
diff --git a/src/encode/SkWebpEncoder.cpp b/src/images/SkWebpEncoder.cpp
similarity index 98%
rename from src/encode/SkWebpEncoder.cpp
rename to src/images/SkWebpEncoder.cpp
index 2189b80..68c2ae1 100644
--- a/src/encode/SkWebpEncoder.cpp
+++ b/src/images/SkWebpEncoder.cpp
@@ -22,8 +22,8 @@
#include "include/encode/SkWebpEncoder.h"
#include "include/private/base/SkTemplates.h"
#include "src/core/SkImageInfoPriv.h"
-#include "src/encode/SkImageEncoderFns.h"
-#include "src/encode/SkImageEncoderPriv.h"
+#include "src/images/SkImageEncoderFns.h"
+#include "src/images/SkImageEncoderPriv.h"
#include <cstddef>
#include <cstdint>
diff --git a/src/pdf/BUILD.bazel b/src/pdf/BUILD.bazel
index d3e3c9e..8a1e705 100644
--- a/src/pdf/BUILD.bazel
+++ b/src/pdf/BUILD.bazel
@@ -89,7 +89,7 @@
selects.config_setting_group(
name = "uses_jpeg",
match_any = [
- "//src/encode:jpeg_encode_codec",
+ "//src/images:jpeg_encode_codec",
"//src/codec:jpeg_decode_codec",
],
)
diff --git a/src/ports/SkImageEncoder_CG.cpp b/src/ports/SkImageEncoder_CG.cpp
index a247d49..2544aaf 100644
--- a/src/ports/SkImageEncoder_CG.cpp
+++ b/src/ports/SkImageEncoder_CG.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "src/encode/SkImageEncoderPriv.h"
+#include "src/images/SkImageEncoderPriv.h"
#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
diff --git a/src/ports/SkImageEncoder_NDK.cpp b/src/ports/SkImageEncoder_NDK.cpp
index 5fc55d7..cc5cc0c 100644
--- a/src/ports/SkImageEncoder_NDK.cpp
+++ b/src/ports/SkImageEncoder_NDK.cpp
@@ -9,7 +9,7 @@
#include "include/core/SkStream.h"
#include "include/private/base/SkTFitsIn.h"
#include "include/private/base/SkTo.h"
-#include "src/encode/SkImageEncoderPriv.h"
+#include "src/images/SkImageEncoderPriv.h"
#include "src/ports/SkNDKConversions.h"
bool SkEncodeImageWithNDK(SkWStream* stream, const SkPixmap& pmap, SkEncodedImageFormat format,
diff --git a/src/ports/SkImageEncoder_WIC.cpp b/src/ports/SkImageEncoder_WIC.cpp
index 1a37e57..de79276 100644
--- a/src/ports/SkImageEncoder_WIC.cpp
+++ b/src/ports/SkImageEncoder_WIC.cpp
@@ -15,7 +15,7 @@
#include "include/core/SkUnPreMultiply.h"
#include "include/private/base/SkTemplates.h"
#include "src/base/SkAutoMalloc.h"
-#include "src/encode/SkImageEncoderPriv.h"
+#include "src/images/SkImageEncoderPriv.h"
#include "src/utils/win/SkAutoCoInitialize.h"
#include "src/utils/win/SkIStream.h"
#include "src/utils/win/SkTScopedComPtr.h"
diff --git a/tests/NdkEncodeTest.cpp b/tests/NdkEncodeTest.cpp
index 8a0151e..d1a6f7c 100644
--- a/tests/NdkEncodeTest.cpp
+++ b/tests/NdkEncodeTest.cpp
@@ -12,7 +12,7 @@
#include "include/core/SkImageEncoder.h"
#include "include/core/SkImageGenerator.h"
#include "include/private/base/SkMalloc.h"
-#include "src/encode/SkImageEncoderPriv.h"
+#include "src/images/SkImageEncoderPriv.h"
#include "tests/Test.h"
#include "tools/Resources.h"
#include "tools/ToolUtils.h"
diff --git a/toolchain/linux_trampolines/clang_trampoline_linux.sh b/toolchain/linux_trampolines/clang_trampoline_linux.sh
index 2b5ff02..4175dba 100755
--- a/toolchain/linux_trampolines/clang_trampoline_linux.sh
+++ b/toolchain/linux_trampolines/clang_trampoline_linux.sh
@@ -23,7 +23,7 @@
"src/codec/"
"src/effects/"
"src/image/"
- "src/encode/"
+ "src/images/"
"src/pathops/"
"src/sksl/"
"src/svg/"
