Title: [294257] releases/WebKitGTK/webkit-2.36/Source
- Revision
- 294257
- Author
- ape...@igalia.com
- Date
- 2022-05-16 14:19:45 -0700 (Mon, 16 May 2022)
Log Message
Merge r294177 - Non-unified build broken in debug mode
https://bugs.webkit.org/show_bug.cgi?id=240378
Unreviewed non-unified build fixes.
* heap/StructureAlignedMemoryAllocator.cpp: Include <sys/mman.h> if needed.
Non-unified build broken in debug mode
https://bugs.webkit.org/show_bug.cgi?id=240378
Unreviewed non-unified build fixes.
* contentextensions/ContentExtensionCompiler.cpp: Add missing wtf/CrossThreadCopier.h header.
* workers/service/ServiceWorkerClients.cpp: Add missing Logging.h header.
Canonical link: https://commits.webkit.org/250544@main
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/ChangeLog (294256 => 294257)
--- releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/ChangeLog 2022-05-16 21:19:36 UTC (rev 294256)
+++ releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/ChangeLog 2022-05-16 21:19:45 UTC (rev 294257)
@@ -1,3 +1,12 @@
+2022-05-13 Adrian Perez de Castro <ape...@igalia.com>
+
+ Non-unified build broken in debug mode
+ https://bugs.webkit.org/show_bug.cgi?id=240378
+
+ Unreviewed non-unified build fixes.
+
+ * heap/StructureAlignedMemoryAllocator.cpp: Include <sys/mman.h> if needed.
+
2022-05-13 Lauro Moura <lmo...@igalia.com>
Unreviewed, non-unified build fixes
Modified: releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/heap/StructureAlignedMemoryAllocator.cpp (294256 => 294257)
--- releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/heap/StructureAlignedMemoryAllocator.cpp 2022-05-16 21:19:36 UTC (rev 294256)
+++ releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/heap/StructureAlignedMemoryAllocator.cpp 2022-05-16 21:19:45 UTC (rev 294257)
@@ -32,6 +32,10 @@
#include <wtf/OSAllocator.h>
+#if OS(UNIX) && ASSERT_ENABLED
+#include <sys/mman.h>
+#endif
+
namespace JSC {
StructureAlignedMemoryAllocator::StructureAlignedMemoryAllocator(CString name)
Modified: releases/WebKitGTK/webkit-2.36/Source/WebCore/ChangeLog (294256 => 294257)
--- releases/WebKitGTK/webkit-2.36/Source/WebCore/ChangeLog 2022-05-16 21:19:36 UTC (rev 294256)
+++ releases/WebKitGTK/webkit-2.36/Source/WebCore/ChangeLog 2022-05-16 21:19:45 UTC (rev 294257)
@@ -1,3 +1,13 @@
+2022-05-13 Adrian Perez de Castro <ape...@igalia.com>
+
+ Non-unified build broken in debug mode
+ https://bugs.webkit.org/show_bug.cgi?id=240378
+
+ Unreviewed non-unified build fixes.
+
+ * contentextensions/ContentExtensionCompiler.cpp: Add missing wtf/CrossThreadCopier.h header.
+ * workers/service/ServiceWorkerClients.cpp: Add missing Logging.h header.
+
2022-05-13 Lauro Moura <lmo...@igalia.com>
Unreviewed, non-unified build fixes
Modified: releases/WebKitGTK/webkit-2.36/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp (294256 => 294257)
--- releases/WebKitGTK/webkit-2.36/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2022-05-16 21:19:36 UTC (rev 294256)
+++ releases/WebKitGTK/webkit-2.36/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2022-05-16 21:19:45 UTC (rev 294257)
@@ -40,6 +40,7 @@
#include "NFA.h"
#include "NFAToDFA.h"
#include "URLFilterParser.h"
+#include <wtf/CrossThreadCopier.h>
#include <wtf/DataLog.h>
#include <wtf/text/CString.h>
#include <wtf/text/StringBuilder.h>
Modified: releases/WebKitGTK/webkit-2.36/Source/WebCore/workers/service/ServiceWorkerClients.cpp (294256 => 294257)
--- releases/WebKitGTK/webkit-2.36/Source/WebCore/workers/service/ServiceWorkerClients.cpp 2022-05-16 21:19:36 UTC (rev 294256)
+++ releases/WebKitGTK/webkit-2.36/Source/WebCore/workers/service/ServiceWorkerClients.cpp 2022-05-16 21:19:45 UTC (rev 294257)
@@ -30,6 +30,7 @@
#include "JSDOMPromiseDeferred.h"
#include "JSServiceWorkerWindowClient.h"
+#include "Logging.h"
#include "SWContextManager.h"
#include "ServiceWorker.h"
#include "ServiceWorkerGlobalScope.h"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
