Skip to content

Commit

Permalink
[wpewebkit] Add Preserve3d patch from upstream
Browse files Browse the repository at this point in the history
Fixes issues exposed by mediaplayer demo
  • Loading branch information
zhani committed Oct 16, 2024
1 parent 5fa008b commit 0179d92
Show file tree
Hide file tree
Showing 15 changed files with 454 additions and 21 deletions.
3 changes: 2 additions & 1 deletion recipes/wpewebkit.recipe
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@ class Recipe(recipe.Recipe):
'wpewebkit/0010-GTK-WPE-IPC-Connection-fails-to-unset-FD_CLOEXEC.patch',
'wpewebkit/0011-WPE-Auxiliary-processes-fail-to-launch-if-ProcessPro.patch',
'wpewebkit/0012-Add-Android-support-to-Skia-integration.patch',
'wpewebkit/0013-Remove-Float16Array-from-WebInspectorUI.patch'
'wpewebkit/0013-Remove-Float16Array-from-WebInspectorUI.patch',
'wpewebkit/0014-TextureMapper-Preserve-3d-layers-don-t-get-flattened.patch'
]
else:
self.append_env('LDFLAGS', '-lrt')
Expand Down
2 changes: 1 addition & 1 deletion recipes/wpewebkit/0001-Android-logging-macro.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 4d9121d87aab4d0866f4c570e26ed5a011b32d09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= <[email protected]>
Date: Tue, 25 May 2021 15:32:57 +0200
Subject: [PATCH 01/12] Android logging macro
Subject: [PATCH 01/14] Android logging macro

---
Source/WebKit/config.h | 3 +++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From ae486ebcc2ca2f5c40723af5c8e2f7a4f96909c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= <[email protected]>
Date: Tue, 25 May 2021 13:51:14 +0200
Subject: [PATCH 02/12] Implement Android WebProcess and NetworkProcess entry
Subject: [PATCH 02/14] Implement Android WebProcess and NetworkProcess entry
points

---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From e20f3344536da81cb533e03865fba97e59f3927f Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <[email protected]>
Date: Thu, 24 Mar 2022 09:41:17 +0200
Subject: [PATCH 03/12] Allow setting injected bundle and inspector lib paths
Subject: [PATCH 03/14] Allow setting injected bundle and inspector lib paths
in non dev mode

---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 231fd83807ef6e701e534567a5cb2690c3d5f203 Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <[email protected]>
Date: Sun, 22 May 2022 23:03:03 +0300
Subject: [PATCH 04/12] Workaround for Android emulator samplerExternalOES
Subject: [PATCH 04/14] Workaround for Android emulator samplerExternalOES
precision issue

For some unknown reason glShaderSource fails with 0x505 GL_OUT_OF_MEMORY
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 890959f49930b51a84b7af799825b3222f99b0e8 Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <[email protected]>
Date: Wed, 28 Sep 2022 15:13:08 +0300
Subject: [PATCH 05/12] Use ASharedMemory instead of shm
Subject: [PATCH 05/14] Use ASharedMemory instead of shm

---
.../platform/unix/SharedMemoryUnix.cpp | 63 +++++++++----------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 052e869d493ae989b1cd2141f4a95bfe0a355ecd Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <[email protected]>
Date: Wed, 25 Oct 2023 23:46:04 +0300
Subject: [PATCH 06/12] Enable Android on ANGLE for WebGL support
Subject: [PATCH 06/14] Enable Android on ANGLE for WebGL support

---
Source/ThirdParty/ANGLE/CMakeLists.txt | 2 ++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b78029f2b2c57eedbbb379b2a2a3b3e297c406b0 Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <[email protected]>
Date: Mon, 23 Sep 2024 13:51:10 +0300
Subject: [PATCH 07/12] Compile WebDriver as a library.
Subject: [PATCH 07/14] Compile WebDriver as a library.

---
Source/WebDriver/CMakeLists.txt | 4 ++--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From e65ac14d30368972c7cc40010765982263d8fcec Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <[email protected]>
Date: Thu, 12 Sep 2024 00:15:33 -0700
Subject: [PATCH 08/12] [WebDriver][WPE] Mouse interaction simulation needs to
Subject: [PATCH 08/14] [WebDriver][WPE] Mouse interaction simulation needs to
take accout device scale with old API
https://bugs.webkit.org/show_bug.cgi?id=279438

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 527878df784541243dd99e842e35f0703bfe11d3 Mon Sep 17 00:00:00 2001
From: Adrian Perez de Castro <[email protected]>
Date: Wed, 18 Sep 2024 07:11:34 -0700
Subject: [PATCH 09/12] [CMake][WPE] ENABLE_WPE_PLATFORM cannot be toggled
Subject: [PATCH 09/14] [CMake][WPE] ENABLE_WPE_PLATFORM cannot be toggled
https://bugs.webkit.org/show_bug.cgi?id=279879

Reviewed by Carlos Garcia Campos.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 68f64322a1b220c325dfa10afaf3041e83def3ef Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <[email protected]>
Date: Tue, 24 Sep 2024 03:16:13 -0700
Subject: [PATCH 10/12] [GTK][WPE] IPC::Connection fails to unset FD_CLOEXEC
Subject: [PATCH 10/14] [GTK][WPE] IPC::Connection fails to unset FD_CLOEXEC
https://bugs.webkit.org/show_bug.cgi?id=280256

Reviewed by Carlos Garcia Campos.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
From 372d71cc3c907917b572f58c319b5fd2bf62d592 Mon Sep 17 00:00:00 2001
From 67dfcd5df43b290b47a59f05c7b3c2658ff3f720 Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <[email protected]>
Date: Wed, 25 Sep 2024 08:52:32 +0300
Subject: [PATCH 11/12] [WPE] Auxiliary processes fail to launch if
Subject: [PATCH 11/14] [WPE] Auxiliary processes fail to launch if
ProcessProviderLibWPE when enabled
https://bugs.webkit.org/show_bug.cgi?id=280321

Reviewed by NOBODY (OOPS!).

The ProcessProviderLibWPE is only used in the UIProcess, but AuxiliaryProcessMainCommon::parseCommandLine attempts to check if ProcessProviderLibWPE is enabled. Since ProcessProviderLibWPE is never enabled for auxiliary processes, this causes a mismatch in the argument count for auxiliary processes in runtimes where ProcessProviderLibWPE is used. As a result, the auxiliary process never starts.
The ProcessProviderLibWPE is only used in the UIProcess, but
AuxiliaryProcessMainCommon::parseCommandLine attempts to check if
ProcessProviderLibWPE is enabled. Since ProcessProviderLibWPE is never
enabled for auxiliary processes, this causes a mismatch in the argument count
for auxiliary processes in runtimes where ProcessProviderLibWPE is used.
As a result, the auxiliary process never starts.

* Source/WebKit/Shared/unix/AuxiliaryProcessMain.cpp:
(WebKit::AuxiliaryProcessMainCommon::parseCommandLine):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From f40d89b20fb748a11061cd97114a128505c1bc8a Mon Sep 17 00:00:00 2001
From 448728d4475f1235fb94a16a29e32a516a1c4241 Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <[email protected]>
Date: Mon, 23 Sep 2024 16:28:50 +0300
Subject: [PATCH 12/12] Add Android support to Skia integration
Subject: [PATCH 12/14] Add Android support to Skia integration

---
Source/ThirdParty/skia/CMakeLists.txt | 23 +++++++++++++++++--
.../platform/graphics/skia/FontCacheSkia.cpp | 11 ++++++++-
2 files changed, 31 insertions(+), 3 deletions(-)
Source/ThirdParty/skia/CMakeLists.txt | 28 +++++++++++++++++--
.../platform/graphics/skia/FontCacheSkia.cpp | 11 +++++++-
2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/Source/ThirdParty/skia/CMakeLists.txt b/Source/ThirdParty/skia/CMakeLists.txt
index 756a9a4532cc..b29dac1a5d25 100644
index 756a9a4532cc..efe77f7fb965 100644
--- a/Source/ThirdParty/skia/CMakeLists.txt
+++ b/Source/ThirdParty/skia/CMakeLists.txt
@@ -1,10 +1,18 @@
Expand Down Expand Up @@ -45,7 +45,7 @@ index 756a9a4532cc..b29dac1a5d25 100644
src/ports/SkGlobalInitialization_default.cpp
src/ports/SkImageGenerator_skia.cpp
src/ports/SkOSFile_posix.cpp
@@ -892,6 +898,19 @@ add_library(Skia STATIC
@@ -892,6 +898,23 @@ add_library(Skia STATIC
modules/skcms/src/skcms_TransformSkx.cc
)

Expand All @@ -60,11 +60,23 @@ index 756a9a4532cc..b29dac1a5d25 100644
+else ()
+ target_sources(Skia PRIVATE src/ports/SkDebug_stdio.cpp)
+ target_sources(Skia PRIVATE src/ports/SkFontMgr_fontconfig.cpp)
+
+ target_link_libraries(Skia PRIVATE
+ Fontconfig::Fontconfig
+ )
+endif ()
+
if (USE_SYSTEM_MALLOC)
target_sources(Skia PRIVATE src/ports/SkMemory_malloc.cpp)
else ()
@@ -908,7 +931,6 @@ endif ()

target_link_libraries(Skia PRIVATE
Epoxy::Epoxy
- Fontconfig::Fontconfig
Freetype::Freetype
JPEG::JPEG
PNG::PNG
diff --git a/Source/WebCore/platform/graphics/skia/FontCacheSkia.cpp b/Source/WebCore/platform/graphics/skia/FontCacheSkia.cpp
index d49d11fed66e..95a15bb07c47 100644
--- a/Source/WebCore/platform/graphics/skia/FontCacheSkia.cpp
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 9a3139885a047037519bbfc4f3cc1d37f2105a1e Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <[email protected]>
Date: Wed, 16 Oct 2024 16:44:03 +0300
Subject: [PATCH 13/14] Remove Float16Array from WebInspectorUI

* Source/WebInspectorUI/UserInterface/Base/Utilities.js:
---
Source/WebInspectorUI/UserInterface/Base/Utilities.js | 1 -
1 file changed, 1 deletion(-)

diff --git a/Source/WebInspectorUI/UserInterface/Base/Utilities.js b/Source/WebInspectorUI/UserInterface/Base/Utilities.js
index 6636f4a391e1..5188992b4642 100644
--- a/Source/WebInspectorUI/UserInterface/Base/Utilities.js
+++ b/Source/WebInspectorUI/UserInterface/Base/Utilities.js
@@ -633,7 +633,6 @@ Object.defineProperty(Array, "isTypedArray",
|| constructor === Uint8ClampedArray
|| constructor === Uint16Array
|| constructor === Uint32Array
- || constructor === Float16Array
|| constructor === Float32Array
|| constructor === Float64Array;
}
--
2.43.0

Loading

0 comments on commit 0179d92

Please sign in to comment.