RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 03:07:35 +00:00
Code Issues Activity Actions

LibWeb+LibWebView+WebContent: Add Web::Platform::ImageCodecPlugin

Browse source 
This replaces the previous Web::ImageDecoding::Decoder interface.
While we're doing this, also move the SerenityOS implementation of this
interface from LibWebView to WebContent. That means we no longer have to
link with LibImageDecoderClient in applications that use a web view.
This commit is contained in:
Andreas Kling 2022-09-16 15:01:47 +02:00
parent 412b2313f3
commit cd7262ee56
14 changed files with 95 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibWeb/CMakeLists.txt
View file

@ -268,7 +268,6 @@ set(SOURCES
HTML/WorkerLocation.cpp
HTML/WorkerNavigator.cpp
HighResolutionTime/Performance.cpp
ImageDecoding.cpp
Infra/ByteSequences.cpp
IntersectionObserver/IntersectionObserver.cpp
Layout/BlockContainer.cpp
@ -355,6 +354,7 @@ set(SOURCES
Painting/TextPaintable.cpp
Platform/EventLoopPlugin.cpp
Platform/FontPlugin.cpp
Platform/ImageCodecPlugin.cpp
Platform/Timer.cpp
RequestIdleCallback/IdleDeadline.cpp
ResizeObserver/ResizeObserver.cpp

4
Userland/Libraries/LibWeb/HTML/HTMLLinkElement.cpp
View file

@ -12,9 +12,9 @@
#include <LibWeb/CSS/Parser/Parser.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/HTML/HTMLLinkElement.h>
#include <LibWeb/ImageDecoding.h>
#include <LibWeb/Loader/ResourceLoader.h>
#include <LibWeb/Page/Page.h>
#include <LibWeb/Platform/ImageCodecPlugin.h>
namespace Web::HTML {
@ -156,7 +156,7 @@ bool HTMLLinkElement::load_favicon_and_use_if_window_is_active()
return false;
RefPtr<Gfx::Bitmap> favicon_bitmap;
auto decoded_image = Web::ImageDecoding::Decoder::the().decode_image(resource()->encoded_data());
auto decoded_image = Platform::ImageCodecPlugin::the().decode_image(resource()->encoded_data());
if (!decoded_image.has_value() || decoded_image->frames.is_empty()) {
dbgln("Could not decode favicon {}", resource()->url());
return false;

32
Userland/Libraries/LibWeb/ImageDecoding.cpp
View file

@ -1,32 +0,0 @@
/*
* Copyright (c) 2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2022, Dex♪ <dexes.ttp@gmail.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibWeb/ImageDecoding.h>
namespace Web::ImageDecoding {
static RefPtr<Decoder> s_decoder;
Decoder::Decoder() = default;
Decoder::~Decoder() = default;
void Decoder::initialize(RefPtr<Decoder>&& decoder)
{
s_decoder = move(decoder);
}
Decoder& Decoder::the()
{
if (!s_decoder) [[unlikely]] {
dbgln("Web::ImageDecoding::Decoder was not initialized!");
VERIFY_NOT_REACHED();
}
return *s_decoder;
}
}

6
Userland/Libraries/LibWeb/Loader/FrameLoader.cpp
View file

@ -19,10 +19,10 @@
#include <LibWeb/HTML/HTMLIFrameElement.h>
#include <LibWeb/HTML/NavigationParams.h>
#include <LibWeb/HTML/Parser/HTMLParser.h>
#include <LibWeb/ImageDecoding.h>
#include <LibWeb/Loader/FrameLoader.h>
#include <LibWeb/Loader/ResourceLoader.h>
#include <LibWeb/Page/Page.h>
#include <LibWeb/Platform/ImageCodecPlugin.h>
#include <LibWeb/XML/XMLDocumentBuilder.h>
namespace Web {
@ -82,7 +82,7 @@ static bool build_text_document(DOM::Document& document, ByteBuffer const& data)
static bool build_image_document(DOM::Document& document, ByteBuffer const& data)
{
auto image = ImageDecoding::Decoder::the().decode_image(data);
auto image = Platform::ImageCodecPlugin::the().decode_image(data);
if (!image.has_value() || image->frames.is_empty())
return false;
auto const& frame = image->frames[0];
@ -215,7 +215,7 @@ bool FrameLoader::load(LoadRequest& request, Type type)
if (data.is_empty())
return;
RefPtr<Gfx::Bitmap> favicon_bitmap;
auto decoded_image = ImageDecoding::Decoder::the().decode_image(data);
auto decoded_image = Platform::ImageCodecPlugin::the().decode_image(data);
if (!decoded_image.has_value() || decoded_image->frames.is_empty()) {
dbgln("Could not decode favicon {}", favicon_url);
} else {

4
Userland/Libraries/LibWeb/Loader/ImageResource.cpp
View file

@ -6,8 +6,8 @@
#include <AK/Function.h>
#include <LibGfx/Bitmap.h>
#include <LibWeb/ImageDecoding.h>
#include <LibWeb/Loader/ImageResource.h>
#include <LibWeb/Platform/ImageCodecPlugin.h>
namespace Web {
@ -47,7 +47,7 @@ void ImageResource::decode_if_needed() const
if (!m_decoded_frames.is_empty())
return;
auto image = ImageDecoding::Decoder::the().decode_image(encoded_data());
auto image = Platform::ImageCodecPlugin::the().decode_image(encoded_data());
if (image.has_value()) {
m_loop_count = image.value().loop_count;

28
Userland/Libraries/LibWeb/Platform/ImageCodecPlugin.cpp Normal file
View file

@ -0,0 +1,28 @@
/*
* Copyright (c) 2021-2022, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2022, Dex♪ <dexes.ttp@gmail.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibWeb/Platform/ImageCodecPlugin.h>
namespace Web::Platform {
static ImageCodecPlugin* s_the;
ImageCodecPlugin::~ImageCodecPlugin() = default;
ImageCodecPlugin& ImageCodecPlugin::the()
{
VERIFY(s_the);
return *s_the;
}
void ImageCodecPlugin::install(ImageCodecPlugin& plugin)
{
VERIFY(!s_the);
s_the = &plugin;
}
}

17
Userland/Libraries/LibWeb/ImageDecoding.h → Userland/Libraries/LibWeb/Platform/ImageCodecPlugin.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020-2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2020-2022, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2022, Dex♪ <dexes.ttp@gmail.com>
*
* SPDX-License-Identifier: BSD-2-Clause
@ -9,9 +9,9 @@
#include <AK/RefPtr.h>
#include <AK/Vector.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/Forward.h>
namespace Web::ImageDecoding {
namespace Web::Platform {
struct Frame {
RefPtr<Gfx::Bitmap> bitmap;
@ -24,17 +24,14 @@ struct DecodedImage {
Vector<Frame> frames;
};
class Decoder : public RefCounted<Decoder> {
class ImageCodecPlugin {
public:
virtual ~Decoder();
static ImageCodecPlugin& the();
static void install(ImageCodecPlugin&);
static void initialize(RefPtr<Decoder>&&);
static Decoder& the();
virtual ~ImageCodecPlugin();
virtual Optional<DecodedImage> decode_image(ReadonlyBytes) = 0;
protected:
explicit Decoder();
};
}

3
Userland/Libraries/LibWebView/CMakeLists.txt
View file

@ -1,6 +1,5 @@
set(SOURCES
DOMTreeModel.cpp
ImageDecoderClientAdapter.cpp
OutOfProcessWebView.cpp
RequestServerAdapter.cpp
StylePropertiesModel.cpp
@ -16,6 +15,6 @@ set(GENERATED_SOURCES
)
serenity_lib(LibWebView webview)
target_link_libraries(LibWebView LibFileSystemAccessClient LibGfx LibGUI LibImageDecoderClient LibIPC LibProtocol LibWeb)
target_link_libraries(LibWebView LibFileSystemAccessClient LibGfx LibGUI LibIPC LibProtocol LibWeb)
add_subdirectory(DumpLayoutTree)

41
Userland/Libraries/LibWebView/ImageDecoderClientAdapter.cpp
View file

@ -1,41 +0,0 @@
/*
* Copyright (c) 2022, Dex♪ <dexes.ttp@gmail.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibImageDecoderClient/Client.h>
#include <LibWebView/ImageDecoderClientAdapter.h>
namespace WebView {
NonnullRefPtr<ImageDecoderClientAdapter> ImageDecoderClientAdapter::create()
{
return adopt_ref(*new ImageDecoderClientAdapter());
}
Optional<Web::ImageDecoding::DecodedImage> ImageDecoderClientAdapter::decode_image(ReadonlyBytes bytes)
{
if (!m_client) {
m_client = ImageDecoderClient::Client::try_create().release_value_but_fixme_should_propagate_errors();
m_client->on_death = [&] {
m_client = nullptr;
};
}
auto result_or_empty = m_client->decode_image(bytes);
if (!result_or_empty.has_value())
return {};
auto result = result_or_empty.release_value();
Web::ImageDecoding::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);
}
return decoded_image;
}
}

32
Userland/Libraries/LibWebView/ImageDecoderClientAdapter.h
View file

@ -1,32 +0,0 @@
/*
* Copyright (c) 2022, Dex♪ <dexes.ttp@gmail.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/NonnullRefPtr.h>
#include <LibWeb/ImageDecoding.h>
namespace ImageDecoderClient {
class Client;
}
namespace WebView {
class ImageDecoderClientAdapter : public Web::ImageDecoding::Decoder {
public:
static NonnullRefPtr<ImageDecoderClientAdapter> create();
virtual ~ImageDecoderClientAdapter() override = default;
virtual Optional<Web::ImageDecoding::DecodedImage> decode_image(ReadonlyBytes) override;
private:
explicit ImageDecoderClientAdapter() = default;
RefPtr<ImageDecoderClient::Client> m_client;
};
}