* update webkitgtk-6.0 to 2.44.1-1.1
This commit is contained in:
parent
f1d4219f76
commit
150b58c48a
262
webkitgtk-6.0/0003-2.44.1-branch-patchset.patch
Normal file
262
webkitgtk-6.0/0003-2.44.1-branch-patchset.patch
Normal file
@ -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
|
||||
|
||||
322
webkitgtk-6.0/0004-2.44.1-non-unified-build-fixes.patch
Normal file
322
webkitgtk-6.0/0004-2.44.1-non-unified-build-fixes.patch
Normal file
@ -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
|
||||
|
||||
@ -8,7 +8,7 @@ pkgname=(
|
||||
webkitgtk-6.0-docs
|
||||
)
|
||||
pkgver=2.44.1
|
||||
pkgrel=1
|
||||
pkgrel=1.1
|
||||
pkgdesc="Web content engine for GTK"
|
||||
url="https://webkitgtk.org"
|
||||
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
|
||||
@ -79,17 +79,23 @@ makedepends=(
|
||||
)
|
||||
source=(
|
||||
$url/releases/webkitgtk-$pkgver.tar.xz{,.asc}
|
||||
reduce-memory-overheads.patch
|
||||
webkit-b3jit-regression.patch
|
||||
0001-reduce-memory-overheads.patch
|
||||
0002-webkit-b3jit-regression.patch
|
||||
0003-2.44.1-branch-patchset.patch
|
||||
0004-2.44.1-non-unified-build-fixes.patch
|
||||
)
|
||||
sha256sums=('425b1459b0f04d0600c78d1abb5e7edfa3c060a420f8b231e9a6a2d5d29c5561'
|
||||
'SKIP'
|
||||
'13df7f0b0a61866e767f280bbe77667126ae7de4ad4f463c682040da6366a864'
|
||||
'35e71f03b8909bfb017d2ffb4132f9893cc40d8d57720cd8153ce41a13caec93')
|
||||
'35e71f03b8909bfb017d2ffb4132f9893cc40d8d57720cd8153ce41a13caec93'
|
||||
'aac07341ae0dfed07639bd244068ea44e87f7e1b0d1fa62d9eb97209970578f1'
|
||||
'2607c014ac5f6c459072d6ccbc3f76de8b0506c40ce404180f6cb7b6c6b260ec')
|
||||
b2sums=('a5fff4c4fe90bcd0ea098930e51a36ea60152da47fd06e78abbc10f146437838aa19fed15cf58732b538046e1f42d8461cd5c0e0859096506932c9fae150cc16'
|
||||
'SKIP'
|
||||
'cc16462ce22df999b47ef477d4272ef3df2fbbfe5cdc585f3ce47e56cde65a1d7dd1105e6e7bbff41695f79b6394bc3e403e53a669bb7f456c733ed216372c9b'
|
||||
'd6c2b589bdf8cf3f75f698bcfa98247dd1fc260859cfefa8842ba11d32e7d2089f97c9b930427ccb6fa37cd58493c6e4c699e3e44327327da0ef1781c32bb7d9')
|
||||
'd6c2b589bdf8cf3f75f698bcfa98247dd1fc260859cfefa8842ba11d32e7d2089f97c9b930427ccb6fa37cd58493c6e4c699e3e44327327da0ef1781c32bb7d9'
|
||||
'0966d524063bc6137464eca431d161ac3b8ec0687f5cb2fa318d95734ceebd6bf9a4bef8db39b135f02a5e64ab453a9e74b3484db1411cf8ad85292d9d4cf034'
|
||||
'6928f61428c4bc6594a46f7427e644143b071c39cc7405b143d693f956631519860efd958dd928f55c1e6139334966fd6bb92e42594c7b7b9b11236d5b0154f2')
|
||||
validpgpkeys=(
|
||||
D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 # Carlos Garcia Campos <cgarcia@igalia.com>
|
||||
5AA3BC334FD7E3369E7C77B291C559DBE4C9123B # Adrián Pérez de Castro <aperez@igalia.com>
|
||||
@ -98,9 +104,10 @@ validpgpkeys=(
|
||||
prepare() {
|
||||
cd webkitgtk-$pkgver
|
||||
|
||||
patch -Np1 -i ${srcdir}/reduce-memory-overheads.patch
|
||||
|
||||
patch -Np1 -i ${srcdir}/webkit-b3jit-regression.patch
|
||||
patch -Np1 -i ${srcdir}/0001-reduce-memory-overheads.patch
|
||||
patch -Np1 -i ${srcdir}/0002-webkit-b3jit-regression.patch
|
||||
patch -Np1 -i ${srcdir}/0003-2.44.1-branch-patchset.patch
|
||||
patch -Np1 -i ${srcdir}/0004-2.44.1-non-unified-build-fixes.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
@ -123,7 +130,9 @@ build() {
|
||||
CFLAGS+=' -mminimal-toc'
|
||||
CXXFLAGS+=' -mminimal-toc'
|
||||
;;
|
||||
powerpc)
|
||||
powerpc)
|
||||
CFLAGS+=' -mminimal-toc'
|
||||
CXXFLAGS+=' -mminimal-toc'
|
||||
cmake_options+=(
|
||||
-DENABLE_WEBGL=OFF
|
||||
-DFORCE_32BIT=ON
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user