Skip to content

Commit

Permalink
Non-unified build fixes, mid April 2023 edition
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=255717

Unreviewed non-unified build fixes.

* Source/JavaScriptCore/b3/B3Const128Value.cpp: Add missing
  B3ValueInlines.h inclusion.
* Source/JavaScriptCore/b3/air/opcode_generator.rb: Add missing
  B3ProcedureInlines.h inclusion in generated output.
* Source/JavaScriptCore/runtime/PageCount.h: Add missing <algoithm>
  inclusion.
* Source/JavaScriptCore/wasm/WasmTypeDefinition.cpp: Add missing
  JSCJSValueInlines.h inclusion.
* Source/WebCore/Modules/reporting/TestReportBody.cpp: Add missing
  wtf/NeverDestroyed.h inclusion.
* Source/WebCore/Modules/storage/WorkerStorageConnection.cpp: Add
  missing Document.h inclusion.
* Source/WebCore/Modules/streams/ReadableStream.cpp: Add missing
  ScriptExecutionContext.h inclusion.
* Source/WebCore/Modules/streams/ReadableStreamSink.cpp: Add missing
  JSDOMGlobalObject.h inclusion.
* Source/WebCore/bindings/js/InternalReadableStream.cpp: Add missing
  inclusion of the JSDOMConvertObject.h, JSDOMConvertSequences.h, and
  JavaScriptCore/JSObjectInlines.h headers.
(WebCore::InternalReadableStream::pipeTo): Add JSC:: namespace prefix to
usage of JSC::MarkedArgumentBuffer.
(WebCore::InternalReadableStream::tee): Add JSC:: namespace prefix to
usage of JSC::JSValue.
* Source/WebCore/bindings/scripts/CodeGenerator.pm:
(GetterExpression): Ensure that the ElementInlines.h header is included
in generated code that use the getURLAttributeForBindings() and
getNameAttribute() functions.
* Source/WebCore/loader/CORPViolationReportBody.cpp: Add missing
  wtf/NeverDestroyed.h inclusion.
* Source/WebCore/page/csp/CSPViolationReportBody.cpp: Ditto.
* Source/WebCore/platform/RemoteCommandListener.cpp: Ditto.
* Source/WebCore/platform/encryptedmedia/CDMProxy.cpp: Ditto.
* Source/WebCore/rendering/CounterNode.cpp: Add missing RenderView.h
  inclusion.
* Source/WebCore/style/StyleFontSizeFunctions.h: Add missing
  FontSizeAdjust.h inclusion.
* Source/WebCore/style/UserAgentStyle.cpp: Add missing Quirks.h
  inclusion.
* Source/WebCore/workers/service/server/SWRegistrationStore.h: Add
  missing forward declarations for WebCore::ServiceWorkerRegistrationKey
  and WebCore::ServiceWorkerContextData, plus missing inclusions of
  the <optional> and wtf/Forward.h headers.
* Source/WebKit/NetworkProcess/Cookies/WebCookieManager.cpp: Add
  missing MessageSenderInlines.h inclusion.
* Source/WebKit/NetworkProcess/Downloads/Download.cpp: Ditto.
* Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp: Ditto.
* Source/WebKit/NetworkProcess/ServiceWorker/WebSWRegistrationStore.cpp:
  Remove unneeded wtf/CompletionHandler.h inclusion.
(WebKit::WebSWRegistrationStore::updateRegistration): Add WebCore::
namespace prefix to usage of WebCore::ServiceWorkerContextData.
(WebKit::WebSWRegistrationStore::removeRegistration): Add WebCore::
namespace prefix to usage of WebCore::ServiceWorkerRegistrationKey.
(WebKit::WebSWRegistrationStore::updateToStorage): Ditto.
* Source/WebKit/NetworkProcess/ServiceWorker/WebSWRegistrationStore.h:
  Add missing wtf/CompletionHandler.h inclusion.
* Source/WebKit/NetworkProcess/SharedWorker/WebSharedWorkerServerConnection.cpp:
  Add missing MessageSenderInlines.h inclusion.
* Source/WebKit/UIProcess/Inspector/RemoteWebInspectorUIProxy.cpp: Ditto.
* Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp: Ditto.
* Source/WebKit/UIProcess/SpeechRecognitionServer.cpp: Ditto.
* Source/WebKit/UIProcess/SubframePageProxy.cpp: Add missing
  FrameInfoData.h and HandleMessage.h inclusions.
* Source/WebKit/UIProcess/SubframePageProxy.h: Add missing
  WebCore/FrameIdentifier.h inclusion, missing forward declarations
  for WebCore types (FrameLoadType, HasInsecureContent, MouseEventPolicy,
  CertificateInfo, ResourceResponse, ResourceRequest,
  PolicyCheckIdentifierType, PolicyCheckIdentifier) and missing forward
  declarations for WebKit types (UserData, FrameInfoData).
* Source/WebKit/UIProcess/SuspendedPageProxy.cpp:
* Source/WebKit/UIProcess/WebFullScreenManagerProxy.cpp: Add missing
  MessageSenderInlines.h inclusion.
* Source/WebKit/WebProcess/EncryptedMedia/MediaKeySystemPermissionRequestManager.cpp:
  Ditto.
* Source/WebKit/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp: Ditto.
* Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: Ditto.
* Source/WebKit/WebProcess/WebCoreSupport/WebRemoteFrameClient.cpp: Ditto.
* Source/WebKit/WebProcess/WebCoreSupport/WebScreenOrientationManager.cpp: Ditto.
* Source/WebKit/WebProcess/WebCoreSupport/WebSpeechRecognitionConnection.cpp:
  Ditto.
* Source/WebKit/WebProcess/WebPage/WebContextMenu.cpp: Ditto.

Canonical link: https://commits.webkit.org/263171@main
  • Loading branch information
aperezdc committed Apr 20, 2023
1 parent 200b4f5 commit 35bf1a1
Show file tree
Hide file tree
Showing 38 changed files with 71 additions and 7 deletions.
1 change: 1 addition & 0 deletions Source/JavaScriptCore/b3/B3Const128Value.cpp
Expand Up @@ -29,6 +29,7 @@
#include "B3Const128Value.h"

#include "B3Procedure.h"
#include "B3ValueInlines.h"

namespace JSC { namespace B3 {

Expand Down
1 change: 1 addition & 0 deletions Source/JavaScriptCore/b3/air/opcode_generator.rb
Expand Up @@ -839,6 +839,7 @@ def endArchs(outp, archs)
writeH("OpcodeGenerated") {
| outp |
outp.puts "#include \"AirInstInlines.h\""
outp.puts "#include \"B3ProcedureInlines.h\""
outp.puts "#include \"CCallHelpers.h\""
outp.puts "#include \"wtf/PrintStream.h\""
outp.puts "namespace WTF {"
Expand Down
1 change: 1 addition & 0 deletions Source/JavaScriptCore/runtime/PageCount.h
Expand Up @@ -25,6 +25,7 @@

#pragma once

#include <algorithm>
#include <limits.h>

namespace WTF {
Expand Down
1 change: 1 addition & 0 deletions Source/JavaScriptCore/wasm/WasmTypeDefinition.cpp
Expand Up @@ -28,6 +28,7 @@

#if ENABLE(WEBASSEMBLY)

#include "JSCJSValueInlines.h"
#include "JSWebAssemblyArray.h"
#include "JSWebAssemblyStruct.h"
#include "WasmFormat.h"
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/Modules/reporting/TestReportBody.cpp
Expand Up @@ -28,6 +28,7 @@

#include "FormData.h"
#include <wtf/IsoMallocInlines.h>
#include <wtf/NeverDestroyed.h>

namespace WebCore {

Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/Modules/storage/WorkerStorageConnection.cpp
Expand Up @@ -27,6 +27,7 @@
#include "WorkerStorageConnection.h"

#include "ClientOrigin.h"
#include "Document.h"
#include "StorageEstimate.h"
#include "WorkerFileSystemStorageConnection.h"
#include "WorkerGlobalScope.h"
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/Modules/streams/ReadableStream.cpp
Expand Up @@ -28,6 +28,7 @@

#include "JSReadableStream.h"
#include "JSReadableStreamSource.h"
#include "ScriptExecutionContext.h"

namespace WebCore {

Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/Modules/streams/ReadableStreamSink.cpp
Expand Up @@ -28,6 +28,7 @@
#include "ReadableStreamSink.h"

#include "DOMException.h"
#include "JSDOMGlobalObject.h"
#include "ReadableStream.h"
#include "SharedBuffer.h"
#include <JavaScriptCore/Uint8Array.h>
Expand Down
7 changes: 5 additions & 2 deletions Source/WebCore/bindings/js/InternalReadableStream.cpp
Expand Up @@ -26,9 +26,12 @@
#include "config.h"
#include "InternalReadableStream.h"

#include "JSDOMConvertObject.h"
#include "JSDOMConvertSequences.h"
#include "JSDOMException.h"
#include "JSReadableStreamSink.h"
#include "WebCoreJSClientData.h"
#include <JavaScriptCore/JSObjectInlines.h>

namespace WebCore {

Expand Down Expand Up @@ -164,7 +167,7 @@ void InternalReadableStream::pipeTo(ReadableStreamSink& sink)
auto* clientData = static_cast<JSVMClientData*>(globalObject->vm().clientData);
auto& privateName = clientData->builtinFunctions().readableStreamInternalsBuiltins().readableStreamPipeToPrivateName();

MarkedArgumentBuffer arguments;
JSC::MarkedArgumentBuffer arguments;
arguments.append(guardedObject());
arguments.append(toJS(globalObject, globalObject, sink));
ASSERT(!arguments.hasOverflowed());
Expand Down Expand Up @@ -270,7 +273,7 @@ JSC::JSValue InternalReadableStream::tee(JSC::JSGlobalObject& globalObject, bool

JSC::MarkedArgumentBuffer arguments;
arguments.append(guardedObject());
arguments.append(shouldClone ? JSValue(JSC::JSValue::JSTrue) : JSValue(JSC::JSValue::JSFalse));
arguments.append(shouldClone ? JSC::JSValue(JSC::JSValue::JSTrue) : JSC::JSValue(JSC::JSValue::JSFalse));
ASSERT(!arguments.hasOverflowed());

auto result = invokeReadableStreamFunction(globalObject, privateName, arguments);
Expand Down
2 changes: 2 additions & 0 deletions Source/WebCore/bindings/scripts/CodeGenerator.pm
Expand Up @@ -1110,6 +1110,7 @@ sub GetterExpression

my $functionName;
if ($attribute->extendedAttributes->{"URL"}) {
$implIncludes->{"ElementInlines.h"} = 1;
$functionName = "getURLAttributeForBindings";
} elsif ($attributeType->name eq "boolean") {
$implIncludes->{"ElementInlines.h"} = 1;
Expand All @@ -1127,6 +1128,7 @@ sub GetterExpression
$functionName = "getIdAttribute";
$contentAttributeName = "";
} elsif ($contentAttributeName eq "WebCore::HTMLNames::nameAttr") {
$implIncludes->{"ElementInlines.h"} = 1;
$functionName = "getNameAttribute";
$contentAttributeName = "";
} elsif ($generator->IsSVGAnimatedType($attributeType)) {
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/loader/CORPViolationReportBody.cpp
Expand Up @@ -27,6 +27,7 @@
#include "CORPViolationReportBody.h"

#include <wtf/IsoMallocInlines.h>
#include <wtf/NeverDestroyed.h>

namespace WebCore {

Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/page/csp/CSPViolationReportBody.cpp
Expand Up @@ -31,6 +31,7 @@
#include "SecurityPolicyViolationEvent.h"
#include <wtf/IsoMallocInlines.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>

namespace WebCore {

Expand Down
2 changes: 2 additions & 0 deletions Source/WebCore/platform/RemoteCommandListener.cpp
Expand Up @@ -34,6 +34,8 @@
#include "RemoteCommandListenerGLib.h"
#endif

#include <wtf/NeverDestroyed.h>

namespace WebCore {

static RemoteCommandListener::CreationFunction& remoteCommandListenerCreationFunction()
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/platform/encryptedmedia/CDMProxy.cpp
Expand Up @@ -35,6 +35,7 @@
#include "Logging.h"
#include "MediaPlayer.h"
#include <wtf/HexNumber.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/Scope.h>
#include <wtf/StringPrintStream.h>
#include <wtf/text/StringBuilder.h>
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/rendering/CounterNode.cpp
Expand Up @@ -25,6 +25,7 @@
#include "LayoutIntegrationLineLayout.h"
#include "RenderCounter.h"
#include "RenderElement.h"
#include "RenderView.h"
#include <stdio.h>

namespace WebCore {
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/style/StyleFontSizeFunctions.h
Expand Up @@ -25,6 +25,7 @@

#pragma once

#include "FontSizeAdjust.h"
#include "Settings.h"

namespace WebCore {
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/style/UserAgentStyle.cpp
Expand Up @@ -55,6 +55,7 @@
#include "MathMLElement.h"
#include "MediaQueryEvaluator.h"
#include "Page.h"
#include "Quirks.h"
#include "RenderTheme.h"
#include "RuleSetBuilder.h"
#include "SVGElement.h"
Expand Down
6 changes: 6 additions & 0 deletions Source/WebCore/workers/service/server/SWRegistrationStore.h
Expand Up @@ -27,9 +27,15 @@

#if ENABLE(SERVICE_WORKER)

#include <optional>
#include <wtf/Forward.h>

namespace WebCore {

class SWServerRegistration;
class ServiceWorkerRegistrationKey;

struct ServiceWorkerContextData;

class SWRegistrationStore {
WTF_MAKE_FAST_ALLOCATED;
Expand Down
1 change: 1 addition & 0 deletions Source/WebKit/NetworkProcess/Cookies/WebCookieManager.cpp
Expand Up @@ -26,6 +26,7 @@
#include "config.h"
#include "WebCookieManager.h"

#include "MessageSenderInlines.h"
#include "NetworkProcess.h"
#include "NetworkProcessProxyMessages.h"
#include "WebCookieManagerMessages.h"
Expand Down
1 change: 1 addition & 0 deletions Source/WebKit/NetworkProcess/Downloads/Download.cpp
Expand Up @@ -33,6 +33,7 @@
#include "DownloadMonitor.h"
#include "DownloadProxyMessages.h"
#include "Logging.h"
#include "MessageSenderInlines.h"
#include "NetworkDataTask.h"
#include "NetworkProcess.h"
#include "NetworkSession.h"
Expand Down
1 change: 1 addition & 0 deletions Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
Expand Up @@ -30,6 +30,7 @@
#include "FormDataReference.h"
#include "LoadedWebArchive.h"
#include "Logging.h"
#include "MessageSenderInlines.h"
#include "NetworkCache.h"
#include "NetworkCacheSpeculativeLoadManager.h"
#include "NetworkConnectionToWebProcess.h"
Expand Down
Expand Up @@ -30,7 +30,6 @@

#include "NetworkStorageManager.h"
#include <WebCore/SWServer.h>
#include <wtf/CompletionHandler.h>

namespace WebKit {

Expand Down Expand Up @@ -76,13 +75,13 @@ void WebSWRegistrationStore::importRegistrations(CompletionHandler<void(std::opt
m_manager->importServiceWorkerRegistrations(WTFMove(callback));
}

void WebSWRegistrationStore::updateRegistration(const ServiceWorkerContextData& registration)
void WebSWRegistrationStore::updateRegistration(const WebCore::ServiceWorkerContextData& registration)
{
m_updates.set(registration.registration.key, registration);
scheduleUpdateIfNecessary();
}

void WebSWRegistrationStore::removeRegistration(const ServiceWorkerRegistrationKey& key)
void WebSWRegistrationStore::removeRegistration(const WebCore::ServiceWorkerRegistrationKey& key)
{
m_updates.set(key, std::nullopt);
scheduleUpdateIfNecessary();
Expand All @@ -102,8 +101,8 @@ void WebSWRegistrationStore::updateToStorage(CompletionHandler<void()>&& callbac
{
ASSERT(RunLoop::isMain());

Vector<ServiceWorkerRegistrationKey> registrationsToDelete;
Vector<ServiceWorkerContextData> registrationsToUpdate;
Vector<WebCore::ServiceWorkerRegistrationKey> registrationsToDelete;
Vector<WebCore::ServiceWorkerContextData> registrationsToUpdate;
for (auto& [key, registation] : m_updates) {
if (!registation)
registrationsToDelete.append(key);
Expand Down
Expand Up @@ -30,6 +30,7 @@
#include <WebCore/SWRegistrationStore.h>
#include <WebCore/ServiceWorkerContextData.h>
#include <WebCore/Timer.h>
#include <wtf/CompletionHandler.h>

namespace WebCore {
class SWServer;
Expand Down
Expand Up @@ -27,6 +27,7 @@
#include "WebSharedWorkerServerConnection.h"

#include "Logging.h"
#include "MessageSenderInlines.h"
#include "NetworkConnectionToWebProcess.h"
#include "NetworkProcess.h"
#include "NetworkProcessProxyMessages.h"
Expand Down
Expand Up @@ -28,6 +28,7 @@

#include "APIDebuggableInfo.h"
#include "APINavigation.h"
#include "MessageSenderInlines.h"
#include "RemoteWebInspectorUIMessages.h"
#include "RemoteWebInspectorUIProxyMessages.h"
#include "WebInspectorUIProxy.h"
Expand Down
Expand Up @@ -28,6 +28,7 @@

#if ENABLE(MEDIA_STREAM)

#include "MessageSenderInlines.h"
#include "SpeechRecognitionRealtimeMediaSourceManagerMessages.h"
#include "SpeechRecognitionRemoteRealtimeMediaSourceManager.h"

Expand Down
1 change: 1 addition & 0 deletions Source/WebKit/UIProcess/SpeechRecognitionServer.cpp
Expand Up @@ -26,6 +26,7 @@
#include "config.h"
#include "SpeechRecognitionServer.h"

#include "MessageSenderInlines.h"
#include "UserMediaProcessManager.h"
#include "WebProcessProxy.h"
#include "WebSpeechRecognitionConnectionMessages.h"
Expand Down
2 changes: 2 additions & 0 deletions Source/WebKit/UIProcess/SubframePageProxy.cpp
Expand Up @@ -26,6 +26,8 @@
#include "config.h"
#include "SubframePageProxy.h"

#include "FrameInfoData.h"
#include "HandleMessage.h"
#include "WebFrameProxy.h"
#include "WebPageProxy.h"
#include "WebPageProxyMessages.h"
Expand Down
18 changes: 18 additions & 0 deletions Source/WebKit/UIProcess/SubframePageProxy.h
Expand Up @@ -27,6 +27,7 @@

#include "MessageReceiver.h"
#include "MessageSender.h"
#include <WebCore/FrameIdentifier.h>
#include <WebCore/PageIdentifier.h>

namespace IPC {
Expand All @@ -35,12 +36,29 @@ class Decoder;
class Encoder;
}

namespace WebCore {
enum class FrameLoadType : uint8_t;
enum class HasInsecureContent : bool;
enum class MouseEventPolicy : uint8_t;

class CertificateInfo;
class ResourceResponse;
class ResourceRequest;

struct PolicyCheckIdentifierType;

using PolicyCheckIdentifier = ProcessQualified<ObjectIdentifier<PolicyCheckIdentifierType>>;
}

namespace WebKit {

class UserData;
class WebFrameProxy;
class WebPageProxy;
class WebProcessProxy;

struct FrameInfoData;

class SubframePageProxy : public IPC::MessageReceiver, public IPC::MessageSender {
WTF_MAKE_FAST_ALLOCATED;
public:
Expand Down
1 change: 1 addition & 0 deletions Source/WebKit/UIProcess/SuspendedPageProxy.cpp
Expand Up @@ -28,6 +28,7 @@

#include "DrawingAreaProxy.h"
#include "Logging.h"
#include "MessageSenderInlines.h"
#include "WebBackForwardCache.h"
#include "WebFrameProxy.h"
#include "WebPageMessages.h"
Expand Down
1 change: 1 addition & 0 deletions Source/WebKit/UIProcess/WebFullScreenManagerProxy.cpp
Expand Up @@ -29,6 +29,7 @@
#if ENABLE(FULLSCREEN_API)

#include "APIFullscreenClient.h"
#include "MessageSenderInlines.h"
#include "WebAutomationSession.h"
#include "WebFullScreenManagerMessages.h"
#include "WebFullScreenManagerProxyMessages.h"
Expand Down
Expand Up @@ -29,6 +29,7 @@
#if ENABLE(ENCRYPTED_MEDIA)

#include "Logging.h"
#include "MessageSenderInlines.h"
#include "WebCoreArgumentCoders.h"
#include "WebFrame.h"
#include "WebPage.h"
Expand Down
Expand Up @@ -26,6 +26,7 @@
#include "config.h"
#include "WebDiagnosticLoggingClient.h"

#include "MessageSenderInlines.h"
#include "WebCoreArgumentCoders.h"
#include "WebPage.h"
#include "WebPageProxyMessages.h"
Expand Down
Expand Up @@ -36,6 +36,7 @@
#include "InjectedBundle.h"
#include "InjectedBundleDOMWindowExtension.h"
#include "Logging.h"
#include "MessageSenderInlines.h"
#include "NavigationActionData.h"
#include "NetworkConnectionToWebProcessMessages.h"
#include "NetworkProcessConnection.h"
Expand Down
Expand Up @@ -25,6 +25,8 @@

#include "config.h"
#include "WebRemoteFrameClient.h"

#include "MessageSenderInlines.h"
#include "WebProcess.h"
#include "WebProcessProxyMessages.h"

Expand Down
Expand Up @@ -26,6 +26,7 @@
#include "config.h"
#include "WebScreenOrientationManager.h"

#include "MessageSenderInlines.h"
#include "WebPage.h"
#include "WebProcess.h"
#include "WebScreenOrientationManagerMessages.h"
Expand Down
Expand Up @@ -26,6 +26,7 @@
#include "config.h"
#include "WebSpeechRecognitionConnection.h"

#include "MessageSenderInlines.h"
#include "SpeechRecognitionServerMessages.h"
#include "WebFrame.h"
#include "WebProcess.h"
Expand Down

0 comments on commit 35bf1a1

Please sign in to comment.