From 409dc44358a366b555d046cccd8483fd96a6f569 Mon Sep 17 00:00:00 2001 From: Don Olmstead Date: Wed, 8 Mar 2023 20:39:50 -0800 Subject: [PATCH] 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 --- Source/JavaScriptCore/bytecode/ArrayProfile.cpp | 1 + Source/JavaScriptCore/bytecode/ExecutionCounter.h | 1 + Source/JavaScriptCore/bytecode/SpeculatedType.cpp | 2 +- Source/JavaScriptCore/parser/ParserError.h | 2 ++ Source/JavaScriptCore/runtime/DataView.cpp | 2 +- .../runtime/GlobalObjectMethodTable.h | 1 + Source/JavaScriptCore/runtime/LazyClassStructure.h | 2 ++ Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp | 1 + .../websockets/ThreadableWebSocketChannel.cpp | 1 + Source/WebCore/animation/KeyframeEffect.h | 2 ++ Source/WebCore/bindings/js/JSDOMGuardedObject.h | 2 ++ .../bindings/js/WebCoreTypedArrayController.h | 3 ++- Source/WebCore/bridge/runtime_method.h | 1 + Source/WebCore/css/StyleRuleImport.cpp | 1 + Source/WebCore/dom/FullscreenManager.cpp | 1 + .../WebCore/editing/TextManipulationController.cpp | 2 ++ Source/WebCore/html/HTMLFormControlElement.cpp | 1 + Source/WebCore/html/HTMLLinkElement.cpp | 1 + Source/WebCore/html/HTMLMeterElement.cpp | 1 + Source/WebCore/html/HTMLStyleElement.cpp | 1 + .../inspector/agents/InspectorWorkerAgent.cpp | 2 +- .../inline/InlineContentBreaker.cpp | 14 -------------- .../inline/InlineItemsBuilder.cpp | 2 ++ .../inline/invalidation/InlineDamage.h | 1 + Source/WebCore/layout/layouttree/LayoutBox.cpp | 1 + Source/WebCore/loader/DocumentWriter.cpp | 1 + Source/WebCore/page/PageConfiguration.cpp | 2 ++ Source/WebCore/page/RemoteFrame.cpp | 1 + Source/WebCore/platform/graphics/TextTransform.h | 2 ++ Source/WebCore/svg/animation/SVGSMILElement.cpp | 1 + Source/WebCore/workers/service/ExtendableEvent.cpp | 1 + .../service/background-fetch/BackgroundFetch.cpp | 2 ++ .../background-fetch/BackgroundFetchEngine.cpp | 4 ++++ .../background-fetch/BackgroundFetchManager.cpp | 1 + Source/WebCore/worklets/Worklet.cpp | 1 + .../ResourceLoadStatisticsDatabaseStore.cpp | 2 -- Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp | 2 +- .../UIProcess/WebScreenOrientationManagerProxy.cpp | 2 +- 38 files changed, 49 insertions(+), 22 deletions(-) diff --git a/Source/JavaScriptCore/bytecode/ArrayProfile.cpp b/Source/JavaScriptCore/bytecode/ArrayProfile.cpp index d3538626cc75..7322a53d0380 100644 --- 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 #include diff --git a/Source/JavaScriptCore/bytecode/ExecutionCounter.h b/Source/JavaScriptCore/bytecode/ExecutionCounter.h index 1e533788f5b2..f8de045a805f 100644 --- a/Source/JavaScriptCore/bytecode/ExecutionCounter.h +++ b/Source/JavaScriptCore/bytecode/ExecutionCounter.h @@ -26,6 +26,7 @@ #pragma once #include "Options.h" +#include #include namespace JSC { diff --git a/Source/JavaScriptCore/bytecode/SpeculatedType.cpp b/Source/JavaScriptCore/bytecode/SpeculatedType.cpp index af24d8188196..602ad3bdece0 100644 --- 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 index 02d3a1969273..a08686676057 100644 --- 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 namespace JSC { diff --git a/Source/JavaScriptCore/runtime/DataView.cpp b/Source/JavaScriptCore/runtime/DataView.cpp index ef0e57b82763..55a16fa68bea 100644 --- 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 index 5f756ba8f1af..0b2cbbb57982 100644 --- 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 index d55fecc13aaa..f26d4b2f7319 100644 --- 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 index 1e4b04883bbd..a976ebb0e6a7 100644 --- 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 index 4b5f978e352b..69b0bcf1edc9 100644 --- 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 index 72fa6ff069e1..bb6734335d43 100644 --- 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 index 61ba233318eb..ec9d30c3a96f 100644 --- 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, public ActiveDOMCallback { public: ~DOMGuardedObject(); diff --git a/Source/WebCore/bindings/js/WebCoreTypedArrayController.h b/Source/WebCore/bindings/js/WebCoreTypedArrayController.h index 0d34173aef84..411ad929ab52 100644 --- a/Source/WebCore/bindings/js/WebCoreTypedArrayController.h +++ b/Source/WebCore/bindings/js/WebCoreTypedArrayController.h @@ -26,6 +26,7 @@ #pragma once #include +#include 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 index 2c9481dc82b1..70bff7347881 100644 --- a/Source/WebCore/bridge/runtime_method.h +++ b/Source/WebCore/bridge/runtime_method.h @@ -27,6 +27,7 @@ #include "BridgeJSC.h" #include +#include namespace JSC { diff --git a/Source/WebCore/css/StyleRuleImport.cpp b/Source/WebCore/css/StyleRuleImport.cpp index 517cb7096937..3e5bc6f20945 100644 --- 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 diff --git a/Source/WebCore/dom/FullscreenManager.cpp b/Source/WebCore/dom/FullscreenManager.cpp index e54d0c6c179a..f58046e83fb8 100644 --- 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 index acbca6030709..5ba56d6bd1ef 100644 --- 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 index b08139bc2a76..d763265f7765 100644 --- 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 index ec5af88aa4f0..9d576082f811 100644 --- 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 index 93ce22740ee5..1738c1da297c 100644 --- 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 index 7ba5ff9e0564..151e2de6549a 100644 --- 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 index e42732004c10..bbed7e5e9aea 100644 --- 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 #include - namespace WebCore { using namespace Inspector; diff --git a/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp b/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp index e49e939a2df2..e2db5dd95701 100644 --- 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 index 2f2083169e15..a345cb37eeb0 100644 --- 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 #include +#include namespace WebCore { namespace Layout { diff --git a/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineDamage.h b/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineDamage.h index 788af865a316..7efcb7d83af6 100644 --- 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 index 2caebd7248bb..fc4f997697aa 100644 --- 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 namespace WebCore { diff --git a/Source/WebCore/loader/DocumentWriter.cpp b/Source/WebCore/loader/DocumentWriter.cpp index 6727693fd85a..1848de9c9788 100644 --- 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 index 2b89e4f075f4..56f9706a76b2 100644 --- 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 index 0f4a90c52a1b..9fb51f7c37c5 100644 --- 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 index abed08eea75c..1ec0d2ec53c0 100644 --- a/Source/WebCore/platform/graphics/TextTransform.h +++ b/Source/WebCore/platform/graphics/TextTransform.h @@ -28,6 +28,8 @@ #pragma once +#include + 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 index 94c1ab5597f6..50580bf11000 100644 --- 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 index 211b2598e20b..3e55a02ebf18 100644 --- 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 diff --git a/Source/WebCore/workers/service/background-fetch/BackgroundFetch.cpp b/Source/WebCore/workers/service/background-fetch/BackgroundFetch.cpp index 3a3a6e1d42fc..257afdd72ea4 100644 --- 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 diff --git a/Source/WebCore/workers/service/background-fetch/BackgroundFetchEngine.cpp b/Source/WebCore/workers/service/background-fetch/BackgroundFetchEngine.cpp index f6ab7db5da10..f7c9a33ec718 100644 --- 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 index a8ac084debda..658ab0408a54 100644 --- 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 index 03c491db0a9e..cbbdd12d7fdd 100644 --- 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 index 98ff51a00adb..619f451eed8b 100644 --- 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 index de6abcf18bb1..e0dae135f4dd 100644 --- a/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp +++ b/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp @@ -82,7 +82,7 @@ ProvisionalFrameProxy::ProvisionalFrameProxy(WebFrameProxy& frame, RefcoreProcessIdentifier(), 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 index 3435f514f11c..3130b8b8b93c 100644 --- 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;