Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.5:Update
chromium.18118
chromium-118-system-freetype.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File chromium-118-system-freetype.patch of Package chromium.18118
https://github.com/chromium/chromium/commit/ed354d00aeda84693611b14baa56a287557a26b5 From ed354d00aeda84693611b14baa56a287557a26b5 Mon Sep 17 00:00:00 2001 From: Munira Tursunova <moonira@google.com> Date: Tue, 12 Sep 2023 11:54:48 +0000 Subject: [PATCH] Add check for use_system_freetype when importing private freetype header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In [0] the include of private freetype header was added, which caused build breakage when use_system_freetype=true, see [1]. This CL fixes the breakage by introducing USE_SYSTEM_FREETYPE build flag. [0] https://chromium-review.googlesource.com/c/chromium/src/+/4717485 [1] https://chromium-review.googlesource.com/c/chromium/src/+/4717485/comments/cdfca7b9_8e61b2e0 Bug: 1429581 Change-Id: I7f7de4cdb2dc46092a91a47d766bedb58ddccb7c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4843428 Commit-Queue: Munira Tursunova <moonira@google.com> Reviewed-by: Dominik Röttsches <drott@chromium.org> Reviewed-by: Rick Byers <rbyers@chromium.org> Cr-Commit-Position: refs/heads/main@{#1195323} --- third_party/BUILD.gn | 6 ++++++ third_party/blink/renderer/platform/BUILD.gn | 1 + .../renderer/platform/fonts/simple_font_data.cc | 12 +++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index 7b086f95413ffd0..4ce797ebad72211 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/buildflag_header.gni") import("//build/config/features.gni") import("//build/config/freetype/freetype.gni") import("//third_party/harfbuzz-ng/harfbuzz.gni") @@ -65,3 +66,8 @@ component("freetype_harfbuzz") { public_deps += [ "//third_party/harfbuzz-ng:harfbuzz_source" ] } } + +buildflag_header("freetype_buildflags") { + header = "freetype_buildflags.h" + flags = [ "USE_SYSTEM_FREETYPE=$use_system_freetype" ] +} diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn index 591d2f939605b01..f6a2cd2168d1ee5 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn @@ -1717,6 +1717,7 @@ component("platform") { "//services/viz/public/cpp/gpu", "//skia", "//skia:skcms", + "//third_party:freetype_buildflags", "//third_party:freetype_harfbuzz", "//third_party/abseil-cpp:absl", "//third_party/blink/public:image_resources", diff --git a/third_party/blink/renderer/platform/fonts/simple_font_data.cc b/third_party/blink/renderer/platform/fonts/simple_font_data.cc index abe06f35c14a5e0..b2bfd88f0d85db5 100644 --- a/third_party/blink/renderer/platform/fonts/simple_font_data.cc +++ b/third_party/blink/renderer/platform/fonts/simple_font_data.cc @@ -48,7 +48,7 @@ #include "third_party/blink/renderer/platform/wtf/math_extras.h" #include "third_party/blink/renderer/platform/wtf/text/character_names.h" #include "third_party/blink/renderer/platform/wtf/text/unicode.h" -#include "third_party/freetype/src/src/autofit/afws-decl.h" +#include "third_party/freetype_buildflags.h" #include "third_party/skia/include/core/SkFontMetrics.h" #include "third_party/skia/include/core/SkPath.h" #include "third_party/skia/include/core/SkTypeface.h" @@ -57,12 +57,22 @@ #include "ui/gfx/geometry/skia_conversions.h" #include "v8/include/v8.h" +#if !BUILDFLAG(USE_SYSTEM_FREETYPE) +#include "third_party/freetype/src/src/autofit/afws-decl.h" +#endif + namespace blink { constexpr float kSmallCapsFontSizeMultiplier = 0.7f; constexpr float kEmphasisMarkFontSizeMultiplier = 0.5f; + +#if !BUILDFLAG(USE_SYSTEM_FREETYPE) constexpr int32_t kFontObjectsMemoryConsumption = std::max(sizeof(AF_LatinMetricsRec), sizeof(AF_CJKMetricsRec)); +#else +// sizeof(AF_LatinMetricsRec) = 2128 +constexpr int32_t kFontObjectsMemoryConsumption = 2128; +#endif SimpleFontData::SimpleFontData(const FontPlatformData& platform_data, scoped_refptr<CustomFontData> custom_data,
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor