beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
ladybird/Ladybird/ImageCodecPlugin.cpp

53 lines
1.6 KiB
C++
Raw Normal View History

Ladybird: Implement the Web::Platform::ImageCodecPlugin interface ...and move it to separate files while we're at it.
2022-09-16 13:15:14 +00:00
/*
* Copyright (c) 2022, Dex♪ <dexes.ttp@gmail.com>
* Copyright (c) 2022, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
Ladybird: Rename classes ending with Ladybird Now that all the classes for Ladybird are in the Ladybird namespace, we don't need them named as Ladybird::FooBarLadybird. For the Qt-specific classes, we can tack on a Qt at the end for clarity, but FontPlugin and ImageCodecPlugin no longer have anything to do with Qt.
2023-08-02 18:01:17 +00:00
#include "ImageCodecPlugin.h"
Ladybird/Android: Create a service for ImageDecoder This follows the pattern for the other services spawned by WebContent. The notable quirk about this service is that it's actually spawned by the ImageCodecPlugin rather than in main.cpp in the non-Android port. As a result we needed to do some ifdef surgery to get all the pieces in place. But we can now load images in the Android port again :^).
2023-10-31 21:27:23 +00:00
#ifdef AK_OS_ANDROID
# include <Ladybird/Android/src/main/cpp/WebContentService.h>
#else
# include "HelperProcess.h"
#endif
Ladybird: Decode images out of process This patch brings a service to handle image decompression. With it comes security enhancement due to the process boundary. Indeed, consequences of a potential attack is reduced as only the decoder will crash without perturbing the WebContent process. It also allows us to display pages containing images that we claim to support but still make us crash, like for not-finished-yet decoders. As an example, we can now load https://jpegxl.info/jxl-art.html without crashing the WebContent process.
2023-09-08 10:30:50 +00:00
#include "Utilities.h"
Ladybird: Implement the Web::Platform::ImageCodecPlugin interface ...and move it to separate files while we're at it.
2022-09-16 13:15:14 +00:00
#include <LibGfx/Bitmap.h>
LibGfx: Move all image loaders and writers to a subdirectory
2023-03-21 18:58:06 +00:00
#include <LibGfx/ImageFormats/ImageDecoder.h>
Ladybird: Decode images out of process This patch brings a service to handle image decompression. With it comes security enhancement due to the process boundary. Indeed, consequences of a potential attack is reduced as only the decoder will crash without perturbing the WebContent process. It also allows us to display pages containing images that we claim to support but still make us crash, like for not-finished-yet decoders. As an example, we can now load https://jpegxl.info/jxl-art.html without crashing the WebContent process.
2023-09-08 10:30:50 +00:00
#include <LibImageDecoderClient/Client.h>
Ladybird: Implement the Web::Platform::ImageCodecPlugin interface ...and move it to separate files while we're at it.
2022-09-16 13:15:14 +00:00
namespace Ladybird {
Ladybird: Rename classes ending with Ladybird Now that all the classes for Ladybird are in the Ladybird namespace, we don't need them named as Ladybird::FooBarLadybird. For the Qt-specific classes, we can tack on a Qt at the end for clarity, but FontPlugin and ImageCodecPlugin no longer have anything to do with Qt.
2023-08-02 18:01:17 +00:00
ImageCodecPlugin::~ImageCodecPlugin() = default;
Ladybird: Implement the Web::Platform::ImageCodecPlugin interface ...and move it to separate files while we're at it.
2022-09-16 13:15:14 +00:00
Ladybird: Decode images out of process This patch brings a service to handle image decompression. With it comes security enhancement due to the process boundary. Indeed, consequences of a potential attack is reduced as only the decoder will crash without perturbing the WebContent process. It also allows us to display pages containing images that we claim to support but still make us crash, like for not-finished-yet decoders. As an example, we can now load https://jpegxl.info/jxl-art.html without crashing the WebContent process.
2023-09-08 10:30:50 +00:00
Optional<Web::Platform::DecodedImage> ImageCodecPlugin::decode_image(ReadonlyBytes bytes)
Ladybird: Implement the Web::Platform::ImageCodecPlugin interface ...and move it to separate files while we're at it.
2022-09-16 13:15:14 +00:00
{
Ladybird: Decode images out of process This patch brings a service to handle image decompression. With it comes security enhancement due to the process boundary. Indeed, consequences of a potential attack is reduced as only the decoder will crash without perturbing the WebContent process. It also allows us to display pages containing images that we claim to support but still make us crash, like for not-finished-yet decoders. As an example, we can now load https://jpegxl.info/jxl-art.html without crashing the WebContent process.
2023-09-08 10:30:50 +00:00
if (!m_client) {
Ladybird/Android: Create a service for ImageDecoder This follows the pattern for the other services spawned by WebContent. The notable quirk about this service is that it's actually spawned by the ImageCodecPlugin rather than in main.cpp in the non-Android port. As a result we needed to do some ifdef surgery to get all the pieces in place. But we can now load images in the Android port again :^).
2023-10-31 21:27:23 +00:00
#ifdef AK_OS_ANDROID
m_client = MUST(bind_service<ImageDecoderClient::Client>(&bind_image_decoder_java));
#else
Ladybird: Decode images out of process This patch brings a service to handle image decompression. With it comes security enhancement due to the process boundary. Indeed, consequences of a potential attack is reduced as only the decoder will crash without perturbing the WebContent process. It also allows us to display pages containing images that we claim to support but still make us crash, like for not-finished-yet decoders. As an example, we can now load https://jpegxl.info/jxl-art.html without crashing the WebContent process.
2023-09-08 10:30:50 +00:00
auto candidate_image_decoder_paths = get_paths_for_helper_process("ImageDecoder"sv).release_value_but_fixme_should_propagate_errors();
m_client = launch_image_decoder_process(candidate_image_decoder_paths).release_value_but_fixme_should_propagate_errors();
Ladybird/Android: Create a service for ImageDecoder This follows the pattern for the other services spawned by WebContent. The notable quirk about this service is that it's actually spawned by the ImageCodecPlugin rather than in main.cpp in the non-Android port. As a result we needed to do some ifdef surgery to get all the pieces in place. But we can now load images in the Android port again :^).
2023-10-31 21:27:23 +00:00
#endif
Ladybird: Decode images out of process This patch brings a service to handle image decompression. With it comes security enhancement due to the process boundary. Indeed, consequences of a potential attack is reduced as only the decoder will crash without perturbing the WebContent process. It also allows us to display pages containing images that we claim to support but still make us crash, like for not-finished-yet decoders. As an example, we can now load https://jpegxl.info/jxl-art.html without crashing the WebContent process.
2023-09-08 10:30:50 +00:00
m_client->on_death = [&] {
m_client = nullptr;
};
}
Ladybird: Implement the Web::Platform::ImageCodecPlugin interface ...and move it to separate files while we're at it.
2022-09-16 13:15:14 +00:00
Ladybird: Decode images out of process This patch brings a service to handle image decompression. With it comes security enhancement due to the process boundary. Indeed, consequences of a potential attack is reduced as only the decoder will crash without perturbing the WebContent process. It also allows us to display pages containing images that we claim to support but still make us crash, like for not-finished-yet decoders. As an example, we can now load https://jpegxl.info/jxl-art.html without crashing the WebContent process.
2023-09-08 10:30:50 +00:00
auto result_or_empty = m_client->decode_image(bytes);
if (!result_or_empty.has_value())
Ladybird: Implement the Web::Platform::ImageCodecPlugin interface ...and move it to separate files while we're at it.
2022-09-16 13:15:14 +00:00
return {};
Ladybird: Decode images out of process This patch brings a service to handle image decompression. With it comes security enhancement due to the process boundary. Indeed, consequences of a potential attack is reduced as only the decoder will crash without perturbing the WebContent process. It also allows us to display pages containing images that we claim to support but still make us crash, like for not-finished-yet decoders. As an example, we can now load https://jpegxl.info/jxl-art.html without crashing the WebContent process.
2023-09-08 10:30:50 +00:00
auto result = result_or_empty.release_value();
Ladybird: Implement the Web::Platform::ImageCodecPlugin interface ...and move it to separate files while we're at it.
2022-09-16 13:15:14 +00:00
Ladybird: Decode images out of process This patch brings a service to handle image decompression. With it comes security enhancement due to the process boundary. Indeed, consequences of a potential attack is reduced as only the decoder will crash without perturbing the WebContent process. It also allows us to display pages containing images that we claim to support but still make us crash, like for not-finished-yet decoders. As an example, we can now load https://jpegxl.info/jxl-art.html without crashing the WebContent process.
2023-09-08 10:30:50 +00:00
Web::Platform::DecodedImage decoded_image;
decoded_image.is_animated = result.is_animated;
decoded_image.loop_count = result.loop_count;
for (auto const& frame : result.frames) {
decoded_image.frames.empend(move(frame.bitmap), frame.duration);
Ladybird: Implement the Web::Platform::ImageCodecPlugin interface ...and move it to separate files while we're at it.
2022-09-16 13:15:14 +00:00
}
Ladybird: Decode images out of process This patch brings a service to handle image decompression. With it comes security enhancement due to the process boundary. Indeed, consequences of a potential attack is reduced as only the decoder will crash without perturbing the WebContent process. It also allows us to display pages containing images that we claim to support but still make us crash, like for not-finished-yet decoders. As an example, we can now load https://jpegxl.info/jxl-art.html without crashing the WebContent process.
2023-09-08 10:30:50 +00:00
return decoded_image;
Ladybird: Implement the Web::Platform::ImageCodecPlugin interface ...and move it to separate files while we're at it.
2022-09-16 13:15:14 +00:00
}
}
Reference in a new issue Copy permalink