Attachment #228155 for bug #255528




# Created by: Michael Johnson <ahze@FreeBSD.org>

PORTNAME=	webkit
DISTVERSION=	2.34.0
PORTREVISION=	2
CATEGORIES=	www
MASTER_SITES=	https://webkitgtk.org/releases/
PKGNAMESUFFIX=	2-gtk3

CMAKE_ARGS=		-DPORT=GTK
CMAKE_OFF=		USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U} \
			ENABLE_GLES2 \
			USE_SYSTEMD \
			ENABLE_GAMEPAD
CMAKE_ON=		ENABLE_MINIBROWSER \
			USE_SYSTEM_MALLOC \
			USE_SOUP2
CMAKE_OFF_armv6=	ENABLE_JIT
CMAKE_OFF_armv7=	ENABLE_JIT
CMAKE_OFF_powerpc=	ENABLE_JIT

			libwpe-1.0.so:www/libwpe \
			libWPEBackend-fdo-1.0.so:www/wpebackend-fdo

post-patch:
	@${REINPLACE_CMD} -e 's|/usr/lib/browser/plugins|${BROWSER_PLUGINS_DIR}|' \
		${WRKSRC}/Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp

pre-configure:
# .if !exists() evaluates too early before cairo has a chance to be installed
	@if ! pkg-config --exists cairo-egl; then \

Lines 1-3 Link Here

(-)b/www/webkit2-gtk3/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1613230723	1	TIMESTAMP = 1632350519
2	SHA256 (gnome/webkitgtk-2.30.5.tar.xz) = 7d0dab08e3c5ae07bec80b2822ef42e952765d5724cac86eb23999bfed5a7f1f	2	SHA256 (gnome/webkitgtk-2.34.0.tar.xz) = 880c8ee626f67019f67557ca09e59a23ecf245e60f6173215f1a8823cb09af34
3	SIZE (gnome/webkitgtk-2.30.5.tar.xz) = 22311832	3	SIZE (gnome/webkitgtk-2.34.0.tar.xz) = 24998292




--- CMakeLists.txt.orig	2020-08-12 09:17:37 UTC
+++ CMakeLists.txt
@@ -109,9 +109,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64
     endif ()
 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
     set(WTF_CPU_X86 1)
-elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc|powerpc)")
     set(WTF_CPU_PPC 1)
-elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64|powerpc64)")
     set(WTF_CPU_PPC64 1)
 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
     set(WTF_CPU_PPC64LE 1)




--- Source/cmake/OptionsCommon.cmake.orig	2021-09-22 23:05:58 UTC
+++ Source/cmake/OptionsCommon.cmake
@@ -144,7 +144,7 @@ WEBKIT_CHECK_HAVE_FUNCTION(HAVE_VASPRINTF vasprintf)
 # Check for symbols
 WEBKIT_CHECK_HAVE_SYMBOL(HAVE_REGEX_H regexec regex.h)
 if (NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin"))
-    WEBKIT_CHECK_HAVE_SYMBOL(HAVE_PTHREAD_MAIN_NP pthread_main_np pthread_np.h)
+	#WEBKIT_CHECK_HAVE_SYMBOL(HAVE_PTHREAD_MAIN_NP pthread_main_np pthread_np.h)
 endif ()
 WEBKIT_CHECK_HAVE_SYMBOL(HAVE_TIMINGSAFE_BCMP timingsafe_bcmp string.h)
 # Windows has signal.h but is missing symbols that are used in calls to signal.
 WEBKIT_CHECK_HAVE_SYMBOL(HAVE_SIGNAL_H SIGTRAP signal.h)

Lines 1-6 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h (-2 / +2 lines)
1	--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2020-08-12 09:17:52 UTC	1	--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2021-09-22 23:05:58 UTC
2	+++ Source/JavaScriptCore/assembler/ARM64Assembler.h	2	+++ Source/JavaScriptCore/assembler/ARM64Assembler.h
3	@@ -2825,6 +2825,8 @@ class ARM64Assembler { (public)	3	@@ -2950,6 +2950,8 @@ class ARM64Assembler { (public)
4	{	4	{
5	#if OS(DARWIN)	5	#if OS(DARWIN)
6	sys_cache_control(kCacheFunctionPrepareForExecution, code, size);	6	sys_cache_control(kCacheFunctionPrepareForExecution, code, size);

Lines 1-6 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h (-2 / +2 lines)
1	--- Source/JavaScriptCore/assembler/ARMv7Assembler.h.orig 2020-08-12 09:17:52 UTC	1	--- Source/JavaScriptCore/assembler/ARMv7Assembler.h.orig 2021-09-22 23:05:58 UTC
2	+++ Source/JavaScriptCore/assembler/ARMv7Assembler.h	2	+++ Source/JavaScriptCore/assembler/ARMv7Assembler.h
3	@@ -2396,6 +2396,8 @@ class ARMv7Assembler { (public)	3	@@ -2402,6 +2402,8 @@ class ARMv7Assembler { (public)
4	{	4	{
5	#if OS(DARWIN)	5	#if OS(DARWIN)
6	sys_cache_control(kCacheFunctionPrepareForExecution, code, size);	6	sys_cache_control(kCacheFunctionPrepareForExecution, code, size);

Lines 1-6 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp (-2 / +2 lines)
1	--- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig 2021-02-07 10:45:05 UTC	1	--- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig 2021-09-22 23:05:58 UTC
2	+++ Source/JavaScriptCore/jit/ExecutableAllocator.cpp	2	+++ Source/JavaScriptCore/jit/ExecutableAllocator.cpp
3	@@ -76,7 +76,7 @@ namespace JSC {	3	@@ -95,7 +95,7 @@ namespace JSC {
4		4
5	using namespace WTF;	5	using namespace WTF;
6		6

Lines 1-6 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jsc.cpp (-2 / +2 lines)
1	--- Source/JavaScriptCore/jsc.cpp.orig 2020-08-12 09:17:53 UTC	1	--- Source/JavaScriptCore/jsc.cpp.orig 2021-09-22 23:05:58 UTC
2	+++ Source/JavaScriptCore/jsc.cpp	2	+++ Source/JavaScriptCore/jsc.cpp
3	@@ -94,6 +94,9 @@	3	@@ -100,6 +100,9 @@
4	#else	4	#else
5	#include <unistd.h>	5	#include <unistd.h>
6	#endif	6	#endif

Lines 1-6 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64.rb (-2 / +2 lines)
1	--- Source/JavaScriptCore/offlineasm/arm64.rb.orig 2020-08-12 09:17:53 UTC	1	--- Source/JavaScriptCore/offlineasm/arm64.rb.orig 2021-09-22 23:05:58 UTC
2	+++ Source/JavaScriptCore/offlineasm/arm64.rb	2	+++ Source/JavaScriptCore/offlineasm/arm64.rb
3	@@ -1098,7 +1098,7 @@ class Instruction	3	@@ -1127,7 +1127,7 @@ class Instruction
4	$asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, #{operands[0].asmLabel}@GOTPAGEOFF]"	4	$asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, #{operands[0].asmLabel}@GOTPAGEOFF]"
5		5
6	# On Linux, use ELF GOT relocation specifiers.	6	# On Linux, use ELF GOT relocation specifiers.

Lines 1-4 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_runtime_NativeExecutable.cpp (-2 / +2 lines)
1	--- Source/JavaScriptCore/runtime/NativeExecutable.cpp.orig 2021-02-15 20:45:27 UTC	1	--- Source/JavaScriptCore/runtime/NativeExecutable.cpp.orig 2021-09-22 23:05:58 UTC
2	+++ Source/JavaScriptCore/runtime/NativeExecutable.cpp	2	+++ Source/JavaScriptCore/runtime/NativeExecutable.cpp
3	@@ -24,6 +24,7 @@	3	@@ -24,6 +24,7 @@
4	*/	4	*/
Lines 7-10 Link Here
7	+#include "ExecutableBaseInlines.h"	7	+#include "ExecutableBaseInlines.h"
8	#include "NativeExecutable.h"	8	#include "NativeExecutable.h"
9		9
10	#include "JSCInlines.h"	10	#include "ExecutableBaseInlines.h"




--- Source/WTF/wtf/RAMSize.cpp.orig	2021-09-22 23:29:42 UTC
+++ Source/WTF/wtf/RAMSize.cpp
@@ -35,6 +35,8 @@
 #if OS(LINUX)
 #include <sys/sysinfo.h>
 #elif OS(UNIX)
 #include <unistd.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
 #endif // OS(LINUX) || OS(UNIX)
 #else
 #include <bmalloc/bmalloc.h>
@@ -56,14 +58,18 @@ static size_t computeRAMSize()
@@ -54,10 +58,18 @@ static size_t computeRAMSize()
         return ramSizeGuess;
     return status.ullTotalPhys;
 #elif USE(SYSTEM_MALLOC)

     struct sysinfo si;
     sysinfo(&si);
     return si.totalram * si.mem_unit;
 #elif OS(UNIX)
-    long pages = sysconf(_SC_PHYS_PAGES);
-    long pageSize = sysconf(_SC_PAGE_SIZE);
-    return pages * pageSize;
+    size_t physmem, len;
+    int mib[2] = { CTL_HW, HW_PHYSMEM };
+    if (sysctl(mib, 2, &physmem, &len, NULL, 0) == 0
+	&& len == sizeof(physmem))
+	return physmem;
+    else
+	return 512 * MB; // guess
 #else
 #error "Missing a platform specific way of determining the available RAM"
 #endif // OS(LINUX) || OS(FREEBSD) || OS(UNIX)

Lines 1-4 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_unix_MemoryPressureHandlerUnix.cpp (-2 / +2 lines)
1	--- Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp.orig 2020-08-12 09:17:54 UTC	1	--- Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp.orig 2021-09-22 23:05:58 UTC
2	+++ Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp	2	+++ Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp
3	@@ -28,7 +28,7 @@	3	@@ -28,7 +28,7 @@
4	#include "config.h"	4	#include "config.h"
Lines 7-11 Link Here
7	-#include <malloc.h>	7	-#include <malloc.h>
8	+#include <stdlib.h>	8	+#include <stdlib.h>
9	#include <unistd.h>	9	#include <unistd.h>
		10	#include <wtf/Logging.h>
10	#include <wtf/MainThread.h>	11	#include <wtf/MainThread.h>
11	#include <wtf/MemoryFootprint.h>

Removed Link Here

(-)a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_egl_GLContextEGL.cpp (-11 lines)
1	--- Source/WebCore/platform/graphics/egl/GLContextEGL.cpp.orig 2018-07-25 11:56:31 UTC
2	+++ Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
3	@@ -45,6 +45,8 @@
4	#include "OpenGLShims.h"
5	#endif
6
7	+#include <X11/Xlib.h>
8	+
9	#if ENABLE(ACCELERATED_2D_CANVAS)
10	// cairo-gl.h includes some definitions from GLX that conflict with
11	// the ones provided by us. Since GLContextEGL doesn't use any GLX




Regressed by https://github.com/KhronosGroup/EGL-Registry/commit/64aa561f1971
Part of https://github.com/WebKit/WebKit/commit/29421afdcd64

Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:132:5: error: unknown type name 'XVisualInfo'
    XVisualInfo visualTemplate;
    ^
Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:136:5: error: unknown type name 'XVisualInfo'
    XVisualInfo* visualInfo = XGetVisualInfo(m_display, VisualScreenMask, &visualTemplate, &visualCount);
    ^
Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:136:57: error: use of undeclared identifier 'VisualScreenMask'
    XVisualInfo* visualInfo = XGetVisualInfo(m_display, VisualScreenMask, &visualTemplate, &visualCount);
                                                        ^

--- Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp.orig	2020-08-12 09:17:55 UTC
+++ Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
@@ -32,6 +32,7 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/Xcomposite.h>
 #if PLATFORM(GTK)
+#include <X11/Xutil.h>
 #include <X11/extensions/Xdamage.h>
 #endif
 

Lines 1-6 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_network_DNS.h (-2 / +2 lines)
1	--- Source/WebCore/platform/network/DNS.h.orig 2020-09-30 07:03:48 UTC	1	--- Source/WebCore/platform/network/DNS.h.orig 2021-09-22 23:05:58 UTC
2	+++ Source/WebCore/platform/network/DNS.h	2	+++ Source/WebCore/platform/network/DNS.h
3	@@ -29,6 +29,7 @@	3	@@ -33,6 +33,7 @@
4	#include <winsock2.h>	4	#include <winsock2.h>
5	#include <ws2tcpip.h>	5	#include <ws2tcpip.h>
6	#else	6	#else

Lines 1-6 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h (-2 / +2 lines)
1	--- Source/bmalloc/bmalloc/BPlatform.h.orig 2020-08-12 09:17:57 UTC	1	--- Source/bmalloc/bmalloc/BPlatform.h.orig 2021-09-22 23:05:58 UTC
2	+++ Source/bmalloc/bmalloc/BPlatform.h	2	+++ Source/bmalloc/bmalloc/BPlatform.h
3	@@ -159,6 +159,7 @@	3	@@ -163,6 +163,7 @@
4	#elif defined(__ARM_ARCH_6__) \	4	#elif defined(__ARM_ARCH_6__) \
5	\|\| defined(__ARM_ARCH_6J__) \	5	\|\| defined(__ARM_ARCH_6J__) \
6	\|\| defined(__ARM_ARCH_6K__) \	6	\|\| defined(__ARM_ARCH_6K__) \




--- Source/cmake/WebKitCommon.cmake.orig	2021-09-22 23:05:58 UTC
+++ Source/cmake/WebKitCommon.cmake
@@ -106,9 +106,9 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
         endif ()
     elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
         set(WTF_CPU_X86 1)
-    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
+    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc|powerpc)")
         set(WTF_CPU_PPC 1)
-    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
+    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64|powerpc64)")
         set(WTF_CPU_PPC64 1)
     elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
         set(WTF_CPU_PPC64LE 1)




Regressed by: https://github.com/WebKit/WebKit/commit/11ccaf183fad

GStreamer.cpp.o -c /wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/p
latform/graphics/gstreamer/MediaSampleGStreamer.cpp
/wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/platform/graphics/gs
treamer/MediaSampleGStreamer.cpp:220:12: error: call to implicitly-deleted copy constructor o
f 'WebCore::PlatformSample'
    return sample;
           ^~~~~~
/wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/platform/MediaSample
.h:57:7: note: copy constructor of 'PlatformSample' is implicitly deleted because field 'samp
le' has a deleted copy constructor
    } sample;
      ^
/wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/platform/MediaSample
.h:56:66: note: copy constructor of '' is implicitly deleted because variant field 'byteRange
Sample' has a non-trivial copy constructor
        std::pair<MTPluginByteSourceRef, CMFormatDescriptionRef> byteRangeSample;
                                                                 ^
1 error generated.

diff --git Source/WTF/wtf/PlatformHave.h Source/WTF/wtf/PlatformHave.h
index 4c5f1d2..e61e7fc 100644
--- Source/WTF/wtf/PlatformHave.h
+++ Source/WTF/wtf/PlatformHave.h
@@ -909,6 +909,12 @@
 #endif
 #endif
 
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 110300
+#if !defined(HAVE_MT_PLUGIN_SAMPLE_CURSOR_PLAYABLE_HORIZON)
+#define HAVE_MT_PLUGIN_SAMPLE_CURSOR_PLAYABLE_HORIZON 1
+#endif
+#endif
+
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 110200) \
     || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140400)
 #define HAVE_AVCONTENTKEYREQUEST_PENDING_PROTECTION_STATUS 1
diff --git Source/WebCore/page/RuntimeEnabledFeatures.h Source/WebCore/page/RuntimeEnabledFeatures.h
index c97386f..6bb9794 100644
--- Source/WebCore/page/RuntimeEnabledFeatures.h
+++ Source/WebCore/page/RuntimeEnabledFeatures.h
@@ -243,6 +243,11 @@ public:
     void setDisableMediaExperiencePIDInheritance(bool isDisabled) { m_disableMediaExperiencePIDInheritance = isDisabled; }
     bool disableMediaExperiencePIDInheritance() const { return m_disableMediaExperiencePIDInheritance; }
 #endif
+    
+#if HAVE(MT_PLUGIN_FORMAT_READER)
+    void setWebMFormatReaderEnabled(bool isEnabled) { m_webMFormatReaderEnabled = isEnabled; }
+    bool webMFormatReaderEnabled() const { return m_webMFormatReaderEnabled; }
+#endif
 
 #if ENABLE(VORBIS)
     WEBCORE_EXPORT void setVorbisDecoderEnabled(bool isEnabled);
@@ -375,6 +380,10 @@ private:
     bool m_webMFormatReaderEnabled { false };
 #endif
 
+#if HAVE(MT_PLUGIN_FORMAT_READER)
+    bool m_webMFormatReaderEnabled { false };
+#endif
+
 #if ENABLE(MEDIA_SOURCE)
     bool m_webMParserEnabled { false };
     bool m_webMWebAudioEnabled { false };
diff --git Source/WebCore/platform/MediaSample.h Source/WebCore/platform/MediaSample.h
index 0847b97..d34ba7f 100644
--- Source/WebCore/platform/MediaSample.h
+++ Source/WebCore/platform/MediaSample.h
@@ -34,8 +34,6 @@
 
 typedef struct opaqueCMSampleBuffer *CMSampleBufferRef;
 typedef struct _GstSample GstSample;
-typedef struct OpaqueMTPluginByteSource *MTPluginByteSourceRef;
-typedef const struct opaqueCMFormatDescription *CMFormatDescriptionRef;
 
 namespace WebCore {
 
@@ -47,13 +45,11 @@ struct PlatformSample {
         MockSampleBoxType,
         CMSampleBufferType,
         GStreamerSampleType,
-        ByteRangeSampleType,
     } type;
     union {
         MockSampleBox* mockSampleBox;
         CMSampleBufferRef cmSampleBuffer;
         GstSample* gstSample;
-        std::pair<MTPluginByteSourceRef, CMFormatDescriptionRef> byteRangeSample;
     } sample;
 };
 
@@ -91,12 +87,6 @@ public:
     virtual SampleFlags flags() const = 0;
     virtual PlatformSample platformSample() = 0;
 
-    struct ByteRange {
-        size_t byteOffset { 0 };
-        size_t byteLength { 0 };
-    };
-    virtual std::optional<ByteRange> byteRange() const = 0;
-
     enum class VideoRotation {
         None = 0,
         UpsideDown = 180,
diff --git Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h
index d7a49b9..874c3dc 100644
--- Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h
+++ Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h
@@ -57,7 +57,6 @@ public:
     Ref<MediaSample> createNonDisplayingCopy() const override;
     SampleFlags flags() const override { return m_flags; }
     PlatformSample platformSample() override;
-    std::optional<ByteRange> byteRange() const override { return std::nullopt; }
     void dump(PrintStream&) const override;
     RefPtr<JSC::Uint8ClampedArray> getRGBAImageData() const final;
 
diff --git Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp
index 5cb60b9..83da5b0 100644
--- Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp
+++ Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp
@@ -62,7 +62,6 @@ private:
     size_t sizeInBytes() const override { return sizeof(m_box); }
     SampleFlags flags() const override;
     PlatformSample platformSample() override;
-    std::optional<ByteRange> byteRange() const override { return std::nullopt; }
     FloatSize presentationSize() const override { return FloatSize(); }
     void dump(PrintStream&) const override;
     void offsetTimestampsBy(const MediaTime& offset) override { m_box.offsetTimestampsBy(offset); }
diff --git Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp
index 496e42a..43664ed 100644
--- Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp
+++ Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp
@@ -23,14 +23,15 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <WebKit/WKMediaFormatReader.h>
+#include "config.h"
 
-extern "C" WK_EXPORT OSStatus CreateMediaFormatReaderInstance(MTPluginByteSourceRef, CFAllocatorRef, CFDictionaryRef, MTPluginFormatReaderRef*);
+#if HAVE(MT_PLUGIN_FORMAT_READER)
 
-OSStatus CreateMediaFormatReaderInstance(MTPluginByteSourceRef byteSource, CFAllocatorRef allocator, CFDictionaryRef, MTPluginFormatReaderRef* formatReader)
+OSStatus CreateMediaFormatReaderInstance(MTPluginByteSourceRef, CFAllocatorRef, CFDictionary
+Ref, MTPluginFormatReaderRef* formatReader)
 {
-    OSStatus status = WKMediaFormatReaderCreate(allocator, formatReader);
-    if (status != noErr)
-        return status;
-    return WKMediaFormatReaderStartOnMainThread(*formatReader, byteSource);
+	*formatReader = nullptr;
+	return kMTPluginFormatReaderError_InternalFailure;
 }
+
+#endif // HAVE(MT_PLUGIN_FORMAT_READER)
diff --git Source/WebKit/Shared/WebPreferencesDefaultValues.cpp Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
index 8b24061..83e3a04 100644
--- Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
+++ Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
@@ -289,6 +289,19 @@ bool defaultWebMFormatReaderEnabled()
 
 #endif // ENABLE(WEBM_FORMAT_READER)
 
+#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
+
+bool defaultWebMFormatReaderEnabled()
+{
+#if HAVE(SYSTEM_FEATURE_FLAGS)
+    return isFeatureFlagEnabled("webm_format_reader");
+#endif
+
+    return false;
+}
+
+#endif
+
 #if ENABLE(VP9)
 
 bool defaultVP8DecoderEnabled()
diff --git Source/WebKit/Shared/WebPreferencesDefaultValues.h Source/WebKit/Shared/WebPreferencesDefaultValues.h
index c7af0cb..c1c91ed 100644
--- Source/WebKit/Shared/WebPreferencesDefaultValues.h
+++ Source/WebKit/Shared/WebPreferencesDefaultValues.h
@@ -95,6 +95,10 @@ bool defaultWebXREnabled();
 bool defaultWebMFormatReaderEnabled();
 #endif
 
+#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
+bool defaultWebMFormatReaderEnabled();
+#endif
+
 #if ENABLE(VP9)
 bool defaultVP8DecoderEnabled();
 bool defaultVP9DecoderEnabled();
diff --git Source/WebKit/SourcesCocoa.txt Source/WebKit/SourcesCocoa.txt
index 78fb424..ac04aa8 100644
--- Source/WebKit/SourcesCocoa.txt
+++ Source/WebKit/SourcesCocoa.txt
@@ -229,6 +229,11 @@ Shared/mac/MediaFormatReader/MediaSampleByteRange.cpp
 Shared/mac/MediaFormatReader/MediaSampleCursor.cpp
 Shared/mac/MediaFormatReader/MediaTrackReader.cpp
 
+Shared/mac/MediaFormatReader/CoreMediaWrapped.cpp
+Shared/mac/MediaFormatReader/FormatReader.cpp
+Shared/mac/MediaFormatReader/SampleCursor.cpp
+Shared/mac/MediaFormatReader/TrackReader.cpp
+
 Shared/Plugins/mac/PluginSandboxProfile.mm
 
 Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm




include/webkitgtk-4.0/webkit2/WebKitInputMethodContext.h
include/webkitgtk-4.0/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h
include/webkitgtk-4.0/webkit2/WebKitJavascriptResult.h
include/webkitgtk-4.0/webkit2/WebKitMediaKeySystemPermissionRequest.h
include/webkitgtk-4.0/webkit2/WebKitMemoryPressureSettings.h
include/webkitgtk-4.0/webkit2/WebKitMimeInfo.h
include/webkitgtk-4.0/webkit2/WebKitNavigationAction.h
include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h

lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
lib/libjavascriptcoregtk-4.0.so
lib/libjavascriptcoregtk-4.0.so.18
lib/libjavascriptcoregtk-4.0.so.18.19.5
lib/libwebkit2gtk-4.0.so
lib/libwebkit2gtk-4.0.so.37
lib/libwebkit2gtk-4.0.so.37.55.3
lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
libdata/pkgconfig/javascriptcoregtk-4.0.pc
libdata/pkgconfig/webkit2gtk-4.0.pc
libdata/pkgconfig/webkit2gtk-web-extension-4.0.pc
libexec/webkit2gtk-4.0/MiniBrowser
libexec/webkit2gtk-4.0/WebKitNetworkProcess
libexec/webkit2gtk-4.0/WebKitPluginProcess
libexec/webkit2gtk-4.0/WebKitWebProcess
libexec/webkit2gtk-4.0/jsc
share/gir-1.0/JavaScriptCore-4.0.gir
- 

Return to bug 255528

Lines 1-8 Link Here

(-)b/www/webkit2-gtk3/Makefile (-8 / +5 lines)
1	# Created by: Michael Johnson <ahze@FreeBSD.org>	1	# Created by: Michael Johnson <ahze@FreeBSD.org>
2		2
3	PORTNAME= webkit	3	PORTNAME= webkit
4	DISTVERSION= 2.30.5	4	DISTVERSION= 2.34.0
5	PORTREVISION= 2
6	CATEGORIES= www	5	CATEGORIES= www
7	MASTER_SITES= https://webkitgtk.org/releases/	6	MASTER_SITES= https://webkitgtk.org/releases/
8	PKGNAMESUFFIX= 2-gtk3	7	PKGNAMESUFFIX= 2-gtk3
Lines 54-62 CXXFLAGS_powerpc64= -DENABLE_YARR_JIT=0 Link Here
54	CMAKE_ARGS= -DPORT=GTK	53	CMAKE_ARGS= -DPORT=GTK
55	CMAKE_OFF= USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U} \	54	CMAKE_OFF= USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U} \
56	ENABLE_GLES2 \	55	ENABLE_GLES2 \
57	USE_SYSTEMD	56	USE_SYSTEMD \
		57	ENABLE_GAMEPAD
58	CMAKE_ON= ENABLE_MINIBROWSER \	58	CMAKE_ON= ENABLE_MINIBROWSER \
59	USE_SYSTEM_MALLOC	59	USE_SYSTEM_MALLOC \
		60	USE_SOUP2
60	CMAKE_OFF_armv6= ENABLE_JIT	61	CMAKE_OFF_armv6= ENABLE_JIT
61	CMAKE_OFF_armv7= ENABLE_JIT	62	CMAKE_OFF_armv7= ENABLE_JIT
62	CMAKE_OFF_powerpc= ENABLE_JIT	63	CMAKE_OFF_powerpc= ENABLE_JIT
Lines 96-105 WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland \ Link Here
96	libwpe-1.0.so:www/libwpe \	97	libwpe-1.0.so:www/libwpe \
97	libWPEBackend-fdo-1.0.so:www/wpebackend-fdo	98	libWPEBackend-fdo-1.0.so:www/wpebackend-fdo
98		99
99	post-patch:
100	@${REINPLACE_CMD} -e 's\|/usr/lib/browser/plugins\|${BROWSER_PLUGINS_DIR}\|' \
101	${WRKSRC}/Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp
102
103	pre-configure:	100	pre-configure:
104	# .if !exists() evaluates too early before cairo has a chance to be installed	101	# .if !exists() evaluates too early before cairo has a chance to be installed
105	@if ! pkg-config --exists cairo-egl; then \	102	@if ! pkg-config --exists cairo-egl; then \

Removed Link Here

(-)a/www/webkit2-gtk3/files/patch-CMakeLists.txt (-14 lines)
1	--- CMakeLists.txt.orig 2020-08-12 09:17:37 UTC
2	+++ CMakeLists.txt
3	@@ -109,9 +109,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64
4	endif ()
5	elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86\|x86)")
6	set(WTF_CPU_X86 1)
7	-elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
8	+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc\|powerpc)")
9	set(WTF_CPU_PPC 1)
10	-elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
11	+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64\|powerpc64)")
12	set(WTF_CPU_PPC64 1)
13	elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
14	set(WTF_CPU_PPC64LE 1)

Lines 1-11 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source-cmake-OptionsCommon.cmake (-6 / +6 lines)
1	--- Source/cmake/OptionsCommon.cmake.orig 2020-03-01 08:15:43.203077000 +1300	1	--- Source/cmake/OptionsCommon.cmake.orig 2021-09-22 23:05:58 UTC
2	+++ Source/cmake/OptionsCommon.cmake 2020-03-01 08:14:23.672978000 +1300	2	+++ Source/cmake/OptionsCommon.cmake
3	@@ -155,7 +155,7 @@	3	@@ -144,7 +144,7 @@ WEBKIT_CHECK_HAVE_FUNCTION(HAVE_VASPRINTF vasprintf)
4	# Check for symbols	4	# Check for symbols
5	WEBKIT_CHECK_HAVE_SYMBOL(HAVE_REGEX_H regexec regex.h)	5	WEBKIT_CHECK_HAVE_SYMBOL(HAVE_REGEX_H regexec regex.h)
6	if (NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin"))	6	if (NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin"))
7	-WEBKIT_CHECK_HAVE_SYMBOL(HAVE_PTHREAD_MAIN_NP pthread_main_np pthread_np.h)	7	- WEBKIT_CHECK_HAVE_SYMBOL(HAVE_PTHREAD_MAIN_NP pthread_main_np pthread_np.h)
8	+#WEBKIT_CHECK_HAVE_SYMBOL(HAVE_PTHREAD_MAIN_NP pthread_main_np pthread_np.h)	8	+ #WEBKIT_CHECK_HAVE_SYMBOL(HAVE_PTHREAD_MAIN_NP pthread_main_np pthread_np.h)
9	endif ()	9	endif ()
		10	WEBKIT_CHECK_HAVE_SYMBOL(HAVE_TIMINGSAFE_BCMP timingsafe_bcmp string.h)
10	# Windows has signal.h but is missing symbols that are used in calls to signal.	11	# Windows has signal.h but is missing symbols that are used in calls to signal.
11	WEBKIT_CHECK_HAVE_SYMBOL(HAVE_SIGNAL_H SIGTRAP signal.h)

Lines 1-17 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_RAMSize.cpp (-13 / +14 lines)
1	--- Source/WTF/wtf/RAMSize.cpp.orig 2020-08-12 09:17:54 UTC	1	--- Source/WTF/wtf/RAMSize.cpp.orig 2021-09-22 23:29:42 UTC
2	+++ Source/WTF/wtf/RAMSize.cpp	2	+++ Source/WTF/wtf/RAMSize.cpp
3	@@ -34,6 +34,10 @@	3	@@ -35,6 +35,8 @@
4	#if OS(LINUX)
5	#include <sys/sysinfo.h>	4	#include <sys/sysinfo.h>
6	#endif // OS(LINUX)	5	#elif OS(UNIX)
7	+#if OS(FREEBSD)	6	#include <unistd.h>
8	+#include <sys/types.h>	7	+#include <sys/types.h>
9	+#include <sys/sysctl.h>	8	+#include <sys/sysctl.h>
10	+#endif	9	#endif // OS(LINUX) \|\| OS(UNIX)
11	#else	10	#else
12	#include <bmalloc/bmalloc.h>	11	#include <bmalloc/bmalloc.h>
13	#endif	12	@@ -56,14 +58,18 @@ static size_t computeRAMSize()
14	@@ -54,10 +58,18 @@ static size_t computeRAMSize()
15	return ramSizeGuess;	13	return ramSizeGuess;
16	return status.ullTotalPhys;	14	return status.ullTotalPhys;
17	#elif USE(SYSTEM_MALLOC)	15	#elif USE(SYSTEM_MALLOC)
Lines 20-33 Link Here
20	struct sysinfo si;	18	struct sysinfo si;
21	sysinfo(&si);	19	sysinfo(&si);
22	return si.totalram * si.mem_unit;	20	return si.totalram * si.mem_unit;
23	+#elif OS(FREEBSD)	21	#elif OS(UNIX)
		22	- long pages = sysconf(_SC_PHYS_PAGES);
		23	- long pageSize = sysconf(_SC_PAGE_SIZE);
		24	- return pages * pageSize;
24	+ size_t physmem, len;	25	+ size_t physmem, len;
25	+ int mib[2] = { CTL_HW, HW_PHYSMEM };	26	+ int mib[2] = { CTL_HW, HW_PHYSMEM };
26	+ if (sysctl(mib, 2, &physmem, &len, NULL, 0) == 0	27	+ if (sysctl(mib, 2, &physmem, &len, NULL, 0) == 0
27	+ && len == sizeof(physmem))	28	+ && len == sizeof(physmem))
28	+ return physmem;	29	+ return physmem;
29	+ else	30	+ else
30	+ return 512 * MB; // guess	31	+ return 512 * MB; // guess
31	#else	32	#else
32	#error "Missing a platform specific way of determining the available RAM"	33	#error "Missing a platform specific way of determining the available RAM"
33	#endif // OS(LINUX) \|\| OS(FREEBSD)	34	#endif // OS(LINUX) \|\| OS(FREEBSD) \|\| OS(UNIX)

Removed Link Here

(-)a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_x11_PlatformDisplayX11.cpp (-23 lines)
1	Regressed by https://github.com/KhronosGroup/EGL-Registry/commit/64aa561f1971
2	Part of https://github.com/WebKit/WebKit/commit/29421afdcd64
3
4	Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:132:5: error: unknown type name 'XVisualInfo'
5	XVisualInfo visualTemplate;
6	^
7	Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:136:5: error: unknown type name 'XVisualInfo'
8	XVisualInfo* visualInfo = XGetVisualInfo(m_display, VisualScreenMask, &visualTemplate, &visualCount);
9	^
10	Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:136:57: error: use of undeclared identifier 'VisualScreenMask'
11	XVisualInfo* visualInfo = XGetVisualInfo(m_display, VisualScreenMask, &visualTemplate, &visualCount);
12	^
13
14	--- Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp.orig 2020-08-12 09:17:55 UTC
15	+++ Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
16	@@ -32,6 +32,7 @@
17	#include <X11/Xlib.h>
18	#include <X11/extensions/Xcomposite.h>
19	#if PLATFORM(GTK)
20	+#include <X11/Xutil.h>
21	#include <X11/extensions/Xdamage.h>
22	#endif
23

Added Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_cmake_WebKitCommon.cmake (+14 lines)
1	--- Source/cmake/WebKitCommon.cmake.orig 2021-09-22 23:05:58 UTC
2	+++ Source/cmake/WebKitCommon.cmake
3	@@ -106,9 +106,9 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
4	endif ()
5	elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86\|x86)")
6	set(WTF_CPU_X86 1)
7	- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
8	+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc\|powerpc)")
9	set(WTF_CPU_PPC 1)
10	- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
11	+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64\|powerpc64)")
12	set(WTF_CPU_PPC64 1)
13	elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
14	set(WTF_CPU_PPC64LE 1)

Added Link Here

(-)b/www/webkit2-gtk3/files/patch-revert-11ccaf183fad (+211 lines)
1	Regressed by: https://github.com/WebKit/WebKit/commit/11ccaf183fad
2
3	GStreamer.cpp.o -c /wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/p
4	latform/graphics/gstreamer/MediaSampleGStreamer.cpp
5	/wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/platform/graphics/gs
6	treamer/MediaSampleGStreamer.cpp:220:12: error: call to implicitly-deleted copy constructor o
7	f 'WebCore::PlatformSample'
8	return sample;
9	^~~~~~
10	/wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/platform/MediaSample
11	.h:57:7: note: copy constructor of 'PlatformSample' is implicitly deleted because field 'samp
12	le' has a deleted copy constructor
13	} sample;
14	^
15	/wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/platform/MediaSample
16	.h:56:66: note: copy constructor of '' is implicitly deleted because variant field 'byteRange
17	Sample' has a non-trivial copy constructor
18	std::pair<MTPluginByteSourceRef, CMFormatDescriptionRef> byteRangeSample;
19	^
20	1 error generated.
21
22	diff --git Source/WTF/wtf/PlatformHave.h Source/WTF/wtf/PlatformHave.h
23	index 4c5f1d2..e61e7fc 100644
24	--- Source/WTF/wtf/PlatformHave.h
25	+++ Source/WTF/wtf/PlatformHave.h
26	@@ -909,6 +909,12 @@
27	#endif
28	#endif
29
30	+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 110300
31	+#if !defined(HAVE_MT_PLUGIN_SAMPLE_CURSOR_PLAYABLE_HORIZON)
32	+#define HAVE_MT_PLUGIN_SAMPLE_CURSOR_PLAYABLE_HORIZON 1
33	+#endif
34	+#endif
35	+
36	#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 110200) \
37	\|\| (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140400)
38	#define HAVE_AVCONTENTKEYREQUEST_PENDING_PROTECTION_STATUS 1
39	diff --git Source/WebCore/page/RuntimeEnabledFeatures.h Source/WebCore/page/RuntimeEnabledFeatures.h
40	index c97386f..6bb9794 100644
41	--- Source/WebCore/page/RuntimeEnabledFeatures.h
42	+++ Source/WebCore/page/RuntimeEnabledFeatures.h
43	@@ -243,6 +243,11 @@ public:
44	void setDisableMediaExperiencePIDInheritance(bool isDisabled) { m_disableMediaExperiencePIDInheritance = isDisabled; }
45	bool disableMediaExperiencePIDInheritance() const { return m_disableMediaExperiencePIDInheritance; }
46	#endif
47	+
48	+#if HAVE(MT_PLUGIN_FORMAT_READER)
49	+ void setWebMFormatReaderEnabled(bool isEnabled) { m_webMFormatReaderEnabled = isEnabled; }
50	+ bool webMFormatReaderEnabled() const { return m_webMFormatReaderEnabled; }
51	+#endif
52
53	#if ENABLE(VORBIS)
54	WEBCORE_EXPORT void setVorbisDecoderEnabled(bool isEnabled);
55	@@ -375,6 +380,10 @@ private:
56	bool m_webMFormatReaderEnabled { false };
57	#endif
58
59	+#if HAVE(MT_PLUGIN_FORMAT_READER)
60	+ bool m_webMFormatReaderEnabled { false };
61	+#endif
62	+
63	#if ENABLE(MEDIA_SOURCE)
64	bool m_webMParserEnabled { false };
65	bool m_webMWebAudioEnabled { false };
66	diff --git Source/WebCore/platform/MediaSample.h Source/WebCore/platform/MediaSample.h
67	index 0847b97..d34ba7f 100644
68	--- Source/WebCore/platform/MediaSample.h
69	+++ Source/WebCore/platform/MediaSample.h
70	@@ -34,8 +34,6 @@
71
72	typedef struct opaqueCMSampleBuffer *CMSampleBufferRef;
73	typedef struct _GstSample GstSample;
74	-typedef struct OpaqueMTPluginByteSource *MTPluginByteSourceRef;
75	-typedef const struct opaqueCMFormatDescription *CMFormatDescriptionRef;
76
77	namespace WebCore {
78
79	@@ -47,13 +45,11 @@ struct PlatformSample {
80	MockSampleBoxType,
81	CMSampleBufferType,
82	GStreamerSampleType,
83	- ByteRangeSampleType,
84	} type;
85	union {
86	MockSampleBox* mockSampleBox;
87	CMSampleBufferRef cmSampleBuffer;
88	GstSample* gstSample;
89	- std::pair<MTPluginByteSourceRef, CMFormatDescriptionRef> byteRangeSample;
90	} sample;
91	};
92
93	@@ -91,12 +87,6 @@ public:
94	virtual SampleFlags flags() const = 0;
95	virtual PlatformSample platformSample() = 0;
96
97	- struct ByteRange {
98	- size_t byteOffset { 0 };
99	- size_t byteLength { 0 };
100	- };
101	- virtual std::optional<ByteRange> byteRange() const = 0;
102	-
103	enum class VideoRotation {
104	None = 0,
105	UpsideDown = 180,
106	diff --git Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h
107	index d7a49b9..874c3dc 100644
108	--- Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h
109	+++ Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h
110	@@ -57,7 +57,6 @@ public:
111	Ref<MediaSample> createNonDisplayingCopy() const override;
112	SampleFlags flags() const override { return m_flags; }
113	PlatformSample platformSample() override;
114	- std::optional<ByteRange> byteRange() const override { return std::nullopt; }
115	void dump(PrintStream&) const override;
116	RefPtr<JSC::Uint8ClampedArray> getRGBAImageData() const final;
117
118	diff --git Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp
119	index 5cb60b9..83da5b0 100644
120	--- Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp
121	+++ Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp
122	@@ -62,7 +62,6 @@ private:
123	size_t sizeInBytes() const override { return sizeof(m_box); }
124	SampleFlags flags() const override;
125	PlatformSample platformSample() override;
126	- std::optional<ByteRange> byteRange() const override { return std::nullopt; }
127	FloatSize presentationSize() const override { return FloatSize(); }
128	void dump(PrintStream&) const override;
129	void offsetTimestampsBy(const MediaTime& offset) override { m_box.offsetTimestampsBy(offset); }
130	diff --git Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp
131	index 496e42a..43664ed 100644
132	--- Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp
133	+++ Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp
134	@@ -23,14 +23,15 @@
135	* THE POSSIBILITY OF SUCH DAMAGE.
136	*/
137
138	-#include <WebKit/WKMediaFormatReader.h>
139	+#include "config.h"
140
141	-extern "C" WK_EXPORT OSStatus CreateMediaFormatReaderInstance(MTPluginByteSourceRef, CFAllocatorRef, CFDictionaryRef, MTPluginFormatReaderRef*);
142	+#if HAVE(MT_PLUGIN_FORMAT_READER)
143
144	-OSStatus CreateMediaFormatReaderInstance(MTPluginByteSourceRef byteSource, CFAllocatorRef allocator, CFDictionaryRef, MTPluginFormatReaderRef* formatReader)
145	+OSStatus CreateMediaFormatReaderInstance(MTPluginByteSourceRef, CFAllocatorRef, CFDictionary
146	+Ref, MTPluginFormatReaderRef* formatReader)
147	{
148	- OSStatus status = WKMediaFormatReaderCreate(allocator, formatReader);
149	- if (status != noErr)
150	- return status;
151	- return WKMediaFormatReaderStartOnMainThread(*formatReader, byteSource);
152	+ *formatReader = nullptr;
153	+ return kMTPluginFormatReaderError_InternalFailure;
154	}
155	+
156	+#endif // HAVE(MT_PLUGIN_FORMAT_READER)
157	diff --git Source/WebKit/Shared/WebPreferencesDefaultValues.cpp Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
158	index 8b24061..83e3a04 100644
159	--- Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
160	+++ Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
161	@@ -289,6 +289,19 @@ bool defaultWebMFormatReaderEnabled()
162
163	#endif // ENABLE(WEBM_FORMAT_READER)
164
165	+#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
166	+
167	+bool defaultWebMFormatReaderEnabled()
168	+{
169	+#if HAVE(SYSTEM_FEATURE_FLAGS)
170	+ return isFeatureFlagEnabled("webm_format_reader");
171	+#endif
172	+
173	+ return false;
174	+}
175	+
176	+#endif
177	+
178	#if ENABLE(VP9)
179
180	bool defaultVP8DecoderEnabled()
181	diff --git Source/WebKit/Shared/WebPreferencesDefaultValues.h Source/WebKit/Shared/WebPreferencesDefaultValues.h
182	index c7af0cb..c1c91ed 100644
183	--- Source/WebKit/Shared/WebPreferencesDefaultValues.h
184	+++ Source/WebKit/Shared/WebPreferencesDefaultValues.h
185	@@ -95,6 +95,10 @@ bool defaultWebXREnabled();
186	bool defaultWebMFormatReaderEnabled();
187	#endif
188
189	+#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
190	+bool defaultWebMFormatReaderEnabled();
191	+#endif
192	+
193	#if ENABLE(VP9)
194	bool defaultVP8DecoderEnabled();
195	bool defaultVP9DecoderEnabled();
196	diff --git Source/WebKit/SourcesCocoa.txt Source/WebKit/SourcesCocoa.txt
197	index 78fb424..ac04aa8 100644
198	--- Source/WebKit/SourcesCocoa.txt
199	+++ Source/WebKit/SourcesCocoa.txt
200	@@ -229,6 +229,11 @@ Shared/mac/MediaFormatReader/MediaSampleByteRange.cpp
201	Shared/mac/MediaFormatReader/MediaSampleCursor.cpp
202	Shared/mac/MediaFormatReader/MediaTrackReader.cpp
203
204	+Shared/mac/MediaFormatReader/CoreMediaWrapped.cpp
205	+Shared/mac/MediaFormatReader/FormatReader.cpp
206	+Shared/mac/MediaFormatReader/SampleCursor.cpp
207	+Shared/mac/MediaFormatReader/TrackReader.cpp
208	+
209	Shared/Plugins/mac/PluginSandboxProfile.mm
210
211	Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm

Lines 52-57 include/webkitgtk-4.0/webkit2/WebKitHitTestResult.h Link Here

(-)b/www/webkit2-gtk3/pkg-plist (-4 / +4 lines)
52	include/webkitgtk-4.0/webkit2/WebKitInputMethodContext.h	52	include/webkitgtk-4.0/webkit2/WebKitInputMethodContext.h
53	include/webkitgtk-4.0/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h	53	include/webkitgtk-4.0/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h
54	include/webkitgtk-4.0/webkit2/WebKitJavascriptResult.h	54	include/webkitgtk-4.0/webkit2/WebKitJavascriptResult.h
		55	include/webkitgtk-4.0/webkit2/WebKitMediaKeySystemPermissionRequest.h
		56	include/webkitgtk-4.0/webkit2/WebKitMemoryPressureSettings.h
55	include/webkitgtk-4.0/webkit2/WebKitMimeInfo.h	57	include/webkitgtk-4.0/webkit2/WebKitMimeInfo.h
56	include/webkitgtk-4.0/webkit2/WebKitNavigationAction.h	58	include/webkitgtk-4.0/webkit2/WebKitNavigationAction.h
57	include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h	59	include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h
Lines 219-235 lib/girepository-1.0/WebKit2-4.0.typelib Link Here
219	lib/girepository-1.0/WebKit2WebExtension-4.0.typelib	221	lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
220	lib/libjavascriptcoregtk-4.0.so	222	lib/libjavascriptcoregtk-4.0.so
221	lib/libjavascriptcoregtk-4.0.so.18	223	lib/libjavascriptcoregtk-4.0.so.18
222	lib/libjavascriptcoregtk-4.0.so.18.17.13	224	lib/libjavascriptcoregtk-4.0.so.18.19.5
223	lib/libwebkit2gtk-4.0.so	225	lib/libwebkit2gtk-4.0.so
224	lib/libwebkit2gtk-4.0.so.37	226	lib/libwebkit2gtk-4.0.so.37
225	lib/libwebkit2gtk-4.0.so.37.49.9	227	lib/libwebkit2gtk-4.0.so.37.55.3
226	lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so	228	lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
227	libdata/pkgconfig/javascriptcoregtk-4.0.pc	229	libdata/pkgconfig/javascriptcoregtk-4.0.pc
228	libdata/pkgconfig/webkit2gtk-4.0.pc	230	libdata/pkgconfig/webkit2gtk-4.0.pc
229	libdata/pkgconfig/webkit2gtk-web-extension-4.0.pc	231	libdata/pkgconfig/webkit2gtk-web-extension-4.0.pc
230	libexec/webkit2gtk-4.0/MiniBrowser	232	libexec/webkit2gtk-4.0/MiniBrowser
231	libexec/webkit2gtk-4.0/WebKitNetworkProcess	233	libexec/webkit2gtk-4.0/WebKitNetworkProcess
232	libexec/webkit2gtk-4.0/WebKitPluginProcess
233	libexec/webkit2gtk-4.0/WebKitWebProcess	234	libexec/webkit2gtk-4.0/WebKitWebProcess
234	libexec/webkit2gtk-4.0/jsc	235	libexec/webkit2gtk-4.0/jsc
235	share/gir-1.0/JavaScriptCore-4.0.gir	236	share/gir-1.0/JavaScriptCore-4.0.gir
236	-