Non-unified build fixes, early March 2023 edition

https://bugs.webkit.org/show_bug.cgi?id=253593 Unreviewed non-unified build fix. PlayStation debug build using Clang 16. Fixing any warnings along the way. * Source/JavaScriptCore/bytecode/ArrayProfile.cpp: * Source/JavaScriptCore/bytecode/ExecutionCounter.h: * Source/JavaScriptCore/bytecode/SpeculatedType.cpp: * Source/JavaScriptCore/parser/ParserError.h: * Source/JavaScriptCore/runtime/DataView.cpp: * Source/JavaScriptCore/runtime/GlobalObjectMethodTable.h: * Source/JavaScriptCore/runtime/LazyClassStructure.h: * Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp: * Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp: * Source/WebCore/animation/KeyframeEffect.h: * Source/WebCore/bindings/js/JSDOMGuardedObject.h: * Source/WebCore/bindings/js/WebCoreTypedArrayController.h: * Source/WebCore/bridge/runtime_method.h: * Source/WebCore/css/StyleRuleImport.cpp: * Source/WebCore/dom/FullscreenManager.cpp: * Source/WebCore/editing/TextManipulationController.cpp: * Source/WebCore/html/HTMLFormControlElement.cpp: * Source/WebCore/html/HTMLLinkElement.cpp: * Source/WebCore/html/HTMLMeterElement.cpp: * Source/WebCore/html/HTMLStyleElement.cpp: * Source/WebCore/inspector/agents/InspectorWorkerAgent.cpp: * Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp: * Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp: * Source/WebCore/layout/formattingContexts/inline/invalidation/InlineDamage.h: * Source/WebCore/layout/layouttree/LayoutBox.cpp: * Source/WebCore/loader/DocumentWriter.cpp: * Source/WebCore/page/PageConfiguration.cpp: * Source/WebCore/page/RemoteFrame.cpp: * Source/WebCore/platform/graphics/TextTransform.h: * Source/WebCore/svg/animation/SVGSMILElement.cpp: * Source/WebCore/workers/service/ExtendableEvent.cpp: * Source/WebCore/workers/service/background-fetch/BackgroundFetch.cpp: * Source/WebCore/workers/service/background-fetch/BackgroundFetchEngine.cpp: * Source/WebCore/workers/service/background-fetch/BackgroundFetchManager.cpp: * Source/WebCore/worklets/Worklet.cpp: * Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp: * Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp: * Source/WebKit/UIProcess/WebScreenOrientationManagerProxy.cpp: Canonical link: https://commits.webkit.org/261398@main
WebKit · Mar 9, 2023 · 409dc44 · 409dc44
1 parent 0ca8535
commit 409dc44
Show file tree

Hide file tree

Showing 38 changed files with 49 additions and 22 deletions.
diff --git a/Source/JavaScriptCore/bytecode/ArrayProfile.cpp b/Source/JavaScriptCore/bytecode/ArrayProfile.cpp
@@ -28,6 +28,7 @@
 
 #include "CodeBlock.h"
 #include "JSCellInlines.h"
+#include "JSGlobalObjectInlines.h"
 #include "JSTypedArrays.h"
 #include <wtf/CommaPrinter.h>
 #include <wtf/StringPrintStream.h>

diff --git a/Source/JavaScriptCore/bytecode/ExecutionCounter.h b/Source/JavaScriptCore/bytecode/ExecutionCounter.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include "Options.h"
+#include <wtf/Nonmovable.h>
 #include <wtf/PrintStream.h>
 
 namespace JSC {

diff --git a/Source/JavaScriptCore/bytecode/SpeculatedType.cpp b/Source/JavaScriptCore/bytecode/SpeculatedType.cpp
@@ -39,7 +39,7 @@
 #include "JSCellInlines.h"
 #include "JSDataView.h"
 #include "JSFunction.h"
-#include "JSGenericTypedArrayView.h"
+#include "JSGenericTypedArrayViewInlines.h"
 #include "JSMap.h"
 #include "JSPromise.h"
 #include "JSSet.h"

diff --git a/Source/JavaScriptCore/parser/ParserError.h b/Source/JavaScriptCore/parser/ParserError.h
@@ -28,7 +28,9 @@
 #include "Error.h"
 #include "ErrorHandlingScope.h"
 #include "ExceptionHelpers.h"
+#include "JSGlobalObject.h"
 #include "ParserTokens.h"
+#include "SourceCode.h"
 #include <wtf/text/WTFString.h>
 
 namespace JSC {

diff --git a/Source/JavaScriptCore/runtime/DataView.cpp b/Source/JavaScriptCore/runtime/DataView.cpp
@@ -28,7 +28,7 @@
 
 #include "HeapInlines.h"
 #include "JSDataView.h"
-#include "JSGlobalObject.h"
+#include "JSGlobalObjectInlines.h"
 
 namespace JSC {
 

diff --git a/Source/JavaScriptCore/runtime/GlobalObjectMethodTable.h b/Source/JavaScriptCore/runtime/GlobalObjectMethodTable.h
@@ -36,6 +36,7 @@ class JSString;
 class JSValue;
 class Microtask;
 class RuntimeFlags;
+class SourceOrigin;
 
 enum class ScriptExecutionStatus;
 

diff --git a/Source/JavaScriptCore/runtime/LazyClassStructure.h b/Source/JavaScriptCore/runtime/LazyClassStructure.h
@@ -26,6 +26,8 @@
 #pragma once
 
 #include "LazyProperty.h"
+#include "Structure.h"
+#include "WriteBarrier.h"
 
 namespace JSC {
 

diff --git a/Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp b/Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp
@@ -30,6 +30,7 @@
 #include "FetchBodyConsumer.h"
 
 #include "DOMFormData.h"
+#include "FetchBodyOwner.h"
 #include "FormData.h"
 #include "FormDataConsumer.h"
 #include "HTTPHeaderField.h"

diff --git a/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp b/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp
@@ -37,6 +37,7 @@
 #include "FrameLoader.h"
 #include "HTTPHeaderValues.h"
 #include "Page.h"
+#include "Quirks.h"
 #include "ScriptExecutionContext.h"
 #include "SocketProvider.h"
 #include "ThreadableWebSocketChannelClientWrapper.h"

diff --git a/Source/WebCore/animation/KeyframeEffect.h b/Source/WebCore/animation/KeyframeEffect.h
@@ -194,7 +194,9 @@ class KeyframeEffect final : public AnimationEffect, public CSSPropertyBlendingC
     private:
         KeyframeEffect* m_effect;
         bool m_couldOriginallyPreventAcceleration;
+#if ENABLE(THREADED_ANIMATION_RESOLUTION)
         bool m_couldOriginallyBeAccelerated;
+#endif
     };
 
     void updateEffectStackMembership();

diff --git a/Source/WebCore/bindings/js/JSDOMGuardedObject.h b/Source/WebCore/bindings/js/JSDOMGuardedObject.h
@@ -33,6 +33,8 @@
 
 namespace WebCore {
 
+class JSDOMGlobalObject;
+
 class WEBCORE_EXPORT DOMGuardedObject : public RefCounted<DOMGuardedObject>, public ActiveDOMCallback {
 public:
     ~DOMGuardedObject();

diff --git a/Source/WebCore/bindings/js/WebCoreTypedArrayController.h b/Source/WebCore/bindings/js/WebCoreTypedArrayController.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include <JavaScriptCore/TypedArrayController.h>
+#include <JavaScriptCore/WeakHandleOwner.h>
 
 namespace JSC {
 class WeakHandleOwner;
@@ -39,7 +40,7 @@ class WebCoreTypedArrayController : public JSC::TypedArrayController {
     virtual ~WebCoreTypedArrayController();
 
     JSC::JSArrayBuffer* toJS(JSC::JSGlobalObject*, JSC::JSGlobalObject*, JSC::ArrayBuffer*) override;
-    void registerWrapper(JSC::JSGlobalObject*, ArrayBuffer*, JSC::JSArrayBuffer*) override;
+    void registerWrapper(JSC::JSGlobalObject*, JSC::ArrayBuffer*, JSC::JSArrayBuffer*) override;
     bool isAtomicsWaitAllowedOnCurrentThread() override;
 
     JSC::WeakHandleOwner* wrapperOwner() { return &m_owner; }

diff --git a/Source/WebCore/bridge/runtime_method.h b/Source/WebCore/bridge/runtime_method.h
@@ -27,6 +27,7 @@
 
 #include "BridgeJSC.h"
 #include <JavaScriptCore/InternalFunction.h>
+#include <JavaScriptCore/JSGlobalObject.h>
 
 namespace JSC {
 

diff --git a/Source/WebCore/css/StyleRuleImport.cpp b/Source/WebCore/css/StyleRuleImport.cpp
@@ -30,6 +30,7 @@
 #include "Document.h"
 #include "MediaList.h"
 #include "MediaQueryParserContext.h"
+#include "Page.h"
 #include "SecurityOrigin.h"
 #include "StyleSheetContents.h"
 #include <wtf/StdLibExtras.h>

diff --git a/Source/WebCore/dom/FullscreenManager.cpp b/Source/WebCore/dom/FullscreenManager.cpp
@@ -41,6 +41,7 @@
 #include "JSDOMPromiseDeferred.h"
 #include "Logging.h"
 #include "Page.h"
+#include "PopoverData.h"
 #include "PseudoClassChangeInvalidation.h"
 #include "QualifiedName.h"
 #include "Settings.h"

diff --git a/Source/WebCore/editing/TextManipulationController.cpp b/Source/WebCore/editing/TextManipulationController.cpp
@@ -31,6 +31,7 @@
 #include "CharacterData.h"
 #include "Editing.h"
 #include "ElementAncestorIteratorInlines.h"
+#include "ElementRareData.h"
 #include "EventLoop.h"
 #include "FrameView.h"
 #include "HTMLBRElement.h"
@@ -45,6 +46,7 @@
 #include "PseudoElement.h"
 #include "RenderBox.h"
 #include "ScriptDisallowedScope.h"
+#include "ShadowRoot.h"
 #include "Text.h"
 #include "TextIterator.h"
 #include "VisibleUnits.h"

diff --git a/Source/WebCore/html/HTMLFormControlElement.cpp b/Source/WebCore/html/HTMLFormControlElement.cpp
@@ -34,6 +34,7 @@
 #include "FormAssociatedElement.h"
 #include "Frame.h"
 #include "FrameView.h"
+#include "HTMLButtonElement.h"
 #include "HTMLFormElement.h"
 #include "HTMLInputElement.h"
 #include "HTMLParserIdioms.h"

diff --git a/Source/WebCore/html/HTMLLinkElement.cpp b/Source/WebCore/html/HTMLLinkElement.cpp
@@ -54,6 +54,7 @@
 #include "MediaQueryParser.h"
 #include "MediaQueryParserContext.h"
 #include "MouseEvent.h"
+#include "Page.h"
 #include "ParsedContentType.h"
 #include "RenderStyle.h"
 #include "RequestPriority.h"

diff --git a/Source/WebCore/html/HTMLMeterElement.cpp b/Source/WebCore/html/HTMLMeterElement.cpp
@@ -22,6 +22,7 @@
 #include "HTMLMeterElement.h"
 
 #include "Attribute.h"
+#include "ElementInlines.h"
 #include "ElementIterator.h"
 #include "HTMLDivElement.h"
 #include "HTMLFormElement.h"

diff --git a/Source/WebCore/html/HTMLStyleElement.cpp b/Source/WebCore/html/HTMLStyleElement.cpp
@@ -32,6 +32,7 @@
 #include "HTMLNames.h"
 #include "MediaQueryParser.h"
 #include "MediaQueryParserContext.h"
+#include "Page.h"
 #include "ScriptableDocumentParser.h"
 #include "ShadowRoot.h"
 #include "StyleScope.h"

diff --git a/Source/WebCore/inspector/agents/InspectorWorkerAgent.cpp b/Source/WebCore/inspector/agents/InspectorWorkerAgent.cpp
@@ -28,10 +28,10 @@
 
 #include "Document.h"
 #include "InstrumentingAgents.h"
+#include "Page.h"
 #include <wtf/Ref.h>
 #include <wtf/RefPtr.h>
 
-
 namespace WebCore {
 
 using namespace Inspector;

diff --git a/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp b/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp
@@ -36,20 +36,6 @@
 namespace WebCore {
 namespace Layout {
 
-
-#if ASSERT_ENABLED
-static inline bool hasTrailingTextContent(const InlineContentBreaker::ContinuousContent& continuousContent)
-{
-    for (auto& run : makeReversedRange(continuousContent.runs())) {
-        auto& inlineItem = run.inlineItem;
-        if (inlineItem.isInlineBoxStart() || inlineItem.isInlineBoxEnd())
-            continue;
-        return inlineItem.isText();
-    }
-    return false;
-}
-#endif
-
 static inline bool hasLeadingTextContent(const InlineContentBreaker::ContinuousContent& continuousContent)
 {
     for (auto& run : continuousContent.runs()) {

diff --git a/Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp b/Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp
@@ -26,11 +26,13 @@
 #include "config.h"
 #include "InlineItemsBuilder.h"
 
+#include "FontCascade.h"
 #include "InlineSoftLineBreakItem.h"
 #include "StyleResolver.h"
 #include "TextUtil.h"
 #include <wtf/Scope.h>
 #include <wtf/text/TextBreakIterator.h>
+#include <wtf/unicode/CharacterNames.h>
 
 namespace WebCore {
 namespace Layout {

diff --git a/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineDamage.h b/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineDamage.h
@@ -31,6 +31,7 @@
 namespace WebCore {
 namespace Layout {
 
+class Box;
 class InlineInvalidation;
 
 class InlineDamage {

diff --git a/Source/WebCore/layout/layouttree/LayoutBox.cpp b/Source/WebCore/layout/layouttree/LayoutBox.cpp
@@ -33,6 +33,7 @@
 #include "LayoutPhase.h"
 #include "LayoutState.h"
 #include "RenderStyle.h"
+#include "Shape.h"
 #include <wtf/IsoMallocInlines.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/loader/DocumentWriter.cpp b/Source/WebCore/loader/DocumentWriter.cpp
@@ -43,6 +43,7 @@
 #include "HistoryController.h"
 #include "HistoryItem.h"
 #include "MIMETypeRegistry.h"
+#include "Page.h"
 #include "PluginDocument.h"
 #include "RawDataDocumentParser.h"
 #include "ScriptController.h"

diff --git a/Source/WebCore/page/PageConfiguration.cpp b/Source/WebCore/page/PageConfiguration.cpp
@@ -33,12 +33,14 @@
 #include "BadgeClient.h"
 #include "BroadcastChannelRegistry.h"
 #include "CacheStorageProvider.h"
+#include "ChromeClient.h"
 #include "CookieJar.h"
 #include "DatabaseProvider.h"
 #include "DiagnosticLoggingClient.h"
 #include "DragClient.h"
 #include "EditorClient.h"
 #include "FrameLoaderClient.h"
+#include "InspectorClient.h"
 #include "MediaRecorderProvider.h"
 #include "ModelPlayerProvider.h"
 #include "PerformanceLoggingClient.h"

diff --git a/Source/WebCore/page/RemoteFrame.cpp b/Source/WebCore/page/RemoteFrame.cpp
@@ -27,6 +27,7 @@
 #include "RemoteFrame.h"
 
 #include "Document.h"
+#include "FrameDestructionObserverInlines.h"
 #include "HTMLFrameOwnerElement.h"
 #include "RemoteDOMWindow.h"
 #include "RemoteFrameClient.h"

diff --git a/Source/WebCore/platform/graphics/TextTransform.h b/Source/WebCore/platform/graphics/TextTransform.h
@@ -28,6 +28,8 @@
 
 #pragma once
 
+#include <wtf/text/WTFString.h>
+
 namespace WebCore {
 
 // https://w3c.github.io/csswg-drafts/css-text/#full-width

diff --git a/Source/WebCore/svg/animation/SVGSMILElement.cpp b/Source/WebCore/svg/animation/SVGSMILElement.cpp
@@ -36,6 +36,7 @@
 #include "EventSender.h"
 #include "FloatConversion.h"
 #include "FrameView.h"
+#include "Page.h"
 #include "SMILTimeContainer.h"
 #include "SVGDocumentExtensions.h"
 #include "SVGElementInlines.h"

diff --git a/Source/WebCore/workers/service/ExtendableEvent.cpp b/Source/WebCore/workers/service/ExtendableEvent.cpp
@@ -28,6 +28,7 @@
 
 #if ENABLE(SERVICE_WORKER)
 
+#include "JSDOMGlobalObject.h"
 #include "JSDOMPromise.h"
 #include "ScriptExecutionContext.h"
 #include <JavaScriptCore/Microtask.h>

diff --git a/Source/WebCore/workers/service/background-fetch/BackgroundFetch.cpp b/Source/WebCore/workers/service/background-fetch/BackgroundFetch.cpp
@@ -32,8 +32,10 @@
 #include "BackgroundFetchRecordInformation.h"
 #include "CacheQueryOptions.h"
 #include "ContentSecurityPolicyResponseHeaders.h"
+#include "DOMCacheEngine.h"
 #include "ExceptionData.h"
 #include "Logging.h"
+#include "RetrieveRecordsOptions.h"
 #include "SWServerRegistration.h"
 #include "WebCorePersistentCoders.h"
 #include <wtf/persistence/PersistentCoders.h>

diff --git a/Source/WebCore/workers/service/background-fetch/BackgroundFetchEngine.cpp b/Source/WebCore/workers/service/background-fetch/BackgroundFetchEngine.cpp
@@ -28,8 +28,12 @@
 
 #if ENABLE(SERVICE_WORKER)
 
+#include "BackgroundFetchInformation.h"
+#include "BackgroundFetchRecordInformation.h"
 #include "ExceptionData.h"
 #include "Logging.h"
+#include "RetrieveRecordsOptions.h"
+#include "SWServerRegistration.h"
 #include "SWServerToContextConnection.h"
 
 namespace WebCore {

diff --git a/Source/WebCore/workers/service/background-fetch/BackgroundFetchManager.cpp b/Source/WebCore/workers/service/background-fetch/BackgroundFetchManager.cpp
@@ -30,6 +30,7 @@
 
 #include "BackgroundFetchInformation.h"
 #include "BackgroundFetchRequest.h"
+#include "ContentSecurityPolicy.h"
 #include "FetchRequest.h"
 #include "JSBackgroundFetchRegistration.h"
 #include "SWClientConnection.h"

diff --git a/Source/WebCore/worklets/Worklet.cpp b/Source/WebCore/worklets/Worklet.cpp
@@ -29,6 +29,7 @@
 #include "ContentSecurityPolicy.h"
 #include "Document.h"
 #include "JSDOMPromiseDeferred.h"
+#include "Page.h"
 #include "ScriptSourceCode.h"
 #include "SecurityOrigin.h"
 #include "WorkerRunLoop.h"

diff --git a/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp b/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp
@@ -65,8 +65,6 @@ constexpr auto countSubframeUnderTopFrameQuery = "SELECT COUNT(*) FROM SubframeU
 constexpr auto countSubresourceUnderTopFrameQuery = "SELECT COUNT(*) FROM SubresourceUnderTopFrameDomains WHERE subresourceDomainID = ? AND topFrameDomainID = ?;"_s;
 constexpr auto countSubresourceUniqueRedirectsToQuery = "SELECT COUNT(*) FROM SubresourceUniqueRedirectsTo WHERE subresourceDomainID = ? AND toDomainID = ?;"_s;
 
-constexpr auto countPrevalentResourcesWithoutUserInteractionQuery = "SELECT COUNT(DISTINCT registrableDomain) FROM ObservedDomains WHERE isPrevalent = 1 AND hadUserInteraction = 0;"_s;
-
 // INSERT OR IGNORE Queries
 constexpr auto insertObservedDomainQuery = "INSERT INTO ObservedDomains (registrableDomain, lastSeen, hadUserInteraction,"
     "mostRecentUserInteractionTime, grandfathered, isPrevalent, isVeryPrevalent, dataRecordsRemoved, timesAccessedAsFirstPartyDueToUserInteraction,"

diff --git a/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp b/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp
@@ -82,7 +82,7 @@ ProvisionalFrameProxy::ProvisionalFrameProxy(WebFrameProxy& frame, Ref<WebProces
 
     // FIXME: This gives too much cookie access. This should be removed after putting the entire frame tree in all web processes.
     auto giveAllCookieAccess = LoadedWebArchive::Yes;
-    page.websiteDataStore().networkProcess().sendWithAsyncReply(Messages::NetworkProcess::AddAllowedFirstPartyForCookies(m_process->coreProcessIdentifier(), RegistrableDomain(request.url()), giveAllCookieAccess), [process = m_process, loadParameters = WTFMove(loadParameters), pageID = m_pageID] () mutable {
+    page.websiteDataStore().networkProcess().sendWithAsyncReply(Messages::NetworkProcess::AddAllowedFirstPartyForCookies(m_process->coreProcessIdentifier(), WebCore::RegistrableDomain(request.url()), giveAllCookieAccess), [process = m_process, loadParameters = WTFMove(loadParameters), pageID = m_pageID] () mutable {
         // FIXME: Do we need a LoadRequestWaitingForProcessLaunch version?
         process->send(Messages::WebPage::LoadRequest(loadParameters), pageID);
     });

diff --git a/Source/WebKit/UIProcess/WebScreenOrientationManagerProxy.cpp b/Source/WebKit/UIProcess/WebScreenOrientationManagerProxy.cpp
@@ -76,7 +76,7 @@ static WebCore::ScreenOrientationType resolveScreenOrientationLockType(WebCore::
     case WebCore::ScreenOrientationLockType::LandscapeSecondary:
         return WebCore::ScreenOrientationType::LandscapeSecondary;
     case WebCore::ScreenOrientationLockType::Natural: {
-        auto naturalOrientation = naturalScreenOrientationType();
+        auto naturalOrientation = WebCore::naturalScreenOrientationType();
         if (WebCore::isPortrait(naturalOrientation) == WebCore::isPortrait(currentOrientation))
             return currentOrientation;
         return naturalOrientation;