From 1d719312b4aa8226823e3ed347dbcd14a9a657f2 Mon Sep 17 00:00:00 2001
From: Kevin Lubick <kjlubick@google.com>
Date: Tue, 20 Jun 2023 16:56:44 -0400
Subject: [PATCH] Add decoder #includes to implementation files

Without these, the various Sk*Decoder::Decode functions were not properly
being marked with SK_API and were not visible to Chromium.

Change-Id: I29b5bb630e54a26205a8f562d61929d61bc4aaec
Bug: skia:13983
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/714237
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Auto-Submit: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Florin Malita <fmalita@google.com>
---
 include/codec/SkAvifDecoder.h   | 1 +
 include/codec/SkBmpDecoder.h    | 1 +
 include/codec/SkCodec.h         | 4 ++--
 include/codec/SkGifDecoder.h    | 1 +
 include/codec/SkIcoDecoder.h    | 1 +
 include/codec/SkJpegDecoder.h   | 1 +
 include/codec/SkJpegxlDecoder.h | 1 +
 include/codec/SkPngDecoder.h    | 1 +
 include/codec/SkRawDecoder.h    | 1 +
 include/codec/SkWbmpDecoder.h   | 1 +
 include/codec/SkWebpDecoder.h   | 1 +
 src/codec/SkAvifCodec.cpp       | 1 +
 src/codec/SkBmpCodec.cpp        | 1 +
 src/codec/SkIcoCodec.cpp        | 1 +
 src/codec/SkJpegCodec.cpp       | 1 +
 src/codec/SkJpegxlCodec.cpp     | 3 ++-
 src/codec/SkPngCodec.cpp        | 1 +
 src/codec/SkRawCodec.cpp        | 1 +
 src/codec/SkWbmpCodec.cpp       | 1 +
 src/codec/SkWebpCodec.cpp       | 1 +
 src/codec/SkWuffsCodec.cpp      | 1 +
 21 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/include/codec/SkAvifDecoder.h b/include/codec/SkAvifDecoder.h
index 4bd7bb7a81ce..a6d5c61aba16 100644
--- a/include/codec/SkAvifDecoder.h
+++ b/include/codec/SkAvifDecoder.h
@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;
diff --git a/include/codec/SkBmpDecoder.h b/include/codec/SkBmpDecoder.h
index 2463ddb9efab..752555242e0f 100644
--- a/include/codec/SkBmpDecoder.h
+++ b/include/codec/SkBmpDecoder.h
@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;
diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h
index f5c54ad1e186..2db242b2ad90 100644
--- a/include/codec/SkCodec.h
+++ b/include/codec/SkCodec.h
@@ -1021,7 +1021,7 @@ using MakeFromStreamCallback = std::unique_ptr<SkCodec> (*)(std::unique_ptr<SkSt
                                                             SkCodec::Result*,
                                                             DecodeContext);
 
-struct Decoder {
+struct SK_API Decoder {
     // By convention, we use all lowercase letters and go with the primary filename extension.
     // For example "png", "jpg", "ico", "webp", etc
     std::string id;
@@ -1033,7 +1033,7 @@ struct Decoder {
 // SkCodec::MakeFromStream. If a decoder with the same id already exists, this new decoder
 // will replace the existing one (in the same position). This is not thread-safe, so make sure all
 // initialization is done before the first call.
-void Register(Decoder d);
+void SK_API Register(Decoder d);
 }
 
 #endif // SkCodec_DEFINED
diff --git a/include/codec/SkGifDecoder.h b/include/codec/SkGifDecoder.h
index 0075882763cd..0d29842eb1dc 100644
--- a/include/codec/SkGifDecoder.h
+++ b/include/codec/SkGifDecoder.h
@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;
diff --git a/include/codec/SkIcoDecoder.h b/include/codec/SkIcoDecoder.h
index d9fb38300e90..b7bbf75e9a4b 100644
--- a/include/codec/SkIcoDecoder.h
+++ b/include/codec/SkIcoDecoder.h
@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;
diff --git a/include/codec/SkJpegDecoder.h b/include/codec/SkJpegDecoder.h
index 127bdc2d1e20..6728f7f83893 100644
--- a/include/codec/SkJpegDecoder.h
+++ b/include/codec/SkJpegDecoder.h
@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;
diff --git a/include/codec/SkJpegxlDecoder.h b/include/codec/SkJpegxlDecoder.h
index 369b33bcb543..a2e5fd8a2fcf 100644
--- a/include/codec/SkJpegxlDecoder.h
+++ b/include/codec/SkJpegxlDecoder.h
@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;
diff --git a/include/codec/SkPngDecoder.h b/include/codec/SkPngDecoder.h
index 8956a18add23..d7e320f71ae5 100644
--- a/include/codec/SkPngDecoder.h
+++ b/include/codec/SkPngDecoder.h
@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;
diff --git a/include/codec/SkRawDecoder.h b/include/codec/SkRawDecoder.h
index 4d1e42fa4ade..4cbdfe7c45b5 100644
--- a/include/codec/SkRawDecoder.h
+++ b/include/codec/SkRawDecoder.h
@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;
diff --git a/include/codec/SkWbmpDecoder.h b/include/codec/SkWbmpDecoder.h
index dd0f036ba94f..be208fec9fdf 100644
--- a/include/codec/SkWbmpDecoder.h
+++ b/include/codec/SkWbmpDecoder.h
@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;
diff --git a/include/codec/SkWebpDecoder.h b/include/codec/SkWebpDecoder.h
index c85c2ffc87f2..510657f40cca 100644
--- a/include/codec/SkWebpDecoder.h
+++ b/include/codec/SkWebpDecoder.h
@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;
diff --git a/src/codec/SkAvifCodec.cpp b/src/codec/SkAvifCodec.cpp
index c9ba56d9d167..cd55c4b85a5f 100644
--- a/src/codec/SkAvifCodec.cpp
+++ b/src/codec/SkAvifCodec.cpp
@@ -7,6 +7,7 @@
 
 #include "src/codec/SkAvifCodec.h"
 
+#include "include/codec/SkAvifDecoder.h"
 #include "include/codec/SkCodec.h"
 #include "include/codec/SkCodecAnimation.h"
 #include "include/core/SkColorType.h"
diff --git a/src/codec/SkBmpCodec.cpp b/src/codec/SkBmpCodec.cpp
index 4f23b31b049f..d7c1093bea8d 100644
--- a/src/codec/SkBmpCodec.cpp
+++ b/src/codec/SkBmpCodec.cpp
@@ -7,6 +7,7 @@
 
 #include "src/codec/SkBmpCodec.h"
 
+#include "include/codec/SkBmpDecoder.h"
 #include "include/core/SkData.h"
 #include "include/core/SkImageInfo.h"
 #include "include/core/SkRefCnt.h"
diff --git a/src/codec/SkIcoCodec.cpp b/src/codec/SkIcoCodec.cpp
index 6ba8c0c38417..ef5f9baea717 100644
--- a/src/codec/SkIcoCodec.cpp
+++ b/src/codec/SkIcoCodec.cpp
@@ -7,6 +7,7 @@
 
 #include "src/codec/SkIcoCodec.h"
 
+#include "include/codec/SkIcoDecoder.h"
 #include "include/core/SkData.h"
 #include "include/core/SkImageInfo.h"
 #include "include/core/SkRefCnt.h"
diff --git a/src/codec/SkJpegCodec.cpp b/src/codec/SkJpegCodec.cpp
index 830ab1ce1942..7cb9096c4bb3 100644
--- a/src/codec/SkJpegCodec.cpp
+++ b/src/codec/SkJpegCodec.cpp
@@ -8,6 +8,7 @@
 #include "src/codec/SkJpegCodec.h"
 
 #include "include/codec/SkCodec.h"
+#include "include/codec/SkJpegDecoder.h"
 #include "include/core/SkAlphaType.h"
 #include "include/core/SkColorType.h"
 #include "include/core/SkData.h"
diff --git a/src/codec/SkJpegxlCodec.cpp b/src/codec/SkJpegxlCodec.cpp
index a40ecb2036f3..a29ccc0df466 100644
--- a/src/codec/SkJpegxlCodec.cpp
+++ b/src/codec/SkJpegxlCodec.cpp
@@ -8,6 +8,7 @@
 #include "src/codec/SkJpegxlCodec.h"
 
 #include "include/codec/SkCodec.h"
+#include "include/codec/SkJpegxlDecoder.h"
 #include "include/core/SkColorType.h"
 #include "include/core/SkData.h"
 #include "include/core/SkImageInfo.h"
@@ -465,7 +466,7 @@ const SkFrameHolder* SkJpegxlCodec::getFrameHolder() const {
 // TODO(eustas): implement
 // SkSampler* SkJpegxlCodec::getSampler(bool /*createIfNecessary*/) { return nullptr; }
 
-namespace SkJpegDecoder {
+namespace SkJpegxlDecoder {
 bool IsJpegxl(const void* data, size_t len) {
     return SkJpegxlCodec::IsJpegxl(data, len);
 }
diff --git a/src/codec/SkPngCodec.cpp b/src/codec/SkPngCodec.cpp
index e17d9322a8dc..1953be4ec0ce 100644
--- a/src/codec/SkPngCodec.cpp
+++ b/src/codec/SkPngCodec.cpp
@@ -8,6 +8,7 @@
 #include "src/codec/SkPngCodec.h"
 
 #include "include/codec/SkPngChunkReader.h"
+#include "include/codec/SkPngDecoder.h"
 #include "include/core/SkAlphaType.h"
 #include "include/core/SkColor.h"
 #include "include/core/SkColorType.h"
diff --git a/src/codec/SkRawCodec.cpp b/src/codec/SkRawCodec.cpp
index 3dcd6298a286..b97efd667eed 100644
--- a/src/codec/SkRawCodec.cpp
+++ b/src/codec/SkRawCodec.cpp
@@ -8,6 +8,7 @@
 #include "src/codec/SkRawCodec.h"
 
 #include "include/codec/SkCodec.h"
+#include "include/codec/SkRawDecoder.h"
 #include "include/core/SkColorSpace.h"
 #include "include/core/SkData.h"
 #include "include/core/SkImageInfo.h"
diff --git a/src/codec/SkWbmpCodec.cpp b/src/codec/SkWbmpCodec.cpp
index f8ac294b9641..0a6714b4585b 100644
--- a/src/codec/SkWbmpCodec.cpp
+++ b/src/codec/SkWbmpCodec.cpp
@@ -8,6 +8,7 @@
 #include "src/codec/SkWbmpCodec.h"
 
 #include "include/codec/SkCodec.h"
+#include "include/codec/SkWbmpDecoder.h"
 #include "include/codec/SkEncodedImageFormat.h"
 #include "include/core/SkColorType.h"
 #include "include/core/SkData.h"
diff --git a/src/codec/SkWebpCodec.cpp b/src/codec/SkWebpCodec.cpp
index d071cbf7882c..c6e419c1de25 100644
--- a/src/codec/SkWebpCodec.cpp
+++ b/src/codec/SkWebpCodec.cpp
@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/codec/SkCodecAnimation.h"
+#include "include/codec/SkWebpDecoder.h"
 #include "include/core/SkAlphaType.h"
 #include "include/core/SkBitmap.h"
 #include "include/core/SkColorType.h"
diff --git a/src/codec/SkWuffsCodec.cpp b/src/codec/SkWuffsCodec.cpp
index be126417417e..4dc279bd20c5 100644
--- a/src/codec/SkWuffsCodec.cpp
+++ b/src/codec/SkWuffsCodec.cpp
@@ -8,6 +8,7 @@
 #include "include/codec/SkCodec.h"
 #include "include/codec/SkCodecAnimation.h"
 #include "include/codec/SkEncodedImageFormat.h"
+#include "include/codec/SkGifDecoder.h"
 #include "include/core/SkAlphaType.h"
 #include "include/core/SkBitmap.h"
 #include "include/core/SkBlendMode.h"