From a57488a1f5c14c2114c57880b85c1bbc90024973 Mon Sep 17 00:00:00 2001
From: Leon Scroggins III <scroggo@google.com>
Date: Mon, 25 Jun 2018 14:01:29 -0400
Subject: Expose public factories for platform decoders

Bug: skia:8076

Move SkImageGeneratorCG and SkImageGeneratorWIC to include/ports/,
and make them SK_API.

Remove SkImageGeneratorCG::NewFromEncodedCG. No known clients are using
it, and it was a private API in src/. There is already a
MakeFromEncodedCG to replace it.

Similarly, switch WIC from New to Make.

Add a compile test for using them with
SetImageGeneratorFromEncodedDataFactory.

Change-Id: I897eb7a887b3736a6c614a68e38f38b6a1942cf1
Reviewed-on: https://skia-review.googlesource.com/137387
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
---
 include/ports/SkImageGeneratorCG.h  | 41 ++++++++++++++++++++++++++
 include/ports/SkImageGeneratorWIC.h | 58 +++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 include/ports/SkImageGeneratorCG.h
 create mode 100644 include/ports/SkImageGeneratorWIC.h

(limited to 'include/ports')

diff --git a/include/ports/SkImageGeneratorCG.h b/include/ports/SkImageGeneratorCG.h
new file mode 100644
index 0000000000..bdf445ae15
--- /dev/null
+++ b/include/ports/SkImageGeneratorCG.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2016 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
+
+#include "SkCGUtils.h"
+#include "SkData.h"
+#include "SkEncodedOrigin.h"
+#include "SkImageGenerator.h"
+#include "SkTemplates.h"
+
+class SK_API SkImageGeneratorCG : public SkImageGenerator {
+public:
+    static std::unique_ptr<SkImageGenerator> MakeFromEncodedCG(sk_sp<SkData>);
+
+protected:
+    sk_sp<SkData> onRefEncodedData() override;
+
+    bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const Options&)
+    override;
+
+private:
+    /*
+     * Takes ownership of the imageSrc
+     */
+    SkImageGeneratorCG(const SkImageInfo& info, const void* imageSrc, sk_sp<SkData> data,
+                       SkEncodedOrigin origin);
+
+    SkAutoTCallVProc<const void, CFRelease> fImageSrc;
+    sk_sp<SkData>                           fData;
+    const SkEncodedOrigin                   fOrigin;
+
+    typedef SkImageGenerator INHERITED;
+};
+
+#endif //defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
diff --git a/include/ports/SkImageGeneratorWIC.h b/include/ports/SkImageGeneratorWIC.h
new file mode 100644
index 0000000000..0ea0305a34
--- /dev/null
+++ b/include/ports/SkImageGeneratorWIC.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2016 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkTypes.h"
+
+#if defined(SK_BUILD_FOR_WIN)
+
+#include "SkData.h"
+#include "SkImageGenerator.h"
+#include "SkTemplates.h"
+#include "SkTScopedComPtr.h"
+
+#include <wincodec.h>
+
+/*
+ * Any Windows program that uses COM must initialize the COM library by calling
+ * the CoInitializeEx function.  In addition, each thread that uses a COM
+ * interface must make a separate call to this function.
+ *
+ * For every successful call to CoInitializeEx, the thread must call
+ * CoUninitialize before it exits.
+ *
+ * SkImageGeneratorWIC requires the COM library and leaves it to the client to
+ * initialize COM for their application.
+ *
+ * For more information on initializing COM, please see:
+ * https://msdn.microsoft.com/en-us/library/windows/desktop/ff485844.aspx
+ */
+class SK_API SkImageGeneratorWIC : public SkImageGenerator {
+public:
+    static std::unique_ptr<SkImageGenerator> MakeFromEncodedWIC(sk_sp<SkData>);
+
+protected:
+    sk_sp<SkData> onRefEncodedData() override;
+
+    bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const Options&)
+    override;
+
+private:
+    /*
+     * Takes ownership of the imagingFactory
+     * Takes ownership of the imageSource
+     */
+    SkImageGeneratorWIC(const SkImageInfo& info, IWICImagingFactory* imagingFactory,
+            IWICBitmapSource* imageSource, sk_sp<SkData>);
+
+    SkTScopedComPtr<IWICImagingFactory> fImagingFactory;
+    SkTScopedComPtr<IWICBitmapSource>   fImageSource;
+    sk_sp<SkData>                       fData;
+
+    typedef SkImageGenerator INHERITED;
+};
+
+#endif // SK_BUILD_FOR_WIN
-- 
cgit v1.2.3