mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-07-30 20:59:16 +00:00
LibWebView+Services+UI: Move the Web plugins to LibWebView
This commit is contained in:
Timothy Flynn
Tim Flynn
parent
9e1f001ffe
commit
a14937c45e
Notes:
github-actions[bot]
2024-11-11 12:36:47 +00:00
Author: https://github.com/trflynn89
Commit: a14937c45e
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/2269
9 changed files with 22 additions and 34 deletions
|
|
@ -1,217 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2022-2023, Andreas Kling <andreas@ladybird.org>
|
||||
* Copyright (c) 2023, Linus Groh <linusg@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <AK/ByteString.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/TypeCasts.h>
|
||||
#include <LibCore/Resource.h>
|
||||
#include <LibCore/StandardPaths.h>
|
||||
#include <LibGfx/Font/FontDatabase.h>
|
||||
#include <LibGfx/Font/PathFontProvider.h>
|
||||
#include <UI/FontPlugin.h>
|
||||
|
||||
#ifdef USE_FONTCONFIG
|
||||
# include <fontconfig/fontconfig.h>
|
||||
#endif
|
||||
|
||||
namespace Ladybird {
|
||||
|
||||
FontPlugin::FontPlugin(bool is_layout_test_mode, Gfx::SystemFontProvider* font_provider)
|
||||
: m_is_layout_test_mode(is_layout_test_mode)
|
||||
{
|
||||
#ifdef USE_FONTCONFIG
|
||||
{
|
||||
auto fontconfig_initialized = FcInit();
|
||||
VERIFY(fontconfig_initialized);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (!font_provider)
|
||||
font_provider = &static_cast<Gfx::PathFontProvider&>(Gfx::FontDatabase::the().install_system_font_provider(make<Gfx::PathFontProvider>()));
|
||||
if (is<Gfx::PathFontProvider>(*font_provider)) {
|
||||
auto& path_font_provider = static_cast<Gfx::PathFontProvider&>(*font_provider);
|
||||
// Load anything we can find in the system's font directories
|
||||
for (auto const& path : Core::StandardPaths::font_directories().release_value_but_fixme_should_propagate_errors())
|
||||
path_font_provider.load_all_fonts_from_uri(MUST(String::formatted("file://{}", path)));
|
||||
}
|
||||
|
||||
update_generic_fonts();
|
||||
|
||||
auto default_font_name = generic_font_name(Web::Platform::GenericFont::UiSansSerif);
|
||||
m_default_font = Gfx::FontDatabase::the().get(default_font_name, 12.0, 400, Gfx::FontWidth::Normal, 0);
|
||||
VERIFY(m_default_font);
|
||||
|
||||
auto default_fixed_width_font_name = generic_font_name(Web::Platform::GenericFont::UiMonospace);
|
||||
m_default_fixed_width_font = Gfx::FontDatabase::the().get(default_fixed_width_font_name, 12.0, 400, Gfx::FontWidth::Normal, 0);
|
||||
VERIFY(m_default_fixed_width_font);
|
||||
}
|
||||
|
||||
FontPlugin::~FontPlugin() = default;
|
||||
|
||||
Gfx::Font& FontPlugin::default_font()
|
||||
{
|
||||
return *m_default_font;
|
||||
}
|
||||
|
||||
Gfx::Font& FontPlugin::default_fixed_width_font()
|
||||
{
|
||||
return *m_default_fixed_width_font;
|
||||
}
|
||||
|
||||
RefPtr<Gfx::Font> FontPlugin::default_emoji_font(float point_size)
|
||||
{
|
||||
FlyString default_emoji_font_name;
|
||||
|
||||
if (m_is_layout_test_mode) {
|
||||
default_emoji_font_name = "Noto Emoji"_fly_string;
|
||||
} else {
|
||||
#ifdef AK_OS_MACOS
|
||||
default_emoji_font_name = "Apple Color Emoji"_fly_string;
|
||||
#else
|
||||
default_emoji_font_name = "Noto Color Emoji"_fly_string;
|
||||
#endif
|
||||
}
|
||||
|
||||
return Gfx::FontDatabase::the().get(default_emoji_font_name, point_size, 400, Gfx::FontWidth::Normal, 0);
|
||||
}
|
||||
|
||||
#ifdef USE_FONTCONFIG
|
||||
static Optional<String> query_fontconfig_for_generic_family(Web::Platform::GenericFont generic_font)
|
||||
{
|
||||
char const* pattern_string = nullptr;
|
||||
switch (generic_font) {
|
||||
case Web::Platform::GenericFont::Cursive:
|
||||
pattern_string = "cursive";
|
||||
break;
|
||||
case Web::Platform::GenericFont::Fantasy:
|
||||
pattern_string = "fantasy";
|
||||
break;
|
||||
case Web::Platform::GenericFont::Monospace:
|
||||
pattern_string = "monospace";
|
||||
break;
|
||||
case Web::Platform::GenericFont::SansSerif:
|
||||
pattern_string = "sans-serif";
|
||||
break;
|
||||
case Web::Platform::GenericFont::Serif:
|
||||
pattern_string = "serif";
|
||||
break;
|
||||
case Web::Platform::GenericFont::UiMonospace:
|
||||
pattern_string = "monospace";
|
||||
break;
|
||||
case Web::Platform::GenericFont::UiRounded:
|
||||
pattern_string = "sans-serif";
|
||||
break;
|
||||
case Web::Platform::GenericFont::UiSansSerif:
|
||||
pattern_string = "sans-serif";
|
||||
break;
|
||||
case Web::Platform::GenericFont::UiSerif:
|
||||
pattern_string = "serif";
|
||||
break;
|
||||
default:
|
||||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
|
||||
auto* config = FcConfigGetCurrent();
|
||||
VERIFY(config);
|
||||
|
||||
FcPattern* pattern = FcNameParse(reinterpret_cast<FcChar8 const*>(pattern_string));
|
||||
VERIFY(pattern);
|
||||
|
||||
auto success = FcConfigSubstitute(config, pattern, FcMatchPattern);
|
||||
VERIFY(success);
|
||||
|
||||
FcDefaultSubstitute(pattern);
|
||||
|
||||
// Never select bitmap fonts.
|
||||
success = FcPatternAddBool(pattern, FC_SCALABLE, FcTrue);
|
||||
VERIFY(success);
|
||||
|
||||
// FIXME: Enable this once we can handle OpenType variable fonts.
|
||||
success = FcPatternAddBool(pattern, FC_VARIABLE, FcFalse);
|
||||
VERIFY(success);
|
||||
|
||||
Optional<String> name;
|
||||
FcResult result {};
|
||||
|
||||
if (auto* matched = FcFontMatch(config, pattern, &result)) {
|
||||
FcChar8* family = nullptr;
|
||||
if (FcPatternGetString(matched, FC_FAMILY, 0, &family) == FcResultMatch) {
|
||||
auto const* family_cstring = reinterpret_cast<char const*>(family);
|
||||
if (auto string = String::from_utf8(StringView { family_cstring, strlen(family_cstring) }); !string.is_error()) {
|
||||
name = string.release_value();
|
||||
}
|
||||
}
|
||||
FcPatternDestroy(matched);
|
||||
}
|
||||
FcPatternDestroy(pattern);
|
||||
return name;
|
||||
}
|
||||
#endif
|
||||
|
||||
void FontPlugin::update_generic_fonts()
|
||||
{
|
||||
// How we choose which system font to use for each CSS font:
|
||||
// 1. Try a list of known-suitable fonts with their names hard-coded below.
|
||||
|
||||
// This is rather weird, but it's how things work right now.
|
||||
// We should eventually have a way to query the system for the default font.
|
||||
// Furthermore, we should allow overriding via some kind of configuration mechanism.
|
||||
|
||||
m_generic_font_names.resize(static_cast<size_t>(Web::Platform::GenericFont::__Count));
|
||||
|
||||
auto update_mapping = [&](Web::Platform::GenericFont generic_font, ReadonlySpan<FlyString> fallbacks) {
|
||||
if (m_is_layout_test_mode) {
|
||||
m_generic_font_names[static_cast<size_t>(generic_font)] = "SerenitySans"_fly_string;
|
||||
return;
|
||||
}
|
||||
|
||||
RefPtr<Gfx::Font const> gfx_font;
|
||||
|
||||
#ifdef USE_FONTCONFIG
|
||||
auto name = query_fontconfig_for_generic_family(generic_font);
|
||||
if (name.has_value()) {
|
||||
gfx_font = Gfx::FontDatabase::the().get(name.value(), 16, 400, Gfx::FontWidth::Normal, 0);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (!gfx_font) {
|
||||
for (auto const& fallback : fallbacks) {
|
||||
gfx_font = Gfx::FontDatabase::the().get(fallback, 16, 400, Gfx::FontWidth::Normal, 0);
|
||||
if (gfx_font)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
m_generic_font_names[static_cast<size_t>(generic_font)] = gfx_font ? gfx_font->family() : String {};
|
||||
};
|
||||
|
||||
// Fallback fonts to look for if Gfx::Font can't load expected font
|
||||
// The lists are basically arbitrary, taken from https://www.w3.org/Style/Examples/007/fonts.en.html
|
||||
// (We also add Android-specific font names to the list from W3 where required.)
|
||||
Vector<FlyString> cursive_fallbacks { "Comic Sans MS"_fly_string, "Comic Sans"_fly_string, "Apple Chancery"_fly_string, "Bradley Hand"_fly_string, "Brush Script MT"_fly_string, "Snell Roundhand"_fly_string, "URW Chancery L"_fly_string, "Dancing Script"_fly_string };
|
||||
Vector<FlyString> fantasy_fallbacks { "Impact"_fly_string, "Luminari"_fly_string, "Chalkduster"_fly_string, "Jazz LET"_fly_string, "Blippo"_fly_string, "Stencil Std"_fly_string, "Marker Felt"_fly_string, "Trattatello"_fly_string, "Coming Soon"_fly_string };
|
||||
Vector<FlyString> monospace_fallbacks { "Andale Mono"_fly_string, "Courier New"_fly_string, "Courier"_fly_string, "FreeMono"_fly_string, "OCR A Std"_fly_string, "DejaVu Sans Mono"_fly_string, "Droid Sans Mono"_fly_string, "Liberation Mono"_fly_string };
|
||||
Vector<FlyString> sans_serif_fallbacks { "Arial"_fly_string, "Helvetica"_fly_string, "Verdana"_fly_string, "Trebuchet MS"_fly_string, "Gill Sans"_fly_string, "Noto Sans"_fly_string, "Avantgarde"_fly_string, "Optima"_fly_string, "Arial Narrow"_fly_string, "Liberation Sans"_fly_string, "Roboto"_fly_string };
|
||||
Vector<FlyString> serif_fallbacks { "Times"_fly_string, "Times New Roman"_fly_string, "Didot"_fly_string, "Georgia"_fly_string, "Palatino"_fly_string, "Bookman"_fly_string, "New Century Schoolbook"_fly_string, "American Typewriter"_fly_string, "Liberation Serif"_fly_string, "Roman"_fly_string, "Noto Serif"_fly_string };
|
||||
|
||||
update_mapping(Web::Platform::GenericFont::Cursive, cursive_fallbacks);
|
||||
update_mapping(Web::Platform::GenericFont::Fantasy, fantasy_fallbacks);
|
||||
update_mapping(Web::Platform::GenericFont::Monospace, monospace_fallbacks);
|
||||
update_mapping(Web::Platform::GenericFont::SansSerif, sans_serif_fallbacks);
|
||||
update_mapping(Web::Platform::GenericFont::Serif, serif_fallbacks);
|
||||
update_mapping(Web::Platform::GenericFont::UiMonospace, monospace_fallbacks);
|
||||
update_mapping(Web::Platform::GenericFont::UiRounded, sans_serif_fallbacks);
|
||||
update_mapping(Web::Platform::GenericFont::UiSansSerif, sans_serif_fallbacks);
|
||||
update_mapping(Web::Platform::GenericFont::UiSerif, serif_fallbacks);
|
||||
}
|
||||
|
||||
FlyString FontPlugin::generic_font_name(Web::Platform::GenericFont generic_font)
|
||||
{
|
||||
return m_generic_font_names[static_cast<size_t>(generic_font)];
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Andreas Kling <andreas@ladybird.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AK/RefPtr.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <LibGfx/Font/FontDatabase.h>
|
||||
#include <LibWeb/Platform/FontPlugin.h>
|
||||
|
||||
namespace Ladybird {
|
||||
|
||||
class FontPlugin final : public Web::Platform::FontPlugin {
|
||||
public:
|
||||
FontPlugin(bool is_layout_test_mode, Gfx::SystemFontProvider* = nullptr);
|
||||
virtual ~FontPlugin();
|
||||
|
||||
virtual Gfx::Font& default_font() override;
|
||||
virtual Gfx::Font& default_fixed_width_font() override;
|
||||
virtual RefPtr<Gfx::Font> default_emoji_font(float point_size) override;
|
||||
virtual FlyString generic_font_name(Web::Platform::GenericFont) override;
|
||||
|
||||
void update_generic_fonts();
|
||||
|
||||
private:
|
||||
Vector<FlyString> m_generic_font_names;
|
||||
RefPtr<Gfx::Font> m_default_font;
|
||||
RefPtr<Gfx::Font> m_default_fixed_width_font;
|
||||
bool m_is_layout_test_mode { false };
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
/*
|
||||
* 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 <UI/ImageCodecPlugin.h>
|
||||
#include <UI/Utilities.h>
|
||||
|
||||
namespace Ladybird {
|
||||
|
||||
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);
|
||||
}
|
||||
promise->resolve(move(decoded_image));
|
||||
return {};
|
||||
},
|
||||
[promise](auto& error) {
|
||||
promise->reject(Error::copy(error));
|
||||
});
|
||||
|
||||
return promise;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Dex♪ <dexes.ttp@gmail.com>
|
||||
* Copyright (c) 2022, Andreas Kling <andreas@ladybird.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LibImageDecoderClient/Client.h>
|
||||
#include <LibWeb/Platform/ImageCodecPlugin.h>
|
||||
|
||||
namespace Ladybird {
|
||||
|
||||
class ImageCodecPlugin final : public Web::Platform::ImageCodecPlugin {
|
||||
public:
|
||||
explicit ImageCodecPlugin(NonnullRefPtr<ImageDecoderClient::Client>);
|
||||
virtual ~ImageCodecPlugin() override;
|
||||
|
||||
virtual NonnullRefPtr<Core::Promise<Web::Platform::DecodedImage>> decode_image(ReadonlyBytes, Function<ErrorOr<void>(Web::Platform::DecodedImage&)> on_resolved, Function<void(Error&)> on_rejected) override;
|
||||
|
||||
void set_client(NonnullRefPtr<ImageDecoderClient::Client>);
|
||||
|
||||
private:
|
||||
RefPtr<ImageDecoderClient::Client> m_client;
|
||||
};
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue