Upgrade to WebKitGTK 2.41.4

This commit is contained in:
Michael Catanzaro 2023-05-17 08:55:15 -05:00
parent c88765bc1c
commit 470cabb576
4 changed files with 4 additions and 57 deletions

1
.gitignore vendored
View File

@ -18,3 +18,4 @@
/webkitgtk-2.41.1.tar.xz.asc
/webkitgtk-2.41.2.tar.xz.asc
/webkitgtk-2.41.3.tar.xz.asc
/webkitgtk-2.41.4.tar.xz.asc

View File

@ -1,51 +0,0 @@
From 3b166862b8341d3361e3d804c31aacacb27a85dd Mon Sep 17 00:00:00 2001
From: Vitaly Dyachkov <vitaly@igalia.com>
Date: Fri, 21 Apr 2023 15:54:04 +0200
Subject: [PATCH] [WPE][GTK] Do not deref CreationData's buffer when Cairo font
is destroyed. https://bugs.webkit.org/show_bug.cgi?id=255785
Reviewed by NOBODY (OOPS!).
Since 263084@main `FontCustomPlatformData` takes
`FontPlatformData::CreationData` instead of `FragmentedSharedBuffer`.
The buffer is now a reference counted field of
`FontPlatformData::CreationData` struct and will be automatically
dereferenced when `FontCustomPlatformData` is destroyed.
It is an error to manually dereference it using Cairo font destroy
function.
* Source/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp:
(WebCore::FontCustomPlatformData::FontCustomPlatformData):
(WebCore::releaseCustomFontData): Deleted.
---
.../freetype/FontCustomPlatformDataFreeType.cpp | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/Source/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp b/Source/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
index e7857fe1818f..38daa2b7ff24 100644
--- a/Source/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
+++ b/Source/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
@@ -38,11 +38,6 @@
namespace WebCore {
-static void releaseCustomFontData(void* data)
-{
- static_cast<FragmentedSharedBuffer*>(data)->deref();
-}
-
static cairo_user_data_key_t freeTypeFaceKey;
FontCustomPlatformData::FontCustomPlatformData(FT_Face freeTypeFace, FontPlatformData::CreationData&& data)
@@ -50,11 +45,6 @@ FontCustomPlatformData::FontCustomPlatformData(FT_Face freeTypeFace, FontPlatfor
, creationData(WTFMove(data))
, m_renderingResourceIdentifier(RenderingResourceIdentifier::generate())
{
- static cairo_user_data_key_t bufferKey;
- auto buffer = creationData.fontFaceData;
- cairo_font_face_set_user_data(m_fontFace.get(), &bufferKey, &buffer,
- static_cast<cairo_destroy_func_t>(releaseCustomFontData));
-
// Cairo doesn't do FreeType reference counting, so we need to ensure that when
// this cairo_font_face_t is destroyed, it cleans up the FreeType face as well.
cairo_font_face_set_user_data(m_fontFace.get(), &freeTypeFaceKey, freeTypeFace,

View File

@ -1,2 +1,2 @@
SHA512 (webkitgtk-2.41.3.tar.xz) = ae80e919b809e2598ea9f9829288b48625a6a3baef9dcc083c372c4b26b0d8bb448adb46e22786a0c639871cd9a77cf06edf9dafa5697430c7dcc3ca976cf834
SHA512 (webkitgtk-2.41.3.tar.xz.asc) = a742d64098a7415dbfdf1b941756bb53940f1f057aba74808096c5c1664cb2cbadb4b97d4b6d1c6cebd5c69002fe3897ada7099b0912f334f8ddd8027136aa84
SHA512 (webkitgtk-2.41.4.tar.xz) = 561465fc63647982d6885299b625e0cb91eaa8b4832d44a7a4695ea890ba8339a053f80e83e6aa5cb1f6f49a977cd7148a74cf34df9a12f574e3981396b140ca
SHA512 (webkitgtk-2.41.4.tar.xz.asc) = 137313717924f7a7084455d1e4ea30ea59764adcb259d64def7a547a9cb2d60b52e29429b164ee33786ccfc74f8cbdbe64e21c1db90a6a4167ef41909c8c903f

View File

@ -16,7 +16,7 @@
%bcond_without docs
Name: webkitgtk
Version: 2.41.3
Version: 2.41.4
Release: %autorelease
Summary: GTK web content engine library
@ -29,9 +29,6 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
Source2: webkitgtk-keys.gpg
# https://github.com/WebKit/WebKit/pull/13029
Patch0: font-crashes.patch
BuildRequires: bison
BuildRequires: bubblewrap
BuildRequires: cmake