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

LibWeb+WebContent: Add abstraction layer for generic font families

Browse source 
Instead of hard-coding the names of system fonts to use for the CSS
generic fonts (like "sans-serif", "monospace", etc.) we now call out
to a Platform::FontPlugin and ask for the generic names.
This commit is contained in:
Andreas Kling 2022-09-08 11:55:12 +02:00
parent 26544f559c
commit 5c2e3d1637
8 changed files with 153 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Services/WebContent/CMakeLists.txt
View file

@ -11,6 +11,7 @@ set(SOURCES
ConnectionFromClient.cpp
ConsoleGlobalObject.cpp
EventLoopPluginSerenity.cpp
FontPluginSerenity.cpp
PageHost.cpp
TimerSerenity.cpp
WebContentClientEndpoint.h

44
Userland/Services/WebContent/FontPluginSerenity.cpp Normal file
View file

@ -0,0 +1,44 @@
/*
* Copyright (c) 2022, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "FontPluginSerenity.h"
#include <AK/String.h>
#include <LibGfx/Font/FontDatabase.h>
namespace WebContent {
FontPluginSerenity::FontPluginSerenity()
{
}
FontPluginSerenity::~FontPluginSerenity() = default;
String FontPluginSerenity::generic_font_name(Web::Platform::GenericFont generic_font)
{
// FIXME: Replace hard-coded font names with a relevant call to FontDatabase.
// Currently, we cannot request the default font's name, or request it at a specific size and weight.
// So, hard-coded font names it is.
switch (generic_font) {
case Web::Platform::GenericFont::SansSerif:
case Web::Platform::GenericFont::UiSansSerif:
case Web::Platform::GenericFont::Cursive:
case Web::Platform::GenericFont::UiRounded:
return "Katica";
case Web::Platform::GenericFont::Monospace:
case Web::Platform::GenericFont::UiMonospace:
return "Csilla";
case Web::Platform::GenericFont::Serif:
case Web::Platform::GenericFont::UiSerif:
return "Roman";
case Web::Platform::GenericFont::Fantasy:
return "Comic Book";
case Web::Platform::GenericFont::__Count:
VERIFY_NOT_REACHED();
}
VERIFY_NOT_REACHED();
}
}

22
Userland/Services/WebContent/FontPluginSerenity.h Normal file
View file

@ -0,0 +1,22 @@
/*
* Copyright (c) 2022, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/Vector.h>
#include <LibWeb/Platform/FontPlugin.h>
namespace WebContent {
class FontPluginSerenity final : public Web::Platform::FontPlugin {
public:
FontPluginSerenity();
virtual ~FontPluginSerenity();
virtual String generic_font_name(Web::Platform::GenericFont) override;
};
}

4
Userland/Services/WebContent/main.cpp
View file

@ -1,10 +1,11 @@
/*
* Copyright (c) 2020-2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2020-2022, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "EventLoopPluginSerenity.h"
#include "FontPluginSerenity.h"
#include <LibCore/EventLoop.h>
#include <LibCore/LocalServer.h>
#include <LibCore/System.h>
@ -31,6 +32,7 @@ ErrorOr<int> serenity_main(Main::Arguments)
TRY(Core::System::unveil(nullptr, nullptr));
Web::Platform::EventLoopPlugin::install(*new WebContent::EventLoopPluginSerenity);
Web::Platform::FontPlugin::install(*new WebContent::FontPluginSerenity);
Web::ImageDecoding::Decoder::initialize(WebView::ImageDecoderClientAdapter::create());
Web::WebSockets::WebSocketClientManager::initialize(TRY(WebView::WebSocketClientManagerAdapter::try_create()));