mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-01-22 09:12:13 -05:00
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
52 lines
1.6 KiB
C++
52 lines
1.6 KiB
C++
/*
|
|
* Copyright (c) 2020, Andreas Kling <andreas@ladybird.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <AK/HashMap.h>
|
|
#include <ImageDecoder/ImageDecoderClientEndpoint.h>
|
|
#include <ImageDecoder/ImageDecoderServerEndpoint.h>
|
|
#include <LibCore/Promise.h>
|
|
#include <LibGfx/ColorSpace.h>
|
|
#include <LibIPC/ConnectionToServer.h>
|
|
|
|
namespace ImageDecoderClient {
|
|
|
|
struct Frame {
|
|
NonnullRefPtr<Gfx::Bitmap> bitmap;
|
|
u32 duration { 0 };
|
|
};
|
|
|
|
struct DecodedImage {
|
|
bool is_animated { false };
|
|
Gfx::FloatPoint scale { 1, 1 };
|
|
u32 loop_count { 0 };
|
|
Vector<Frame> frames;
|
|
Gfx::ColorSpace color_space;
|
|
};
|
|
|
|
class Client final
|
|
: public IPC::ConnectionToServer<ImageDecoderClientEndpoint, ImageDecoderServerEndpoint>
|
|
, public ImageDecoderClientEndpoint {
|
|
C_OBJECT_ABSTRACT(Client);
|
|
|
|
public:
|
|
Client(IPC::Transport);
|
|
|
|
NonnullRefPtr<Core::Promise<DecodedImage>> decode_image(ReadonlyBytes, Function<ErrorOr<void>(DecodedImage&)> on_resolved, Function<void(Error&)> on_rejected, Optional<Gfx::IntSize> ideal_size = {}, Optional<ByteString> mime_type = {});
|
|
|
|
Function<void()> on_death;
|
|
|
|
private:
|
|
virtual void die() override;
|
|
|
|
virtual void did_decode_image(i64 image_id, bool is_animated, u32 loop_count, Gfx::BitmapSequence const& bitmap_sequence, Vector<u32> const& durations, Gfx::FloatPoint scale, Gfx::ColorSpace const& color_profile) override;
|
|
virtual void did_fail_to_decode_image(i64 image_id, String const& error_message) override;
|
|
|
|
HashMap<i64, NonnullRefPtr<Core::Promise<DecodedImage>>> m_pending_decoded_images;
|
|
};
|
|
|
|
}
|