bd93285811
This patch introduces the `Gfx::ColorSpace` class, this is basically a serializable wrapper for skia's SkColorSpace. Creation of the instances of this class (and thus ICC profiles parsing) is performed in the ImageDecoder process. Then the object is serialized and sent through IPC, to finally be handed to skia for rendering. However, to make sure that we're not making all LibGfx's users dependent on Skia as well, we need to ensure the `Gfx::ColorSpace` object has no dependency on objects from Skia. To that end, the only member of the `ColorSpace` class is the opaque `ColorSpaceImpl` struct. Though, there is on issue with that design, the code in `DisplayListPlayer.cpp` needs access to the underlying `sk_sp<SkColorSpace>`. It is provided by a template function, that is only specialized for this type. Doing this work allows us to pass the following WPT tests: - https://wpt.live/css/css-color/tagged-images-001.html - https://wpt.live/css/css-color/tagged-images-003.html - https://wpt.live/css/css-color/tagged-images-004.html - https://wpt.live/css/css-color/untagged-images-001.html Other test cases can also be found here: - https://github.com/svgeesus/PNG-ICC-tests Note that SkColorSpace support quite a limited amount of color spaces, so color profiles like the ones in [1] or the v4 profiles in [2] are not supported yet. In fact, SkColorSpace only accepts skcms_ICCProfile with a linear conversion to XYZ D50. [1] https://www.color.org/browsertest.xalter [2] https://www.color.org/version4html.xalter
68 lines
2.2 KiB
C++
68 lines
2.2 KiB
C++
/*
|
|
* Copyright (c) 2022, Dex♪ <dexes.ttp@gmail.com>
|
|
* Copyright (c) 2022, Andreas Kling <andreas@ladybird.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include <LibGfx/Bitmap.h>
|
|
#include <LibGfx/ImageFormats/ImageDecoder.h>
|
|
#include <LibImageDecoderClient/Client.h>
|
|
#include <LibWebView/Plugins/ImageCodecPlugin.h>
|
|
#include <LibWebView/Utilities.h>
|
|
|
|
namespace WebView {
|
|
|
|
ImageCodecPlugin::ImageCodecPlugin(NonnullRefPtr<ImageDecoderClient::Client> client)
|
|
: m_client(move(client))
|
|
{
|
|
m_client->on_death = [this] {
|
|
m_client = nullptr;
|
|
};
|
|
}
|
|
|
|
void ImageCodecPlugin::set_client(NonnullRefPtr<ImageDecoderClient::Client> client)
|
|
{
|
|
m_client = move(client);
|
|
m_client->on_death = [this] {
|
|
m_client = nullptr;
|
|
};
|
|
}
|
|
|
|
ImageCodecPlugin::~ImageCodecPlugin() = default;
|
|
|
|
NonnullRefPtr<Core::Promise<Web::Platform::DecodedImage>> ImageCodecPlugin::decode_image(ReadonlyBytes bytes, Function<ErrorOr<void>(Web::Platform::DecodedImage&)> on_resolved, Function<void(Error&)> on_rejected)
|
|
{
|
|
auto promise = Core::Promise<Web::Platform::DecodedImage>::construct();
|
|
if (on_resolved)
|
|
promise->on_resolution = move(on_resolved);
|
|
if (on_rejected)
|
|
promise->on_rejection = move(on_rejected);
|
|
|
|
if (!m_client) {
|
|
promise->reject(Error::from_string_literal("ImageDecoderClient is disconnected"));
|
|
return promise;
|
|
}
|
|
|
|
auto image_decoder_promise = m_client->decode_image(
|
|
bytes,
|
|
[promise](ImageDecoderClient::DecodedImage& result) -> ErrorOr<void> {
|
|
// FIXME: Remove this codec plugin and just use the ImageDecoderClient directly to avoid these copies
|
|
Web::Platform::DecodedImage decoded_image;
|
|
decoded_image.is_animated = result.is_animated;
|
|
decoded_image.loop_count = result.loop_count;
|
|
for (auto& frame : result.frames) {
|
|
decoded_image.frames.empend(move(frame.bitmap), frame.duration);
|
|
}
|
|
decoded_image.color_space = move(result.color_space);
|
|
promise->resolve(move(decoded_image));
|
|
return {};
|
|
},
|
|
[promise](auto& error) {
|
|
promise->reject(Error::copy(error));
|
|
});
|
|
|
|
return promise;
|
|
}
|
|
|
|
}
|