diff options
Diffstat (limited to 'net-libs/webkit-gtk/files')
6 files changed, 613 insertions, 147 deletions
diff --git a/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch deleted file mode 100644 index 97c5c0c8e4b6..000000000000 --- a/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch +++ /dev/null @@ -1,70 +0,0 @@ -From b60c2e4d1770660280d97cae9e82f3040ab97229 Mon Sep 17 00:00:00 2001 -From: "philn@webkit.org" - <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> -Date: Sat, 11 Sep 2021 11:34:42 +0000 -Subject: [PATCH] [GLIB] MediaSession is not enabled - https://bugs.webkit.org/show_bug.cgi?id=217991 <rdar://problem/70740119> - -leio: Extracted to include only the side-effect of fixing unity builds on -some machine configurations. -Thanks-To gen2dev ---- - Source/WebCore/platform/PlatformScreen.h | 6 ++++++ - Source/WebCore/platform/graphics/ImageFrame.h | 6 ++++++ - Source/WebCore/platform/graphics/ImageOrientation.h | 6 ++++++ - 3 files changed, 18 insertions(+) - -diff --git a/Source/WebCore/platform/PlatformScreen.h b/Source/WebCore/platform/PlatformScreen.h -index d3f12a6538b8..d47d193e8bee 100644 ---- a/Source/WebCore/platform/PlatformScreen.h -+++ b/Source/WebCore/platform/PlatformScreen.h -@@ -48,6 +48,12 @@ OBJC_CLASS UIScreen; - typedef struct CGColorSpace *CGColorSpaceRef; - #endif - -+// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values. -+// As a workaround, we explicitly undef them here. -+#if defined(None) -+#undef None -+#endif -+ - namespace WebCore { - - class DestinationColorSpace; -diff --git a/Source/WebCore/platform/graphics/ImageFrame.h b/Source/WebCore/platform/graphics/ImageFrame.h -index 9843aac40eb4..92e1d4486c5f 100644 ---- a/Source/WebCore/platform/graphics/ImageFrame.h -+++ b/Source/WebCore/platform/graphics/ImageFrame.h -@@ -33,6 +33,12 @@ - #include "NativeImage.h" - #include <wtf/Seconds.h> - -+// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values. -+// As a workaround, we explicitly undef them here. -+#if defined(None) -+#undef None -+#endif -+ - namespace WebCore { - - class ImageFrame { -diff --git a/Source/WebCore/platform/graphics/ImageOrientation.h b/Source/WebCore/platform/graphics/ImageOrientation.h -index d990a3dc555f..5de271e52352 100644 ---- a/Source/WebCore/platform/graphics/ImageOrientation.h -+++ b/Source/WebCore/platform/graphics/ImageOrientation.h -@@ -30,6 +30,12 @@ - #include "FloatSize.h" - #include <wtf/EnumTraits.h> - -+// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values. -+// As a workaround, we explicitly undef them here. -+#if defined(None) -+#undef None -+#endif -+ - namespace WebCore { - - struct ImageOrientation { --- -2.32.0 - diff --git a/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch deleted file mode 100644 index 74790d9f6cef..000000000000 --- a/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f8efe9f2d128a897c0b2a054bf05200cb842d9b2 Mon Sep 17 00:00:00 2001 -From: "don.olmstead@sony.com" - <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> -Date: Sun, 3 Oct 2021 23:00:17 +0000 -Subject: [PATCH] Non-unified build fixes, early October 2021 edition - https://bugs.webkit.org/show_bug.cgi?id=231143 - -Unreviewed non-unified build fixes. ---- -leio: Trimmed to what's relevant to webkitgtk-2.34 branch -gyakovlev: removed TextTrackClient.h include addition - - Source/WebCore/inspector/agents/InspectorCanvasAgent.h | 2 ++ - 1 files changed, 2 insertions(+) - -diff --git a/Source/WebCore/inspector/agents/InspectorCanvasAgent.h b/Source/WebCore/inspector/agents/InspectorCanvasAgent.h -index 7f1012aa2a24..4c7c23995276 100644 ---- a/Source/WebCore/inspector/agents/InspectorCanvasAgent.h -+++ b/Source/WebCore/inspector/agents/InspectorCanvasAgent.h -@@ -44,6 +44,8 @@ class InjectedScriptManager; - namespace WebCore { - - class CanvasRenderingContext; -+class Frame; -+ - #if ENABLE(WEBGL) - class InspectorShaderProgram; - class WebGLProgram; --- -2.32.0 - diff --git a/net-libs/webkit-gtk/files/2.34.3-opengl-without-X-fixes.patch b/net-libs/webkit-gtk/files/2.34.3-opengl-without-X-fixes.patch deleted file mode 100644 index 5608500376ff..000000000000 --- a/net-libs/webkit-gtk/files/2.34.3-opengl-without-X-fixes.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://bugs.webkit.org/show_bug.cgi?id=208907 - -From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Sat, 9 May 2020 23:11:52 +0300 -Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix - some build configurations - ---- - Source/WebCore/platform/graphics/GLContext.cpp | 3 +++ - Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++- - 2 files changed, 7 insertions(+), 1 deletions(-) - -diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp -index b217988b990..1ba0eb8a482 100644 ---- a/Source/WebCore/platform/graphics/GLContext.cpp -+++ b/Source/WebCore/platform/graphics/GLContext.cpp -@@ -28,6 +28,9 @@ - - #if USE(GLX) - #include "GLContextGLX.h" -+#endif -+ -+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE) - #include "OpenGLShims.h" - #endif - -diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp -index 3515be452b2..82cce70f14b 100644 ---- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp -+++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp -@@ -64,7 +64,10 @@ - - #if USE(GLX) - #include <GL/glx.h> --#include <WebCore/OpenGLShims.h> -+#endif -+ -+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE) -+#include "WebCore/OpenGLShims.h" - #endif - - #if USE(GSTREAMER) --- -2.20.1 - diff --git a/net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch b/net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch new file mode 100644 index 000000000000..51fc45fa32c4 --- /dev/null +++ b/net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch @@ -0,0 +1,29 @@ +From 56001e951362a5064027b1af81283e523e35559b Mon Sep 17 00:00:00 2001 +From: Dennis Camera <dennis.camera+webkit@riiengineering.ch> +Date: Mon, 4 Mar 2024 09:27:54 -0800 +Subject: [PATCH] [JSC] A64DOpcode include <mutex> + https://bugs.webkit.org/show_bug.cgi?id=270394 + +Reviewed by Michael Catanzaro. + +When UNIFIED_BUILDS are disabled, the build fails due to missing std::call_once. + +* Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h: include <mutex>. + +Canonical link: https://commits.webkit.org/275630@main +--- + Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h b/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h +index 0392bcb6e20a0..202aa4d1d81de 100644 +--- a/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h ++++ b/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h +@@ -25,6 +25,7 @@ + + #pragma once + ++#include <mutex> + #include <stdint.h> + #include <wtf/Assertions.h> + #include <wtf/DataLog.h> diff --git a/net-libs/webkit-gtk/files/2.44.1-branch-patchset.patch b/net-libs/webkit-gtk/files/2.44.1-branch-patchset.patch new file mode 100644 index 000000000000..869c85e84a6e --- /dev/null +++ b/net-libs/webkit-gtk/files/2.44.1-branch-patchset.patch @@ -0,0 +1,262 @@ +From 53ca279739365f9a604fba0a673f0539dfd67c55 Mon Sep 17 00:00:00 2001 +From: Patrick Griffis <pgriffis@igalia.com> +Date: Mon, 8 Apr 2024 10:21:34 -0700 +Subject: [PATCH 1/6] Cherry-pick 277203@main (bd1249cc9c4f). + https://bugs.webkit.org/show_bug.cgi?id=272309 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + Workaround restrict error in GCC 12 + https://bugs.webkit.org/show_bug.cgi?id=272309 + + Reviewed by Darin Adler. + + In GCC 12.3.0: + + In static member function ‘static constexpr std::char_traits<char>::char_type* std::char_traits<char>::copy(char_type*, const char_type*, std::size_t)’, + inlined from ‘static constexpr void std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::_S_copy(_CharT*, const _CharT*, size_type) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]’ at /usr/include/c++/12/bits/basic_string.h:431:21, + inlined from ‘constexpr std::__cxx11::basic_string<_CharT, _Traits, _Allocator>& std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::_M_replace(size_type, size_type, const _CharT*, size_type) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]’ at /usr/include/c++/12/bits/basic_string.tcc:532:22, + inlined from ‘constexpr std::__cxx11::basic_string<_CharT, _Traits, _Alloc>& std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::replace(size_type, size_type, const _CharT*, size_type) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]’ at /usr/include/c++/12/bits/basic_string.h:2179:19, + inlined from ‘constexpr std::__cxx11::basic_string<_CharT, _Traits, _Alloc>& std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::insert(size_type, const _CharT*) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]’ at /usr/include/c++/12/bits/basic_string.h:1936:22, + inlined from ‘std::ostream& WTF::operator<<(std::ostream&, Int128Impl)’ at /host/home/tingping/Projects/WebKit/Source/WTF/wtf/Int128.cpp:268:17: + /usr/include/c++/12/bits/char_traits.h:435:56: error: ‘void* __builtin_memcpy(void*, const void*, long unsigned int)’ accessing 9223372036854775810 or more bytes at offsets [2, 9223372036854775807] and 1 may overlap up to 9223372036854775813 bytes at offset -3 [-Werror=restrict] + 435 | return static_cast<char_type*>(__builtin_memcpy(__s1, __s2, __n)); + | ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~ + + * Source/WTF/wtf/Int128.cpp: + (WTF::operator<<): + + Canonical link: https://commits.webkit.org/277203@main + +Canonical link: https://commits.webkit.org/274313.129@webkitglib/2.44 +--- + Source/WTF/wtf/Int128.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Source/WTF/wtf/Int128.cpp b/Source/WTF/wtf/Int128.cpp +index 3962059d0cb9..c04f6d74543a 100644 +--- a/Source/WTF/wtf/Int128.cpp ++++ b/Source/WTF/wtf/Int128.cpp +@@ -265,9 +265,9 @@ std::ostream& operator<<(std::ostream& os, Int128Impl v) { + (flags & std::ios::basefield) == std::ios_base::fmtflags(); + if (print_as_decimal) { + if (Int128High64(v) < 0) { +- rep = "-"; ++ rep.append("-"); + } else if (flags & std::ios::showpos) { +- rep = "+"; ++ rep.append("+"); + } + } + +-- +2.43.0 + + +From 8ce83c4bf224122e0062248752a3ed014efc67e5 Mon Sep 17 00:00:00 2001 +From: Tim Nguyen <ntim@apple.com> +Date: Wed, 3 Apr 2024 09:22:37 -0700 +Subject: [PATCH 4/6] Cherry-pick 277007@main (1870b119a450). + https://bugs.webkit.org/show_bug.cgi?id=272044 + + CrashTracer: com.apple.WebKit.WebContent at WebCore: WebCore::ValidatedFormListedElement::updateValidity + https://bugs.webkit.org/show_bug.cgi?id=272044 + rdar://117727866 + + Reviewed by Ryosuke Niwa. + + It speculatively fixes a bug that RadioButtonGroup::m_members may contain a nullptr WeakRef. + + * Source/WebCore/dom/RadioButtonGroups.cpp: + (WebCore::RadioButtonGroup::isEmpty const): + (WebCore::RadioButtonGroup::remove): + (WebCore::RadioButtonGroup::setNeedsStyleRecalcForAllButtons): + (WebCore::RadioButtonGroup::updateValidityForAllButtons): + + Canonical link: https://commits.webkit.org/277007@main + +Canonical link: https://commits.webkit.org/274313.132@webkitglib/2.44 +--- + Source/WebCore/dom/RadioButtonGroups.cpp | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Source/WebCore/dom/RadioButtonGroups.cpp b/Source/WebCore/dom/RadioButtonGroups.cpp +index ba07a3fbdf09..4bbae6cbb72f 100644 +--- a/Source/WebCore/dom/RadioButtonGroups.cpp ++++ b/Source/WebCore/dom/RadioButtonGroups.cpp +@@ -31,7 +31,7 @@ namespace WebCore { + class RadioButtonGroup { + WTF_MAKE_FAST_ALLOCATED; + public: +- bool isEmpty() const { return m_members.isEmpty(); } ++ bool isEmpty() const { return m_members.isEmptyIgnoringNullReferences(); } + bool isRequired() const { return m_requiredCount; } + RefPtr<HTMLInputElement> checkedButton() const { return m_checkedButton.get(); } + void add(HTMLInputElement&); +@@ -47,7 +47,7 @@ private: + bool isValid() const; + void setCheckedButton(HTMLInputElement*); + +- HashSet<WeakRef<HTMLInputElement, WeakPtrImplWithEventTargetData>> m_members; ++ WeakHashSet<HTMLInputElement, WeakPtrImplWithEventTargetData> m_members; + WeakPtr<HTMLInputElement, WeakPtrImplWithEventTargetData> m_checkedButton; + size_t m_requiredCount { 0 }; + }; +@@ -60,7 +60,7 @@ inline bool RadioButtonGroup::isValid() const + Vector<Ref<HTMLInputElement>> RadioButtonGroup::members() const + { + auto sortedMembers = WTF::map(m_members, [](auto& element) -> Ref<HTMLInputElement> { +- return element.get(); ++ return element; + }); + std::sort(sortedMembers.begin(), sortedMembers.end(), [](auto& a, auto& b) { + return is_lt(treeOrder<ComposedTree>(a, b)); +@@ -155,7 +155,7 @@ void RadioButtonGroup::remove(HTMLInputElement& button) + } + } + +- if (m_members.isEmpty()) { ++ if (m_members.isEmptyIgnoringNullReferences()) { + ASSERT(!m_requiredCount); + ASSERT(!m_checkedButton); + } else if (wasValid != isValid()) +@@ -170,7 +170,7 @@ void RadioButtonGroup::remove(HTMLInputElement& button) + void RadioButtonGroup::setNeedsStyleRecalcForAllButtons() + { + for (auto& checkedButton : m_members) { +- Ref button = checkedButton.get(); ++ Ref button = checkedButton; + ASSERT(button->isRadioButton()); + button->invalidateStyleForSubtree(); + } +@@ -179,7 +179,7 @@ void RadioButtonGroup::setNeedsStyleRecalcForAllButtons() + void RadioButtonGroup::updateValidityForAllButtons() + { + for (auto& checkedButton : m_members) { +- Ref button = checkedButton.get(); ++ Ref button = checkedButton; + ASSERT(button->isRadioButton()); + button->updateValidity(); + } +-- +2.43.0 + + +From 93bde17ed761f5de54726de83ced4959303794c6 Mon Sep 17 00:00:00 2001 +From: Abrar Rahman Protyasha <a_protyasha@apple.com> +Date: Mon, 1 Apr 2024 22:42:12 -0700 +Subject: [PATCH 5/6] Cherry-pick 276925@main (59cedf7135bc). + https://bugs.webkit.org/show_bug.cgi?id=271962 + + Linker error when logging ViewportConfiguration to TextStream in Release configuration + https://bugs.webkit.org/show_bug.cgi?id=271962 + rdar://125713559 + + Reviewed by Sihui Liu. + + WebCore::operator<<(WTF::TextStream&, WebCore::ViewConfiguration const&) + is defined behind !LOG_DISABLED, which means in Release configuration, + the linker cannot find this definition. + + This patch fixes the linker error by removing the relevant !LOG_DISABLED + checks around both the operator<< overload definition and the + description()/dump() declarations, since said methods are referenced by + the operator<< overload. + + * Source/WebCore/page/ViewportConfiguration.cpp: + (WebCore::ViewportConfiguration::setIsKnownToLayOutWiderThanViewport): + (WebCore::ViewportConfiguration::dump const): + * Source/WebCore/page/ViewportConfiguration.h: + + Canonical link: https://commits.webkit.org/276925@main + +Canonical link: https://commits.webkit.org/274313.133@webkitglib/2.44 +--- + Source/WebCore/page/ViewportConfiguration.cpp | 4 ++-- + Source/WebCore/page/ViewportConfiguration.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Source/WebCore/page/ViewportConfiguration.cpp b/Source/WebCore/page/ViewportConfiguration.cpp +index 51abb1154515..c58bc368cd6c 100644 +--- a/Source/WebCore/page/ViewportConfiguration.cpp ++++ b/Source/WebCore/page/ViewportConfiguration.cpp +@@ -674,8 +674,6 @@ bool ViewportConfiguration::setIsKnownToLayOutWiderThanViewport(bool value) + return true; + } + +-#if !LOG_DISABLED +- + TextStream& operator<<(TextStream& ts, const ViewportConfiguration::Parameters& parameters) + { + ts.startGroup(); +@@ -747,6 +745,8 @@ String ViewportConfiguration::description() const + return ts.release(); + } + ++#if !LOG_DISABLED ++ + void ViewportConfiguration::dump() const + { + WTFLogAlways("%s", description().utf8().data()); +diff --git a/Source/WebCore/page/ViewportConfiguration.h b/Source/WebCore/page/ViewportConfiguration.h +index acd5a92ae089..1a7c27225a4b 100644 +--- a/Source/WebCore/page/ViewportConfiguration.h ++++ b/Source/WebCore/page/ViewportConfiguration.h +@@ -148,9 +148,9 @@ public: + WEBCORE_EXPORT static Parameters imageDocumentParameters(); + WEBCORE_EXPORT static Parameters xhtmlMobileParameters(); + WEBCORE_EXPORT static Parameters testingParameters(); +- +-#if !LOG_DISABLED ++ + String description() const; ++#if !LOG_DISABLED + WEBCORE_EXPORT void dump() const; + #endif + +-- +2.43.0 + + +From aff53249f2d491d082094a2aa57008c46e55d278 Mon Sep 17 00:00:00 2001 +From: Erica Li <lerica@apple.com> +Date: Tue, 19 Mar 2024 18:27:04 -0700 +Subject: [PATCH 6/6] Cherry-pick 276379@main (d036679431a5). + https://bugs.webkit.org/show_bug.cgi?id=271028 + + ASAN_SEGV | WebCore::LocalFrame::injectUserScripts. + rdar://124432384 + https://bugs.webkit.org/show_bug.cgi?id=271028 + + Reviewed by Ryosuke Niwa. + + Frame might be detached early, null checking before injectUserScripts from image document. + + * Source/WebCore/html/ImageDocument.cpp: + (WebCore::ImageDocument::createDocumentStructure): + + Canonical link: https://commits.webkit.org/276379@main + +Canonical link: https://commits.webkit.org/274313.134@webkitglib/2.44 +--- + Source/WebCore/html/ImageDocument.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Source/WebCore/html/ImageDocument.cpp b/Source/WebCore/html/ImageDocument.cpp +index f91478f138fe..67d3ed0d09af 100644 +--- a/Source/WebCore/html/ImageDocument.cpp ++++ b/Source/WebCore/html/ImageDocument.cpp +@@ -230,7 +230,8 @@ void ImageDocument::createDocumentStructure() + rootElement->insertedByParser(); + rootElement->setInlineStyleProperty(CSSPropertyHeight, 100, CSSUnitType::CSS_PERCENTAGE); + +- frame()->injectUserScripts(UserScriptInjectionTime::DocumentStart); ++ if (RefPtr localFrame = frame()) ++ localFrame->injectUserScripts(UserScriptInjectionTime::DocumentStart); + + // We need a <head> so that the call to setTitle() later on actually has an <head> to append to <title> to. + auto head = HTMLHeadElement::create(*this); +-- +2.43.0 + diff --git a/net-libs/webkit-gtk/files/2.44.1-non-unified-build-fixes.patch b/net-libs/webkit-gtk/files/2.44.1-non-unified-build-fixes.patch new file mode 100644 index 000000000000..ee5a1c222e70 --- /dev/null +++ b/net-libs/webkit-gtk/files/2.44.1-non-unified-build-fixes.patch @@ -0,0 +1,322 @@ +From 211b73efb2a416f3b464d9d74da0aa8f93abe016 Mon Sep 17 00:00:00 2001 +From: Don Olmstead <don.olmstead@sony.com> +Date: Fri, 8 Mar 2024 17:27:09 -0800 +Subject: [PATCH] Non-unified build fixes, early March 2024 edition + https://bugs.webkit.org/show_bug.cgi?id=270719 + +Unreviewed non-unified build fix. + +* Source/JavaScriptCore/jit/JITSizeStatistics.cpp: +* Source/WebCore/Modules/model-element/ModelPlayerClient.h: +* Source/WebCore/css/CSSCrossfadeValue.h: +* Source/WebCore/css/CSSImageSetOptionValue.cpp: +* Source/WebCore/css/CSSImageSetOptionValue.h: +* Source/WebCore/css/CSSReflectValue.cpp: +* Source/WebCore/css/CSSReflectValue.h: +* Source/WebCore/css/CSSShadowValue.h: +* Source/WebCore/css/CSSValuePair.cpp: +* Source/WebCore/css/CSSValuePair.h: +* Source/WebCore/dom/SlotAssignment.h: +* Source/WebCore/dom/TrustedType.cpp: +* Source/WebCore/rendering/svg/RenderSVGPath.cpp: +* Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp: +* Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp: +* Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp: +* Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp: +* Source/WebKit/GPUProcess/graphics/RemoteImageBufferSet.cpp: +* Source/WebKit/Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp: +* Source/WebKit/UIProcess/BrowsingContextGroup.cpp: +* Source/WebKit/UIProcess/FrameProcess.cpp: +* Source/WebKit/UIProcess/ProvisionalPageProxy.cpp: + +Canonical link: https://commits.webkit.org/275863@main + +(cherry picked from commit 38c6ecad0ea32e80cb3e811c3ff759074006791f) +--- + Source/JavaScriptCore/jit/JITSizeStatistics.cpp | 1 + + Source/WebCore/Modules/model-element/ModelPlayerClient.h | 1 + + Source/WebCore/css/CSSCrossfadeValue.h | 3 ++- + Source/WebCore/css/CSSImageSetOptionValue.cpp | 1 - + Source/WebCore/css/CSSImageSetOptionValue.h | 4 ++-- + Source/WebCore/css/CSSReflectValue.cpp | 2 -- + Source/WebCore/css/CSSReflectValue.h | 4 ++-- + Source/WebCore/css/CSSShadowValue.h | 4 ++-- + Source/WebCore/css/CSSValuePair.cpp | 1 + + Source/WebCore/css/CSSValuePair.h | 1 + + Source/WebCore/dom/SlotAssignment.h | 1 + + Source/WebCore/rendering/svg/RenderSVGPath.cpp | 2 ++ + .../WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp | 2 ++ + Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp | 2 ++ + Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp | 2 ++ + .../WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp | 2 ++ + .../Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp | 1 + + Source/WebKit/UIProcess/ProvisionalPageProxy.cpp | 1 + + 18 files changed, 25 insertions(+), 10 deletions(-) + +diff --git a/Source/JavaScriptCore/jit/JITSizeStatistics.cpp b/Source/JavaScriptCore/jit/JITSizeStatistics.cpp +index f1bc2780343a..b2ffd81ee34d 100644 +--- a/Source/JavaScriptCore/jit/JITSizeStatistics.cpp ++++ b/Source/JavaScriptCore/jit/JITSizeStatistics.cpp +@@ -29,6 +29,7 @@ + #if ENABLE(JIT) + + #include "CCallHelpers.h" ++#include "JITPlan.h" + #include "LinkBuffer.h" + #include <wtf/BubbleSort.h> + #include <wtf/TZoneMallocInlines.h> +diff --git a/Source/WebCore/Modules/model-element/ModelPlayerClient.h b/Source/WebCore/Modules/model-element/ModelPlayerClient.h +index 9343d5102015..b9cf2857eee2 100644 +--- a/Source/WebCore/Modules/model-element/ModelPlayerClient.h ++++ b/Source/WebCore/Modules/model-element/ModelPlayerClient.h +@@ -25,6 +25,7 @@ + + #pragma once + ++#include "LayerHostingContextIdentifier.h" + #include "PlatformLayerIdentifier.h" + #include <wtf/Forward.h> + #include <wtf/WeakPtr.h> +diff --git a/Source/WebCore/css/CSSCrossfadeValue.h b/Source/WebCore/css/CSSCrossfadeValue.h +index eafa3bb5e828..86b87be608fe 100644 +--- a/Source/WebCore/css/CSSCrossfadeValue.h ++++ b/Source/WebCore/css/CSSCrossfadeValue.h +@@ -25,11 +25,12 @@ + + #pragma once + ++#include "CSSPrimitiveValue.h" + #include "CSSValue.h" ++#include <wtf/Function.h> + + namespace WebCore { + +-class CSSPrimitiveValue; + class StyleImage; + + namespace Style { +diff --git a/Source/WebCore/css/CSSImageSetOptionValue.cpp b/Source/WebCore/css/CSSImageSetOptionValue.cpp +index 9becc5444e10..2b7812e419a2 100644 +--- a/Source/WebCore/css/CSSImageSetOptionValue.cpp ++++ b/Source/WebCore/css/CSSImageSetOptionValue.cpp +@@ -27,7 +27,6 @@ + #include "CSSImageSetOptionValue.h" + + #include "CSSImageValue.h" +-#include "CSSPrimitiveValue.h" + + namespace WebCore { + +diff --git a/Source/WebCore/css/CSSImageSetOptionValue.h b/Source/WebCore/css/CSSImageSetOptionValue.h +index 60ef16534b24..c65ddccc04b5 100644 +--- a/Source/WebCore/css/CSSImageSetOptionValue.h ++++ b/Source/WebCore/css/CSSImageSetOptionValue.h +@@ -25,13 +25,13 @@ + + #pragma once + ++#include "CSSPrimitiveValue.h" + #include "CSSValue.h" ++#include <wtf/Function.h> + #include <wtf/text/WTFString.h> + + namespace WebCore { + +-class CSSPrimitiveValue; +- + class CSSImageSetOptionValue final : public CSSValue { + public: + static Ref<CSSImageSetOptionValue> create(Ref<CSSValue>&&); +diff --git a/Source/WebCore/css/CSSReflectValue.cpp b/Source/WebCore/css/CSSReflectValue.cpp +index 371e6ed16087..6049d4af7d2d 100644 +--- a/Source/WebCore/css/CSSReflectValue.cpp ++++ b/Source/WebCore/css/CSSReflectValue.cpp +@@ -26,8 +26,6 @@ + #include "config.h" + #include "CSSReflectValue.h" + +-#include "CSSPrimitiveValue.h" +- + namespace WebCore { + + CSSReflectValue::CSSReflectValue(CSSValueID direction, Ref<CSSPrimitiveValue> offset, RefPtr<CSSValue> mask) +diff --git a/Source/WebCore/css/CSSReflectValue.h b/Source/WebCore/css/CSSReflectValue.h +index c67d2ad0dc4b..84f7b1d0e7e1 100644 +--- a/Source/WebCore/css/CSSReflectValue.h ++++ b/Source/WebCore/css/CSSReflectValue.h +@@ -25,12 +25,12 @@ + + #pragma once + ++#include "CSSPrimitiveValue.h" + #include "CSSValue.h" ++#include <wtf/Function.h> + + namespace WebCore { + +-class CSSPrimitiveValue; +- + class CSSReflectValue final : public CSSValue { + public: + static Ref<CSSReflectValue> create(CSSValueID direction, Ref<CSSPrimitiveValue> offset, RefPtr<CSSValue> mask); +diff --git a/Source/WebCore/css/CSSShadowValue.h b/Source/WebCore/css/CSSShadowValue.h +index 26857028cf36..7d6d25980f72 100644 +--- a/Source/WebCore/css/CSSShadowValue.h ++++ b/Source/WebCore/css/CSSShadowValue.h +@@ -20,13 +20,13 @@ + + #pragma once + ++#include "CSSPrimitiveValue.h" + #include "CSSValue.h" ++#include <wtf/Function.h> + #include <wtf/RefPtr.h> + + namespace WebCore { + +-class CSSPrimitiveValue; +- + // Used for text-shadow and box-shadow + class CSSShadowValue final : public CSSValue { + public: +diff --git a/Source/WebCore/css/CSSValuePair.cpp b/Source/WebCore/css/CSSValuePair.cpp +index 7c64d5a9e353..a3e169a697c7 100644 +--- a/Source/WebCore/css/CSSValuePair.cpp ++++ b/Source/WebCore/css/CSSValuePair.cpp +@@ -25,6 +25,7 @@ + + #include "config.h" + #include "CSSValuePair.h" ++ + #include <wtf/Hasher.h> + #include <wtf/text/WTFString.h> + +diff --git a/Source/WebCore/css/CSSValuePair.h b/Source/WebCore/css/CSSValuePair.h +index 0fc85298ca62..44c4d97c01ab 100644 +--- a/Source/WebCore/css/CSSValuePair.h ++++ b/Source/WebCore/css/CSSValuePair.h +@@ -26,6 +26,7 @@ + #pragma once + + #include "CSSValue.h" ++#include <wtf/Function.h> + + namespace WebCore { + +diff --git a/Source/WebCore/dom/SlotAssignment.h b/Source/WebCore/dom/SlotAssignment.h +index 9f9e1159e10a..478ca88bfca6 100644 +--- a/Source/WebCore/dom/SlotAssignment.h ++++ b/Source/WebCore/dom/SlotAssignment.h +@@ -30,6 +30,7 @@ + #include <wtf/HashSet.h> + #include <wtf/Vector.h> + #include <wtf/WeakHashMap.h> ++#include <wtf/WeakHashSet.h> + #include <wtf/WeakPtr.h> + #include <wtf/text/AtomString.h> + #include <wtf/text/AtomStringHash.h> +diff --git a/Source/WebCore/rendering/svg/RenderSVGPath.cpp b/Source/WebCore/rendering/svg/RenderSVGPath.cpp +index e9977db1c8b6..eba99e3a49d3 100644 +--- a/Source/WebCore/rendering/svg/RenderSVGPath.cpp ++++ b/Source/WebCore/rendering/svg/RenderSVGPath.cpp +@@ -30,12 +30,14 @@ + #include "RenderSVGPath.h" + + #if ENABLE(LAYER_BASED_SVG_ENGINE) ++ + #include "Gradient.h" + #include "ReferencedSVGResources.h" + #include "RenderLayer.h" + #include "RenderSVGResourceMarkerInlines.h" + #include "RenderSVGShapeInlines.h" + #include "RenderStyleInlines.h" ++#include "SVGElementTypeHelpers.h" + #include "SVGMarkerElement.h" + #include "SVGPathElement.h" + #include "SVGSubpathData.h" +diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp +index 85f79031ed4e..2b379fa4ebfe 100644 +--- a/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp ++++ b/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp +@@ -23,8 +23,10 @@ + #include "RenderSVGResourceLinearGradient.h" + + #if ENABLE(LAYER_BASED_SVG_ENGINE) ++ + #include "RenderSVGModelObjectInlines.h" + #include "RenderSVGResourceLinearGradientInlines.h" ++#include "SVGElementTypeHelpers.h" + #include <wtf/IsoMallocInlines.h> + + namespace WebCore { +diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp +index d65a81f773eb..27abd9b6e0f7 100644 +--- a/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp ++++ b/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp +@@ -24,6 +24,7 @@ + #include "RenderSVGResourceMarker.h" + + #if ENABLE(LAYER_BASED_SVG_ENGINE) ++ + #include "Element.h" + #include "ElementIterator.h" + #include "FloatPoint.h" +@@ -34,6 +35,7 @@ + #include "RenderLayerInlines.h" + #include "RenderSVGModelObjectInlines.h" + #include "RenderSVGResourceMarkerInlines.h" ++#include "SVGElementTypeHelpers.h" + #include "SVGGraphicsElement.h" + #include "SVGLengthContext.h" + #include "SVGRenderStyle.h" +diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp +index 81321523d0e4..86c59ca6fab6 100644 +--- a/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp ++++ b/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp +@@ -22,6 +22,7 @@ + #include "RenderSVGResourceMasker.h" + + #if ENABLE(LAYER_BASED_SVG_ENGINE) ++ + #include "Element.h" + #include "ElementIterator.h" + #include "FloatPoint.h" +@@ -33,6 +34,7 @@ + #include "RenderSVGModelObjectInlines.h" + #include "RenderSVGResourceMaskerInlines.h" + #include "SVGContainerLayout.h" ++#include "SVGElementTypeHelpers.h" + #include "SVGGraphicsElement.h" + #include "SVGLengthContext.h" + #include "SVGRenderStyle.h" +diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp +index 7d70fd721d73..25a9b293468e 100644 +--- a/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp ++++ b/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp +@@ -23,9 +23,11 @@ + #include "RenderSVGResourceRadialGradient.h" + + #if ENABLE(LAYER_BASED_SVG_ENGINE) ++ + #include "RenderSVGModelObjectInlines.h" + #include "RenderSVGResourceRadialGradientInlines.h" + #include "RenderSVGShape.h" ++#include "SVGElementTypeHelpers.h" + #include <wtf/IsoMallocInlines.h> + + namespace WebCore { +diff --git a/Source/WebKit/Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp b/Source/WebKit/Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp +index a0c521a767f1..3d4c130de7fa 100644 +--- a/Source/WebKit/Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp ++++ b/Source/WebKit/Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp +@@ -31,6 +31,7 @@ + #include "WebGPUConvertFromBackingContext.h" + #include "WebGPUConvertToBackingContext.h" + #include <WebCore/WebGPURenderPassDepthStencilAttachment.h> ++#include <WebCore/WebGPUTextureView.h> + + namespace WebKit::WebGPU { + +-- +2.43.0 + |