Non-unified build fixes, early May 2024 edition

https://bugs.webkit.org/show_bug.cgi?id=273273 Unreviewed non-unified build fix. Fixing non-unified build for PlayStation. * Source/JavaScriptCore/jit/ExecutableAllocator.cpp: * Source/JavaScriptCore/runtime/JSCBytecodeCacheVersion.cpp: * Source/WebCore/bindings/js/DOMWrapperWorld.cpp: * Source/WebCore/crypto/algorithms/CryptoAlgorithmHKDF.cpp: * Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp: * Source/WebCore/dom/WindowEventLoop.cpp: * Source/WebCore/layout/FormattingState.cpp: * Source/WebCore/layout/Verification.cpp: * Source/WebCore/layout/floats/FloatAvoider.cpp: * Source/WebCore/layout/formattingContexts/block/BlockFormattingState.cpp: * Source/WebCore/layout/formattingContexts/block/tablewrapper/TableWrapperBlockFormattingContext.cpp: * Source/WebCore/layout/formattingContexts/block/tablewrapper/TableWrapperBlockFormattingQuirks.cpp: * Source/WebCore/layout/formattingContexts/inline/InlineItem.cpp: * Source/WebCore/layout/formattingContexts/table/TableFormattingState.cpp: * Source/WebCore/layout/formattingContexts/table/TableGrid.cpp: * Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp: * Source/WebCore/layout/layouttree/LayoutInitialContainingBlock.cpp: * Source/WebCore/layout/layouttree/LayoutInlineTextBox.cpp: * Source/WebCore/page/ElementTargetingController.cpp: * Source/WebCore/page/ElementTargetingController.h: * Source/WebCore/platform/graphics/FontCascadeDescription.cpp: * Source/WebCore/platform/graphics/PixelFormatValidated.cpp: * Source/WebCore/svg/properties/SVGSharedPrimitiveProperty.h: * Source/WebCore/xml/parser/XMLDocumentParserScope.cpp: * Source/WebCore/xml/parser/XMLDocumentParserScope.h: * Source/WebKit/UIProcess/API/APITargetedElementRequest.cpp: (API::TargetedElementRequest::makeRequest const): * Source/WebKit/UIProcess/API/APITargetedElementRequest.h: Canonical link: https://commits.webkit.org/278302@main
WebKit · May 3, 2024 · 1492af7 · 1492af7
1 parent 69188a6
commit 1492af7
Show file tree

Hide file tree

Showing 27 changed files with 31 additions and 7 deletions.
diff --git a/Source/JavaScriptCore/jit/ExecutableAllocator.cpp b/Source/JavaScriptCore/jit/ExecutableAllocator.cpp
@@ -157,8 +157,10 @@ static_assert(fixedExecutableMemoryPoolSize * executablePoolReservationFraction
 static_assert(fixedExecutableMemoryPoolSize < 4 * GB, "ExecutableMemoryHandle assumes it is less than 4GB");
 #endif
 
+#if HAVE(KDEBUG_H)
 // 325696c8-e7cc-11ee-9f4e-325096b39f47
 static constexpr WTF::UUID jscJITNamespace { static_cast<UInt128>(0x325696c8e7cc11eeULL) << 64 | (0x9f4e325096b39f47ULL) };
+#endif
 
 static bool isJITEnabled()
 {

diff --git a/Source/JavaScriptCore/runtime/JSCBytecodeCacheVersion.cpp b/Source/JavaScriptCore/runtime/JSCBytecodeCacheVersion.cpp
@@ -39,9 +39,11 @@
 
 namespace JSC {
 
+#if OS(DARWIN)
 namespace JSCBytecodeCacheVersionInternal {
 static constexpr bool verbose = false;
 }
+#endif
 
 uint32_t computeJSCBytecodeCacheVersion()
 {

diff --git a/Source/WebCore/bindings/js/DOMWrapperWorld.cpp b/Source/WebCore/bindings/js/DOMWrapperWorld.cpp
@@ -24,6 +24,8 @@
 #include "CommonVM.h"
 #include "WebCoreJSClientData.h"
 #include "WindowProxy.h"
+#include <JavaScriptCore/HeapCellInlines.h>
+#include <JavaScriptCore/SlotVisitorInlines.h>
 #include <JavaScriptCore/WeakInlines.h>
 #include <wtf/MainThread.h>
 

diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmHKDF.cpp b/Source/WebCore/crypto/algorithms/CryptoAlgorithmHKDF.cpp
@@ -28,6 +28,7 @@
 
 #include "CryptoAlgorithmHkdfParams.h"
 #include "CryptoKeyRaw.h"
+#include "ScriptExecutionContext.h"
 #include <JavaScriptCore/JSCJSValueInlines.h>
 #include <wtf/CrossThreadCopier.h>
 

diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp b/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp
@@ -28,6 +28,7 @@
 
 #include "CryptoAlgorithmHmacKeyParams.h"
 #include "CryptoKeyHMAC.h"
+#include "ScriptExecutionContext.h"
 #include <variant>
 
 namespace WebCore {

diff --git a/Source/WebCore/dom/WindowEventLoop.cpp b/Source/WebCore/dom/WindowEventLoop.cpp
@@ -67,8 +67,6 @@ static String agentClusterKeyOrNullIfUnique(const SecurityOrigin& origin)
     return key;
 }
 
-static constexpr auto IdleCallbackDurationExpectation = 4_ms;
-
 Ref<WindowEventLoop> WindowEventLoop::eventLoopForSecurityOrigin(const SecurityOrigin& origin)
 {
     auto key = agentClusterKeyOrNullIfUnique(origin);

diff --git a/Source/WebCore/layout/FormattingState.cpp b/Source/WebCore/layout/FormattingState.cpp
@@ -27,6 +27,7 @@
 #include "FormattingState.h"
 
 #include "LayoutBoxGeometry.h"
+#include "RenderObject.h"
 #include <wtf/IsoMallocInlines.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/layout/Verification.cpp b/Source/WebCore/layout/Verification.cpp
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "LayoutState.h"
 
+#include "RenderObject.h"
+
 #if ASSERT_ENABLED
 
 #include "BlockFormattingState.h"

diff --git a/Source/WebCore/layout/floats/FloatAvoider.cpp b/Source/WebCore/layout/floats/FloatAvoider.cpp
@@ -28,6 +28,7 @@
 
 #include "LayoutBox.h"
 #include "LayoutElementBox.h"
+#include "RenderObject.h"
 #include <wtf/IsoMallocInlines.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/layout/formattingContexts/block/BlockFormattingState.cpp b/Source/WebCore/layout/formattingContexts/block/BlockFormattingState.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "BlockFormattingState.h"
 
+#include "RenderObject.h"
 #include <wtf/IsoMallocInlines.h>
 
 namespace WebCore {

diff --git a/...bCore/layout/formattingContexts/block/tablewrapper/TableWrapperBlockFormattingContext.cpp b/...bCore/layout/formattingContexts/block/tablewrapper/TableWrapperBlockFormattingContext.cpp
@@ -33,6 +33,7 @@
 #include "LayoutChildIterator.h"
 #include "LayoutContext.h"
 #include "LayoutInitialContainingBlock.h"
+#include "RenderObject.h"
 #include "TableFormattingConstraints.h"
 #include "TableFormattingContext.h"
 #include "TableFormattingState.h"

diff --git a/...ebCore/layout/formattingContexts/block/tablewrapper/TableWrapperBlockFormattingQuirks.cpp b/...ebCore/layout/formattingContexts/block/tablewrapper/TableWrapperBlockFormattingQuirks.cpp
@@ -28,6 +28,7 @@
 
 #include "BlockFormattingGeometry.h"
 #include "LayoutState.h"
+#include "RenderObject.h"
 #include "TableWrapperBlockFormattingContext.h"
 
 namespace WebCore {

diff --git a/Source/WebCore/layout/formattingContexts/inline/InlineItem.cpp b/Source/WebCore/layout/formattingContexts/inline/InlineItem.cpp
@@ -27,6 +27,7 @@
 #include "InlineItem.h"
 
 #include "InlineTextItem.h"
+#include "RenderObject.h"
 
 namespace WebCore {
 namespace Layout {

diff --git a/Source/WebCore/layout/formattingContexts/table/TableFormattingState.cpp b/Source/WebCore/layout/formattingContexts/table/TableFormattingState.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "TableFormattingState.h"
 
+#include "RenderObject.h"
 #include "TableFormattingContext.h"
 #include <wtf/IsoMallocInlines.h>
 

diff --git a/Source/WebCore/layout/formattingContexts/table/TableGrid.cpp b/Source/WebCore/layout/formattingContexts/table/TableGrid.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "TableGrid.h"
 
+#include "RenderObject.h"
 #include <wtf/IsoMallocInlines.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp b/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp
@@ -53,8 +53,6 @@
 namespace WebCore {
 namespace LayoutIntegration {
 
-static constexpr size_t smallTreeThreshold = 8;
-
 static std::unique_ptr<RenderStyle> firstLineStyleFor(const RenderObject& renderer)
 {
     auto& firstLineStyle = renderer.firstLineStyle();

diff --git a/Source/WebCore/layout/layouttree/LayoutInitialContainingBlock.cpp b/Source/WebCore/layout/layouttree/LayoutInitialContainingBlock.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "LayoutInitialContainingBlock.h"
 
+#include "RenderObject.h"
 #include "RenderStyle.h"
 #include <wtf/IsoMallocInlines.h>
 

diff --git a/Source/WebCore/layout/layouttree/LayoutInlineTextBox.cpp b/Source/WebCore/layout/layouttree/LayoutInlineTextBox.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "LayoutInlineTextBox.h"
 
+#include "RenderObject.h"
 #include "RenderStyle.h"
 #include <wtf/IsoMallocInlines.h>
 

diff --git a/Source/WebCore/page/ElementTargetingController.cpp b/Source/WebCore/page/ElementTargetingController.cpp
@@ -36,6 +36,7 @@
 #include "ElementAncestorIteratorInlines.h"
 #include "ElementChildIteratorInlines.h"
 #include "ElementInlines.h"
+#include "ElementRareData.h"
 #include "ElementTargetingTypes.h"
 #include "FloatPoint.h"
 #include "FloatRect.h"

diff --git a/Source/WebCore/page/ElementTargetingController.h b/Source/WebCore/page/ElementTargetingController.h
@@ -28,13 +28,12 @@
 #include "ElementIdentifier.h"
 #include "ElementTargetingTypes.h"
 #include "EventTarget.h"
-#include "IntRect.h"
+#include "IntRectHash.h"
 #include "Region.h"
 #include "ScriptExecutionContextIdentifier.h"
 #include "Timer.h"
 #include <wtf/ApproximateTime.h>
 #include <wtf/CheckedPtr.h>
-#include <wtf/HashMap.h>
 #include <wtf/Ref.h>
 #include <wtf/Vector.h>
 #include <wtf/WeakHashSet.h>

diff --git a/Source/WebCore/platform/graphics/FontCascadeDescription.cpp b/Source/WebCore/platform/graphics/FontCascadeDescription.cpp
@@ -30,6 +30,7 @@
 #include "config.h"
 #include "FontCascadeDescription.h"
 
+#include "Font.h"
 #include <wtf/text/StringHash.h>
 
 #if USE(CORE_TEXT)

diff --git a/Source/WebCore/platform/graphics/PixelFormatValidated.cpp b/Source/WebCore/platform/graphics/PixelFormatValidated.cpp
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "PixelFormatValidated.h"
 
+#include "PixelFormat.h"
+
 namespace WebCore {
 
 PixelFormatValidated convertPixelFormatToPixelFormatValidated(PixelFormat format)

diff --git a/Source/WebCore/svg/properties/SVGSharedPrimitiveProperty.h b/Source/WebCore/svg/properties/SVGSharedPrimitiveProperty.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include "SVGProperty.h"
+#include "SVGPropertyTraits.h"
 
 namespace WebCore {
 

diff --git a/Source/WebCore/xml/parser/XMLDocumentParserScope.cpp b/Source/WebCore/xml/parser/XMLDocumentParserScope.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "XMLDocumentParserScope.h"
 
+#include "CachedResourceLoader.h"
 #include "XMLDocumentParser.h"
 
 namespace WebCore {

diff --git a/Source/WebCore/xml/parser/XMLDocumentParserScope.h b/Source/WebCore/xml/parser/XMLDocumentParserScope.h
@@ -25,7 +25,9 @@
 
 #pragma once
 
+#include <libxml/parser.h>
 #include <wtf/Noncopyable.h>
+#include <wtf/WeakPtr.h>
 
 #if ENABLE(XSLT)
 #include <libxml/xmlerror.h>

diff --git a/Source/WebKit/UIProcess/API/APITargetedElementRequest.cpp b/Source/WebKit/UIProcess/API/APITargetedElementRequest.cpp
@@ -57,7 +57,7 @@ void TargetedElementRequest::setSearchText(WTF::String&& searchText)
     m_request.data = WTFMove(searchText);
 }
 
-WebCore::TargetedElementRequest TargetedElementRequest::makeRequest(const WebPageProxy& page) const
+WebCore::TargetedElementRequest TargetedElementRequest::makeRequest(const WebKit::WebPageProxy& page) const
 {
     auto request = m_request;
     if (std::holds_alternative<WebCore::FloatPoint>(m_request.data))

diff --git a/Source/WebKit/UIProcess/API/APITargetedElementRequest.h b/Source/WebKit/UIProcess/API/APITargetedElementRequest.h
@@ -25,6 +25,7 @@
 
 #pragma once
 
+#include "APIObject.h"
 #include <WebCore/ElementTargetingTypes.h>
 
 namespace WebKit {