Unreviewed. Fix non-unified build

* Source/WebCore/rendering/style/RenderStyle.h: * Source/WebCore/xml/XMLHttpRequest.h: * Source/WebKit/WebProcess/FileAPI/BlobRegistryProxy.h: * Source/WebKit/WebProcess/WebCoreSupport/WebNotificationClient.cpp: Originally-landed-as: 266755@main (c7184e2).
WebKit · Aug 10, 2023 · a536dd0 · a536dd0
1 parent 33c49ff
commit a536dd0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Source/WebCore/xml/XMLHttpRequest.h b/Source/WebCore/xml/XMLHttpRequest.h
@@ -27,6 +27,7 @@
 #include "ResourceResponse.h"
 #include "SharedBuffer.h"
 #include "ThreadableLoaderClient.h"
+#include "Timer.h"
 #include "URLKeepingBlobAlive.h"
 #include "UserGestureIndicator.h"
 #include <wtf/URL.h>

diff --git a/Source/WebKit/WebProcess/FileAPI/BlobRegistryProxy.h b/Source/WebKit/WebProcess/FileAPI/BlobRegistryProxy.h
@@ -33,14 +33,14 @@ class BlobRegistryProxy final : public WebCore::BlobRegistry {
 public:
     void registerInternalFileBlobURL(const URL&, Ref<WebCore::BlobDataFileReference>&&, const String& path, const String& contentType) final;
     void registerInternalBlobURL(const URL&, Vector<WebCore::BlobPart>&&, const String& contentType) final;
-    void registerBlobURL(const URL&, const URL& srcURL, const WebCore::PolicyContainer&, const std::optional<SecurityOriginData>& topOrigin) final;
+    void registerBlobURL(const URL&, const URL& srcURL, const WebCore::PolicyContainer&, const std::optional<WebCore::SecurityOriginData>& topOrigin) final;
     void registerInternalBlobURLOptionallyFileBacked(const URL&, const URL& srcURL, RefPtr<WebCore::BlobDataFileReference>&&, const String& contentType) final;
-    void unregisterBlobURL(const URL&, const std::optional<SecurityOriginData>& topOrigin) final;
+    void unregisterBlobURL(const URL&, const std::optional<WebCore::SecurityOriginData>& topOrigin) final;
     void registerInternalBlobURLForSlice(const URL&, const URL& srcURL, long long start, long long end, const String& contentType) final;
     unsigned long long blobSize(const URL&) final;
     void writeBlobsToTemporaryFilesForIndexedDB(const Vector<String>& blobURLs, CompletionHandler<void(Vector<String>&& filePaths)>&&) final;
-    void registerBlobURLHandle(const URL&, const std::optional<SecurityOriginData>& topOrigin) final;
-    void unregisterBlobURLHandle(const URL&, const std::optional<SecurityOriginData>& topOrigin) final;
+    void registerBlobURLHandle(const URL&, const std::optional<WebCore::SecurityOriginData>& topOrigin) final;
+    void unregisterBlobURLHandle(const URL&, const std::optional<WebCore::SecurityOriginData>& topOrigin) final;
 };
 
 }
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebNotificationClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebNotificationClient.cpp
@@ -33,6 +33,7 @@
 #include "WebPage.h"
 #include "WebProcess.h"
 #include <WebCore/NotificationData.h>
+#include <WebCore/Page.h>
 #include <WebCore/ScriptExecutionContext.h>
 
 namespace WebKit {