From 455700d3795e25c05c21ed5d16d4009b1aaeda4c Mon Sep 17 00:00:00 2001
From: Aliaksandr Kalenik <kalenik.aliaksandr@gmail.com>
Date: Sun, 20 Apr 2025 01:18:46 +0200
Subject: [PATCH] LibGfx: Join SkiaFont.cpp into Font

No need to keep this function in a separate file.
---
 Libraries/LibGfx/CMakeLists.txt    |  1 -
 Libraries/LibGfx/Font/Font.cpp     |  8 ++++++++
 Libraries/LibGfx/Font/FontSkia.cpp | 23 -----------------------
 3 files changed, 8 insertions(+), 24 deletions(-)
 delete mode 100644 Libraries/LibGfx/Font/FontSkia.cpp

diff --git a/Libraries/LibGfx/CMakeLists.txt b/Libraries/LibGfx/CMakeLists.txt
index 47f36be5e1f..aa736e7b98d 100644
--- a/Libraries/LibGfx/CMakeLists.txt
+++ b/Libraries/LibGfx/CMakeLists.txt
@@ -13,7 +13,6 @@ set(SOURCES
     Font/Font.cpp
     Font/FontData.cpp
     Font/FontDatabase.cpp
-    Font/FontSkia.cpp
     Font/PathFontProvider.cpp
     Font/Typeface.cpp
     Font/TypefaceSkia.cpp
diff --git a/Libraries/LibGfx/Font/Font.cpp b/Libraries/LibGfx/Font/Font.cpp
index fca3a1436c3..103314d9def 100644
--- a/Libraries/LibGfx/Font/Font.cpp
+++ b/Libraries/LibGfx/Font/Font.cpp
@@ -129,4 +129,12 @@ hb_font_t* Font::harfbuzz_font() const
     return m_harfbuzz_font;
 }
 
+SkFont Font::skia_font(float scale) const
+{
+    auto const& sk_typeface = as<TypefaceSkia>(*m_typeface).sk_typeface();
+    auto sk_font = SkFont { sk_ref_sp(sk_typeface), pixel_size() * scale };
+    sk_font.setSubpixel(true);
+    return sk_font;
+}
+
 }
diff --git a/Libraries/LibGfx/Font/FontSkia.cpp b/Libraries/LibGfx/Font/FontSkia.cpp
deleted file mode 100644
index def42c411ab..00000000000
--- a/Libraries/LibGfx/Font/FontSkia.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2024, Aliaksandr Kalenik <kalenik.aliaksandr@gmail.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-#include <AK/TypeCasts.h>
-#include <LibGfx/Font/Font.h>
-#include <LibGfx/Font/TypefaceSkia.h>
-
-#include <core/SkFont.h>
-
-namespace Gfx {
-
-SkFont Font::skia_font(float scale) const
-{
-    auto const& sk_typeface = as<TypefaceSkia>(*m_typeface).sk_typeface();
-    auto sk_font = SkFont { sk_ref_sp(sk_typeface), pixel_size() * scale };
-    sk_font.setSubpixel(true);
-    return sk_font;
-}
-
-}