[GTK][WPE] Fix various non-unified build issues introduced since r251698
authoraperez@igalia.com <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 15 Dec 2019 18:20:02 +0000 (18:20 +0000)
committeraperez@igalia.com <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 15 Dec 2019 18:20:02 +0000 (18:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=204891

Reviewed by Alex Christensen.

Source/JavaScriptCore:

* API/JSCallbackConstructor.h: Add missing inclusion of JSObject.h
* bytecompiler/BytecodeGeneratorBaseInlines.h: Add missing "#pragma once", which
caused build breakage when the same unified source would result in multiple inclusions of
the header.
* bytecompiler/NodesCodegen.cpp: Add missing inclusion of BytecodeGeneratorBaseInlines.h
* dfg/DFGDesiredIdentifiers.h: Add missing inclusion of Identifier.h
* heap/IsoSubspacePerVM.cpp: Add missing inclusion of MarkedSpaceInlines.h
* jit/GCAwareJITStubRoutine.h: Add missing forward declaration for CallLinkInfo.
* runtime/PredictionFileCreatingFuzzerAgent.cpp: Add missing inclusion of wtf/DataLog.h
* runtime/ScopedArgumentsTable.h: Add missing inclusion of VM.h
* wasm/WasmCallee.cpp: Add missing inclusion of WasmCallingConvention.h
* wasm/WasmLLIntTierUpCounter.h: Add missing inclusion of InstructionStream.h
* wasm/WasmSlowPaths.cpp: Add missing inclusion of WasmSignatureInlines.h

Source/WebCore:

No new tests needed.

* Modules/async-clipboard/ClipboardItemBindingsDataSource.cpp: Add missing inclusion of
markup.h
* accessibility/AccessibilityObject.cpp: Add missing inclusion of RenderInline.h
* animation/WebAnimationUtilities.cpp: Add missing inclusion of Animation.h
* animation/WebAnimationUtilities.h: Add inclusion of wtf/Forward.h to ensure that
WTF::String is declared.
* css/DOMCSSNamespace.cpp: Add missing inclusion of Document.h
* dom/WindowEventLoop.cpp: Add missing inclusion of SecurityOrigin.h
* dom/WindowEventLoop.h: Add forward declaration of SecurityOrigin
* layout/displaytree/DisplayInlineContent.cpp: Move ENABLE(LAYOUT_FORMATTING_CONTEXT) guard
after inclusion of config.h, to ensure that the ENABLE() macro is defined before being used.
* loader/ProgressTracker.h: Add missing inclusion of wtf/UniqueRef.h
* page/LoggedInStatus.cpp: Add missing inclusion of wtf/text/StringConcatenateNumbers.h
* page/PageConfiguration.cpp: Add missing inclusions of AlternativeTextClient.h and
PlugInClient.h
* rendering/RenderFlexibleBox.cpp: Add missing inclusion of wtf/SetForScope.h
* rendering/updating/RenderTreeBuilderBlock.h: Add missing forward declaration of
RenderBlockFlow.
* rendering/updating/RenderTreeBuilderBlockFlow.h: Add missing forward declaration of
RenderBlockFlow.
* rendering/updating/RenderTreeBuilderMultiColumn.h: Add missing forward declaration of
RenderMultiColumnFlow.
* rendering/updating/RenderTreeUpdaterGeneratedContent.cpp: Add missin inclusion of
RenderView.h
* style/StyleBuilder.cpp: Add missing inclusion of HTMLElement.h
* style/StyleBuilderState.cpp: Ditto.
* style/StyleScopeRuleSets.h: Move forward declaration of InspectorCSSOMWrappers into the
Style namespace, where it belongs; add missing namespace prefix in appendAuthorStyleSheets()
declaration.

Source/WebKit:

* NetworkProcess/IndexedDB/WebIDBServer.cpp: Add missing WebCore namespace prefixes
in function declarations.
(WebKit::WebIDBServer::create):
(WebKit::WebIDBServer::WebIDBServer):
(WebKit::WebIDBServer::closeAndDeleteDatabasesForOrigins):
(WebKit::WebIDBServer::suspend):
(WebKit::WebIDBServer::idFireVersionChangeEvent):
* NetworkProcess/cache/CacheStorageEngine.cpp:
(WebKit::CacheStorage::Engine::requestSpace): Add missing namespace prefix for
WebCore::ClientOrigin.
* NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp: Add missing inclusion of
WebCore/RegistrableDomain.h
(WebKit::NetworkCache::SubresourceInfo::isFirstParty const): Add missing namespace prefix
for WebCore::RegistrableDomain.
* WebProcess/Automation/WebAutomationSessionProxy.cpp:
(WebKit::WebAutomationSessionProxy::setFilesForInputFileUpload): Add missing namespace
prefix for WebCore::File::create() and WebCore::FileList::create() calls.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@253538 268f45cc-cd09-0410-ab3c-d52691b4dbfc

36 files changed:
Source/JavaScriptCore/API/JSCallbackConstructor.h
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/bytecompiler/BytecodeGeneratorBaseInlines.h
Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
Source/JavaScriptCore/dfg/DFGDesiredIdentifiers.h
Source/JavaScriptCore/heap/IsoSubspacePerVM.cpp
Source/JavaScriptCore/jit/GCAwareJITStubRoutine.h
Source/JavaScriptCore/runtime/PredictionFileCreatingFuzzerAgent.cpp
Source/JavaScriptCore/runtime/ScopedArgumentsTable.h
Source/JavaScriptCore/wasm/WasmCallee.cpp
Source/JavaScriptCore/wasm/WasmLLIntTierUpCounter.h
Source/JavaScriptCore/wasm/WasmSlowPaths.cpp
Source/WebCore/ChangeLog
Source/WebCore/Modules/async-clipboard/ClipboardItemBindingsDataSource.cpp
Source/WebCore/accessibility/AccessibilityObject.cpp
Source/WebCore/animation/WebAnimationUtilities.cpp
Source/WebCore/animation/WebAnimationUtilities.h
Source/WebCore/css/DOMCSSNamespace.cpp
Source/WebCore/dom/WindowEventLoop.cpp
Source/WebCore/dom/WindowEventLoop.h
Source/WebCore/layout/displaytree/DisplayInlineContent.cpp
Source/WebCore/loader/ProgressTracker.h
Source/WebCore/page/LoggedInStatus.cpp
Source/WebCore/page/PageConfiguration.cpp
Source/WebCore/rendering/RenderFlexibleBox.cpp
Source/WebCore/rendering/updating/RenderTreeBuilderBlock.h
Source/WebCore/rendering/updating/RenderTreeBuilderBlockFlow.h
Source/WebCore/rendering/updating/RenderTreeBuilderMultiColumn.h
Source/WebCore/rendering/updating/RenderTreeUpdaterGeneratedContent.cpp
Source/WebCore/style/StyleBuilder.cpp
Source/WebCore/style/StyleBuilderState.cpp
Source/WebCore/style/StyleScopeRuleSets.h
Source/WebKit/ChangeLog
Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp
Source/WebKit/NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp
Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp

index e572594..6e3c356 100644 (file)
@@ -26,6 +26,7 @@
 #ifndef JSCallbackConstructor_h
 #define JSCallbackConstructor_h
 
+#include "JSObject.h"
 #include "JSObjectRef.h"
 
 namespace JSC {
index c05bc8b..d092da6 100644 (file)
@@ -1,3 +1,24 @@
+2019-12-14  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [GTK][WPE] Fix various non-unified build issues introduced since r251698
+        https://bugs.webkit.org/show_bug.cgi?id=204891
+
+        Reviewed by Alex Christensen.
+
+        * API/JSCallbackConstructor.h: Add missing inclusion of JSObject.h
+        * bytecompiler/BytecodeGeneratorBaseInlines.h: Add missing "#pragma once", which
+        caused build breakage when the same unified source would result in multiple inclusions of
+        the header.
+        * bytecompiler/NodesCodegen.cpp: Add missing inclusion of BytecodeGeneratorBaseInlines.h
+        * dfg/DFGDesiredIdentifiers.h: Add missing inclusion of Identifier.h
+        * heap/IsoSubspacePerVM.cpp: Add missing inclusion of MarkedSpaceInlines.h
+        * jit/GCAwareJITStubRoutine.h: Add missing forward declaration for CallLinkInfo.
+        * runtime/PredictionFileCreatingFuzzerAgent.cpp: Add missing inclusion of wtf/DataLog.h
+        * runtime/ScopedArgumentsTable.h: Add missing inclusion of VM.h
+        * wasm/WasmCallee.cpp: Add missing inclusion of WasmCallingConvention.h
+        * wasm/WasmLLIntTierUpCounter.h: Add missing inclusion of InstructionStream.h
+        * wasm/WasmSlowPaths.cpp: Add missing inclusion of WasmSignatureInlines.h
+
 2019-12-13  Yusuke Suzuki  <ysuzuki@apple.com>
 
         [JSC] Remove JSFixedArray, and use JSImmutableButterfly instead
index 0bd9140..288a616 100644 (file)
@@ -23,6 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#pragma once
+
 #include "BytecodeGeneratorBase.h"
 
 #include "RegisterID.h"
index b52ca82..5a93013 100644 (file)
@@ -30,6 +30,7 @@
 
 #include "BuiltinNames.h"
 #include "BytecodeGenerator.h"
+#include "BytecodeGeneratorBaseInlines.h"
 #include "CallFrame.h"
 #include "JIT.h"
 #include "JSAsyncGenerator.h"
index c239e4a..f7c98a4 100644 (file)
@@ -27,6 +27,7 @@
 
 #if ENABLE(DFG_JIT)
 
+#include "Identifier.h"
 #include <wtf/HashMap.h>
 #include <wtf/Variant.h>
 #include <wtf/text/UniquedStringImpl.h>
index b2f6bbd..c5e3e38 100644 (file)
@@ -27,6 +27,7 @@
 #include "IsoSubspacePerVM.h"
 
 #include "JSCInlines.h"
+#include "MarkedSpaceInlines.h"
 
 namespace JSC {
 
index 6f42427..c64fc24 100644 (file)
@@ -34,6 +34,7 @@
 
 namespace JSC {
 
+class CallLinkInfo;
 class JITStubRoutineSet;
 
 // Use this stub routine if you know that your code might be on stack when
index 192dbe1..4548366 100644 (file)
@@ -27,6 +27,7 @@
 
 #include "JSCast.h"
 #include "ScopeOffset.h"
+#include "VM.h"
 #include <wtf/Assertions.h>
 #include <wtf/CagedUniquePtr.h>
 
index c10c1a3..0a911b5 100644 (file)
@@ -30,6 +30,7 @@
 
 #include "LLIntThunks.h"
 #include "WasmCalleeRegistry.h"
+#include "WasmCallingConvention.h"
 
 namespace JSC { namespace Wasm {
 
index 8dbf246..e4dc00d 100644 (file)
@@ -28,6 +28,7 @@
 #if ENABLE(WEBASSEMBLY)
 
 #include "ExecutionCounter.h"
+#include "InstructionStream.h"
 #include "Options.h"
 #include <wtf/HashMap.h>
 
index 5a8ebb8..927a698 100644 (file)
@@ -41,6 +41,7 @@
 #include "WasmOMGForOSREntryPlan.h"
 #include "WasmOMGPlan.h"
 #include "WasmOperations.h"
+#include "WasmSignatureInlines.h"
 #include "WasmThunks.h"
 #include "WasmWorklist.h"
 
index e1457cd..898157b 100644 (file)
@@ -1,3 +1,42 @@
+2019-12-14  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [GTK][WPE] Fix various non-unified build issues introduced since r251698
+        https://bugs.webkit.org/show_bug.cgi?id=204891
+
+        Reviewed by Alex Christensen.
+
+        No new tests needed.
+
+        * Modules/async-clipboard/ClipboardItemBindingsDataSource.cpp: Add missing inclusion of
+        markup.h
+        * accessibility/AccessibilityObject.cpp: Add missing inclusion of RenderInline.h
+        * animation/WebAnimationUtilities.cpp: Add missing inclusion of Animation.h
+        * animation/WebAnimationUtilities.h: Add inclusion of wtf/Forward.h to ensure that
+        WTF::String is declared.
+        * css/DOMCSSNamespace.cpp: Add missing inclusion of Document.h
+        * dom/WindowEventLoop.cpp: Add missing inclusion of SecurityOrigin.h
+        * dom/WindowEventLoop.h: Add forward declaration of SecurityOrigin
+        * layout/displaytree/DisplayInlineContent.cpp: Move ENABLE(LAYOUT_FORMATTING_CONTEXT) guard
+        after inclusion of config.h, to ensure that the ENABLE() macro is defined before being used.
+        * loader/ProgressTracker.h: Add missing inclusion of wtf/UniqueRef.h
+        * page/LoggedInStatus.cpp: Add missing inclusion of wtf/text/StringConcatenateNumbers.h
+        * page/PageConfiguration.cpp: Add missing inclusions of AlternativeTextClient.h and
+        PlugInClient.h
+        * rendering/RenderFlexibleBox.cpp: Add missing inclusion of wtf/SetForScope.h
+        * rendering/updating/RenderTreeBuilderBlock.h: Add missing forward declaration of
+        RenderBlockFlow.
+        * rendering/updating/RenderTreeBuilderBlockFlow.h: Add missing forward declaration of
+        RenderBlockFlow.
+        * rendering/updating/RenderTreeBuilderMultiColumn.h: Add missing forward declaration of
+        RenderMultiColumnFlow.
+        * rendering/updating/RenderTreeUpdaterGeneratedContent.cpp: Add missin inclusion of
+        RenderView.h
+        * style/StyleBuilder.cpp: Add missing inclusion of HTMLElement.h
+        * style/StyleBuilderState.cpp: Ditto.
+        * style/StyleScopeRuleSets.h: Move forward declaration of InspectorCSSOMWrappers into the
+        Style namespace, where it belongs; add missing namespace prefix in appendAuthorStyleSheets()
+        declaration.
+
 2019-12-15  Zalan Bujtas  <zalan@apple.com>
 
         [LFC][IFC] Add basic support for hanging content
index 0e1abba..4641d58 100644 (file)
@@ -40,6 +40,7 @@
 #include "JSDOMPromiseDeferred.h"
 #include "PasteboardCustomData.h"
 #include "SharedBuffer.h"
+#include "markup.h"
 #include <wtf/Function.h>
 
 namespace WebCore {
index 81f43b4..e70e3fa 100644 (file)
@@ -63,6 +63,7 @@
 #include "NodeTraversal.h"
 #include "Page.h"
 #include "RenderImage.h"
+#include "RenderInline.h"
 #include "RenderLayer.h"
 #include "RenderListItem.h"
 #include "RenderListMarker.h"
index 5beabca..bcd1fc1 100644 (file)
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "WebAnimationUtilities.h"
 
+#include "Animation.h"
 #include "CSSAnimation.h"
 #include "CSSTransition.h"
 #include "DeclarativeAnimation.h"
index 7d4f771..82d6ba5 100644 (file)
@@ -25,6 +25,7 @@
 
 #pragma once
 
+#include <wtf/Forward.h>
 #include <wtf/Markable.h>
 #include <wtf/Seconds.h>
 
index 55a3e1b..19e3dd6 100644 (file)
@@ -33,6 +33,7 @@
 #include "CSSMarkup.h"
 #include "CSSParser.h"
 #include "CSSPropertyParser.h"
+#include "Document.h"
 #include "HighlightMap.h"
 #include "StyleProperties.h"
 #include <wtf/text/StringBuilder.h>
index d9dcfbf..5c9e772 100644 (file)
@@ -32,6 +32,7 @@
 #include "HTMLSlotElement.h"
 #include "Microtasks.h"
 #include "MutationObserver.h"
+#include "SecurityOrigin.h"
 
 namespace WebCore {
 
index 7f04cef..c7df7cd 100644 (file)
@@ -37,6 +37,7 @@ class CustomElementQueue;
 class Document;
 class HTMLSlotElement;
 class MutationObserver;
+class SecurityOrigin;
 
 // https://html.spec.whatwg.org/multipage/webappapis.html#window-event-loop
 class WindowEventLoop final : public EventLoop {
index 9c11e42..f4fe4a6 100644 (file)
 * THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include "config.h"
+
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
 
-#include "config.h"
 #include "DisplayInlineContent.h"
 
 namespace WebCore {
index 433c8d9..a9404c6 100644 (file)
@@ -30,6 +30,7 @@
 #include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/RefPtr.h>
+#include <wtf/UniqueRef.h>
 
 namespace WebCore {
 
index 5acd64b..46738bd 100644 (file)
@@ -28,6 +28,7 @@
 
 #include <wtf/IsoMallocInlines.h>
 #include <wtf/text/StringCommon.h>
+#include <wtf/text/StringConcatenateNumbers.h>
 
 namespace WebCore {
 
index 5819415..ef877a5 100644 (file)
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "PageConfiguration.h"
 
+#include "AlternativeTextClient.h"
 #include "ApplicationCacheStorage.h"
 #include "BackForwardClient.h"
 #include "CacheStorageProvider.h"
@@ -36,6 +37,7 @@
 #include "EditorClient.h"
 #include "LibWebRTCProvider.h"
 #include "PerformanceLoggingClient.h"
+#include "PlugInClient.h"
 #include "PluginInfoProvider.h"
 #include "ProgressTrackerClient.h"
 #include "SocketProvider.h"
index c561a38..43aacad 100644 (file)
@@ -40,6 +40,7 @@
 #include <limits>
 #include <wtf/IsoMallocInlines.h>
 #include <wtf/MathExtras.h>
+#include <wtf/SetForScope.h>
 
 namespace WebCore {
 
index c1fc993..8685680 100644 (file)
@@ -29,6 +29,8 @@
 
 namespace WebCore {
 
+class RenderBlockFlow;
+
 class RenderTreeBuilder::Block {
     WTF_MAKE_FAST_ALLOCATED;
 public:
index bc2edc2..ff6bef6 100644 (file)
@@ -29,6 +29,8 @@
 
 namespace WebCore {
 
+class RenderBlockFlow;
+
 class RenderTreeBuilder::BlockFlow {
     WTF_MAKE_FAST_ALLOCATED;
 public:
index 5621637..2973142 100644 (file)
@@ -30,6 +30,7 @@
 namespace WebCore {
 
 class RenderBlockFlow;
+class RenderMultiColumnFlow;
 
 class RenderTreeBuilder::MultiColumn {
     WTF_MAKE_FAST_ALLOCATED;
index 72fa0bf..40240bd 100644 (file)
@@ -34,6 +34,7 @@
 #include "RenderImage.h"
 #include "RenderQuote.h"
 #include "RenderTreeUpdater.h"
+#include "RenderView.h"
 #include "StyleTreeResolver.h"
 
 namespace WebCore {
index 74f5b0a..1eddf06 100644 (file)
@@ -33,6 +33,7 @@
 #include "CSSFontSelector.h"
 #include "CSSPaintImageValue.h"
 #include "CSSValuePool.h"
+#include "HTMLElement.h"
 #include "PaintWorkletGlobalScope.h"
 #include "Settings.h"
 #include "StyleBuilderGenerated.h"
index ce08cae..fb00249 100644 (file)
@@ -38,6 +38,7 @@
 #include "CSSImageSetValue.h"
 #include "CSSImageValue.h"
 #include "CSSShadowValue.h"
+#include "HTMLElement.h"
 #include "RenderTheme.h"
 #include "SVGElement.h"
 #include "SVGSVGElement.h"
index 4b7aa7f..4057800 100644 (file)
@@ -35,11 +35,11 @@ namespace WebCore {
 class CSSStyleRule;
 class CSSStyleSheet;
 class ExtensionStyleSheets;
-class InspectorCSSOMWrappers;
 class MediaQueryEvaluator;
 
 namespace Style {
 
+class InspectorCSSOMWrappers;
 class Resolver;
 
 struct InvalidationRuleSet {
@@ -74,7 +74,7 @@ public:
     void initializeUserStyle();
 
     void resetAuthorStyle();
-    void appendAuthorStyleSheets(const Vector<RefPtr<CSSStyleSheet>>&, MediaQueryEvaluator*, InspectorCSSOMWrappers&);
+    void appendAuthorStyleSheets(const Vector<RefPtr<CSSStyleSheet>>&, MediaQueryEvaluator*, Style::InspectorCSSOMWrappers&);
 
     void resetUserAgentMediaQueryStyle();
 
index 635093f..2f014f3 100644 (file)
@@ -1,3 +1,28 @@
+2019-12-14  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [GTK][WPE] Fix various non-unified build issues introduced since r251698
+        https://bugs.webkit.org/show_bug.cgi?id=204891
+
+        Reviewed by Alex Christensen.
+
+        * NetworkProcess/IndexedDB/WebIDBServer.cpp: Add missing WebCore namespace prefixes
+        in function declarations.
+        (WebKit::WebIDBServer::create):
+        (WebKit::WebIDBServer::WebIDBServer):
+        (WebKit::WebIDBServer::closeAndDeleteDatabasesForOrigins):
+        (WebKit::WebIDBServer::suspend):
+        (WebKit::WebIDBServer::idFireVersionChangeEvent):
+        * NetworkProcess/cache/CacheStorageEngine.cpp:
+        (WebKit::CacheStorage::Engine::requestSpace): Add missing namespace prefix for
+        WebCore::ClientOrigin.
+        * NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp: Add missing inclusion of
+        WebCore/RegistrableDomain.h
+        (WebKit::NetworkCache::SubresourceInfo::isFirstParty const): Add missing namespace prefix
+        for WebCore::RegistrableDomain.
+        * WebProcess/Automation/WebAutomationSessionProxy.cpp:
+        (WebKit::WebAutomationSessionProxy::setFilesForInputFileUpload): Add missing namespace
+        prefix for WebCore::File::create() and WebCore::FileList::create() calls.
+
 2019-12-14  Simon Fraser  <simon.fraser@apple.com>
 
         Rename "customFixedPositionRect" to "layoutViewportRect"
index 3eff3eb..b67d1c8 100644 (file)
 
 namespace WebKit {
 
-Ref<WebIDBServer> WebIDBServer::create(PAL::SessionID sessionID, const String& directory, IDBServer::IDBServer::StorageQuotaManagerSpaceRequester&& spaceRequester)
+Ref<WebIDBServer> WebIDBServer::create(PAL::SessionID sessionID, const String& directory, WebCore::IDBServer::IDBServer::StorageQuotaManagerSpaceRequester&& spaceRequester)
 {
     return adoptRef(*new WebIDBServer(sessionID, directory, WTFMove(spaceRequester)));
 }
 
-WebIDBServer::WebIDBServer(PAL::SessionID sessionID, const String& directory, IDBServer::IDBServer::StorageQuotaManagerSpaceRequester&& spaceRequester)
-    : m_server(IDBServer::IDBServer::create(sessionID, directory, WTFMove(spaceRequester)))
+WebIDBServer::WebIDBServer(PAL::SessionID sessionID, const String& directory, WebCore::IDBServer::IDBServer::StorageQuotaManagerSpaceRequester&& spaceRequester)
+    : m_server(WebCore::IDBServer::IDBServer::create(sessionID, directory, WTFMove(spaceRequester)))
 {
     ASSERT(RunLoop::isMain());
 }
@@ -67,14 +67,14 @@ void WebIDBServer::closeAndDeleteDatabasesModifiedSince(WallTime modificationTim
     m_server->closeAndDeleteDatabasesModifiedSince(modificationTime, WTFMove(callback));
 }
 
-void WebIDBServer::closeAndDeleteDatabasesForOrigins(const Vector<SecurityOriginData>& originDatas, CompletionHandler<void()>&& callback)
+void WebIDBServer::closeAndDeleteDatabasesForOrigins(const Vector<WebCore::SecurityOriginData>& originDatas, CompletionHandler<void()>&& callback)
 {
     ASSERT(RunLoop::isMain());
 
     m_server->closeAndDeleteDatabasesForOrigins(originDatas, WTFMove(callback));
 }
 
-void WebIDBServer::suspend(IDBServer::ShouldForceStop shouldForceStop)
+void WebIDBServer::suspend(WebCore::IDBServer::ShouldForceStop shouldForceStop)
 {
     ASSERT(RunLoop::isMain());
 
@@ -255,7 +255,7 @@ void WebIDBServer::abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifi
     m_server->abortOpenAndUpgradeNeeded(databaseConnectionIdentifier, transactionIdentifier);
 }
 
-void WebIDBServer::didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const WebCore::IDBResourceIdentifier& requestIdentifier, IndexedDB::ConnectionClosedOnBehalfOfServer connectionClosed)
+void WebIDBServer::didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const WebCore::IDBResourceIdentifier& requestIdentifier, WebCore::IndexedDB::ConnectionClosedOnBehalfOfServer connectionClosed)
 {
     ASSERT(RunLoop::isMain());
 
index 0c896e0..3a02de5 100644 (file)
@@ -30,6 +30,7 @@
 
 #include "Logging.h"
 #include "NetworkCacheCoders.h"
+#include <WebCore/RegistrableDomain.h>
 
 namespace WebKit {
 namespace NetworkCache {
@@ -83,7 +84,7 @@ bool SubresourceInfo::decode(WTF::Persistence::Decoder& decoder, SubresourceInfo
 
 bool SubresourceInfo::isFirstParty() const
 {
-    RegistrableDomain firstPartyDomain { m_firstPartyForCookies };
+    WebCore::RegistrableDomain firstPartyDomain { m_firstPartyForCookies };
     return firstPartyDomain.matches(URL(URL(), key().identifier()));
 }
 
index 34fdea5..25e8cb7 100644 (file)
@@ -717,8 +717,8 @@ void WebAutomationSessionProxy::setFilesForInputFileUpload(WebCore::PageIdentifi
         }
     }
     for (const auto& path : filenames)
-        fileObjects.append(File::create(path));
-    inputElement.setFiles(FileList::create(WTFMove(fileObjects)));
+        fileObjects.append(WebCore::File::create(path));
+    inputElement.setFiles(WebCore::FileList::create(WTFMove(fileObjects)));
 
     completionHandler(WTF::nullopt);
 }