Attachment 367274 Details for Bug 196845 – Patch (fails to link Tools on WinCairo)

[patch] Patch (fails to link Tools on WinCairo)

bug-196845-20190411183046.patch (text/plain), 32.96 KB, created by Ross Kirsling on 2019-04-11 18:30:47 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2019-04-11 18:30:47 PDT

Size: 32.96 KB

patch

obsolete

>Subversion Revision: 244206
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c068c3d6a9457e092295649a058311fed244d7a1..e5f6b8a50f179b392c83215c0d53f18b6c5c612d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,37 @@
>+2019-04-11  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        WebKit should build successfully even with -DENABLE_UNIFIED_BUILDS=OFF
>+        https://bugs.webkit.org/show_bug.cgi?id=196845
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Modules/mediastream/MediaStreamTrack.cpp:
>+        * Modules/webvr/VREyeParameters.cpp:
>+        * Modules/webvr/VRFrameData.cpp:
>+        * Modules/webvr/VRPose.cpp:
>+        * accessibility/AccessibilityList.cpp:
>+        * accessibility/isolatedtree/AXIsolatedTree.cpp:
>+        * accessibility/isolatedtree/AXIsolatedTreeNode.cpp:
>+        * bindings/js/JSDOMConvertWebGL.cpp:
>+        * bindings/js/JSHistoryCustom.cpp:
>+        * bindings/js/JSIDBCursorWithValueCustom.cpp:
>+        * bindings/js/JSPerformanceObserverCustom.cpp:
>+        * bindings/js/WindowProxy.cpp:
>+        * html/canvas/CanvasRenderingContext2DBase.cpp:
>+        (WebCore::CanvasRenderingContext2DBase::FontProxy::initialize):
>+        (WebCore::CanvasRenderingContext2DBase::FontProxy::fontMetrics const):
>+        (WebCore::CanvasRenderingContext2DBase::FontProxy::fontDescription const):
>+        (WebCore::CanvasRenderingContext2DBase::FontProxy::width const):
>+        (WebCore::CanvasRenderingContext2DBase::FontProxy::drawBidiText const):
>+        (WebCore::CanvasRenderingContext2DBase::beginCompositeLayer):
>+        (WebCore::CanvasRenderingContext2DBase::endCompositeLayer):
>+        * page/scrolling/ScrollingStateTree.cpp:
>+        * platform/ColorData.gperf:
>+        * platform/mediastream/RealtimeMediaSourceSettings.cpp:
>+        * platform/network/DNSResolveQueue.cpp:
>+        * workers/service/ServiceWorkerClientQueryOptions.h:
>+        * workers/service/ServiceWorkerContainer.cpp:
>+
> 2019-04-11  Megan Gardner  <megan_gardner@apple.com>
> 
>         Update 'Save Image' to more clear instructions
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 73a7949370f4ed553b26ea7799ded7174cb6e121..ac82a9357a95b9a56c3155f3d06708a6b52a77ec 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,39 @@
>+2019-04-11  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        WebKit should build successfully even with -DENABLE_UNIFIED_BUILDS=OFF
>+        https://bugs.webkit.org/show_bug.cgi?id=196845
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h:
>+        * NetworkProcess/NetworkCORSPreflightChecker.cpp:
>+        * NetworkProcess/NetworkDataTask.cpp:
>+        * NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:
>+        * NetworkProcess/NetworkHTTPSUpgradeChecker.h:
>+        * NetworkProcess/NetworkProcess.cpp:
>+        * NetworkProcess/NetworkResourceLoadMap.cpp:
>+        * NetworkProcess/NetworkResourceLoadMap.h:
>+        * NetworkProcess/NetworkResourceLoader.cpp:
>+        * NetworkProcess/PingLoad.h:
>+        * Shared/WebCompiledContentRuleListData.cpp:
>+        * Shared/gtk/WebEventFactory.cpp:
>+        * UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
>+        (WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore):
>+        (WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours):
>+        (WKWebsiteDataStoreStatisticsResetToConsistentState):
>+        * UIProcess/Downloads/DownloadProxyMap.cpp:
>+        * UIProcess/InspectorTargetProxy.cpp:
>+        * UIProcess/PageClient.h:
>+        * UIProcess/ProcessAssertion.cpp:
>+        * UIProcess/ProvisionalPageProxy.h:
>+        * UIProcess/WebPageInspectorTargetAgent.h:
>+        * UIProcess/geoclue/GeoclueGeolocationProvider.cpp:
>+        * WebProcess/Cache/WebCacheStorageConnection.cpp:
>+        (WebKit::WebCacheStorageConnection::updateQuotaBasedOnSpaceUsage):
>+        * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
>+        (WKBundleSetDatabaseQuota):
>+        * WebProcess/Storage/WebServiceWorkerFetchTaskClient.h:
>+
> 2019-04-11  Megan Gardner  <megan_gardner@apple.com>
> 
>         Update 'Save Image' to more clear instructions
>diff --git a/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp b/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp
>index 17284b9a1c19b8c93480301332f7d80208fd8ca6..8399d879bab569a04c55f6431c857e321ae249dd 100644
>--- a/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp
>+++ b/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp
>@@ -42,6 +42,7 @@
> #include "Page.h"
> #include "RealtimeMediaSourceCenter.h"
> #include "ScriptExecutionContext.h"
>+#include <wtf/CompletionHandler.h>
> #include <wtf/IsoMallocInlines.h>
> #include <wtf/NeverDestroyed.h>
> 
>diff --git a/Source/WebCore/Modules/webvr/VREyeParameters.cpp b/Source/WebCore/Modules/webvr/VREyeParameters.cpp
>index 01264bd86924fcfccc8c2c5e3a78f720639116b8..2cfa6628c6e5ef1fdf696de72c90dcc6c318fe2d 100644
>--- a/Source/WebCore/Modules/webvr/VREyeParameters.cpp
>+++ b/Source/WebCore/Modules/webvr/VREyeParameters.cpp
>@@ -26,6 +26,7 @@
> #include "VREyeParameters.h"
> 
> #include "VRFieldOfView.h"
>+#include <JavaScriptCore/TypedArrayInlines.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/Modules/webvr/VRFrameData.cpp b/Source/WebCore/Modules/webvr/VRFrameData.cpp
>index a7c7db9d63007f1b043ffa37bc578cfb74ad3b2d..a55e1494f5013a5cdad01e7bd83a386207b1b0b8 100644
>--- a/Source/WebCore/Modules/webvr/VRFrameData.cpp
>+++ b/Source/WebCore/Modules/webvr/VRFrameData.cpp
>@@ -28,6 +28,7 @@
> #include "VREyeParameters.h"
> #include "VRPlatformDisplay.h"
> #include "VRPose.h"
>+#include <JavaScriptCore/TypedArrayInlines.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/Modules/webvr/VRPose.cpp b/Source/WebCore/Modules/webvr/VRPose.cpp
>index f7ce8fb93989d2ac4892adccc343c05d12410ce2..99afc143993f7747324298f245917e1ddc11d4ea 100644
>--- a/Source/WebCore/Modules/webvr/VRPose.cpp
>+++ b/Source/WebCore/Modules/webvr/VRPose.cpp
>@@ -25,6 +25,8 @@
> #include "config.h"
> #include "VRPose.h"
> 
>+#include <JavaScriptCore/TypedArrayInlines.h>
>+
> namespace WebCore {
> 
> static RefPtr<Float32Array> optionalFloat3ToJSCArray(const Optional<VRPlatformTrackingInfo::Float3>& data)
>diff --git a/Source/WebCore/accessibility/AccessibilityList.cpp b/Source/WebCore/accessibility/AccessibilityList.cpp
>index 0e3659855168ea867fd643a1c174a67e29a4cd5c..7b297d60c0e3556b52a2f17fc8d261815e5008db 100644
>--- a/Source/WebCore/accessibility/AccessibilityList.cpp
>+++ b/Source/WebCore/accessibility/AccessibilityList.cpp
>@@ -32,6 +32,7 @@
> #include "AXObjectCache.h"
> #include "HTMLElement.h"
> #include "HTMLNames.h"
>+#include "HTMLParserIdioms.h"
> #include "PseudoElement.h"
> #include "RenderListItem.h"
> #include "RenderObject.h"
>diff --git a/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp b/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp
>index c9c2f3ab1b0b3bbb10608583c6bee4d5ab9384bf..76912caeb8a640ed133ac4aaf4fa7d5c2897afa2 100644
>--- a/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp
>+++ b/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp
>@@ -23,9 +23,9 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
>-
> #include "config.h"
>+
>+#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
> #include "AXIsolatedTree.h"
> 
> #include "AXIsolatedTreeNode.h"
>diff --git a/Source/WebCore/accessibility/isolatedtree/AXIsolatedTreeNode.cpp b/Source/WebCore/accessibility/isolatedtree/AXIsolatedTreeNode.cpp
>index 06248d385671ff66844cfb23e438ba2e77cdbf88..e2ef412122963dc5e5f72d49c72f1d9fee9b75b8 100644
>--- a/Source/WebCore/accessibility/isolatedtree/AXIsolatedTreeNode.cpp
>+++ b/Source/WebCore/accessibility/isolatedtree/AXIsolatedTreeNode.cpp
>@@ -23,9 +23,9 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
>-
> #include "config.h"
>+
>+#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
> #include "AXIsolatedTreeNode.h"
> 
> #include "AccessibilityObject.h"
>diff --git a/Source/WebCore/bindings/js/JSDOMConvertWebGL.cpp b/Source/WebCore/bindings/js/JSDOMConvertWebGL.cpp
>index 0b977318dcd08c660a93d3b048c7b0ce2d322d15..402394d6a8f394032518bbfdf7b5634f0704b6ca 100644
>--- a/Source/WebCore/bindings/js/JSDOMConvertWebGL.cpp
>+++ b/Source/WebCore/bindings/js/JSDOMConvertWebGL.cpp
>@@ -58,7 +58,7 @@
> #include "JSWebGLTexture.h"
> #include "JSWebGLVertexArrayObject.h"
> #include "JSWebGLVertexArrayObjectOES.h"
>-
>+#include <JavaScriptCore/JSCInlines.h>
> 
> namespace WebCore {
> using namespace JSC;
>diff --git a/Source/WebCore/bindings/js/JSHistoryCustom.cpp b/Source/WebCore/bindings/js/JSHistoryCustom.cpp
>index 514c0ede629d800f0dfac971341df37f590991d4..ca51736513bae2e04f5cf25ed88dbe9a65eeaa6c 100644
>--- a/Source/WebCore/bindings/js/JSHistoryCustom.cpp
>+++ b/Source/WebCore/bindings/js/JSHistoryCustom.cpp
>@@ -30,6 +30,7 @@
> #include "JSHistory.h"
> 
> #include "SerializedScriptValue.h"
>+#include <JavaScriptCore/JSCInlines.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/bindings/js/JSIDBCursorWithValueCustom.cpp b/Source/WebCore/bindings/js/JSIDBCursorWithValueCustom.cpp
>index f43501cf94b411f8ed96cdb8d76c6f058d515707..1c655248a0dd4551d72599b9d1c392b0039f8fc9 100644
>--- a/Source/WebCore/bindings/js/JSIDBCursorWithValueCustom.cpp
>+++ b/Source/WebCore/bindings/js/JSIDBCursorWithValueCustom.cpp
>@@ -30,7 +30,7 @@
> 
> #include "IDBBindingUtilities.h"
> #include "IDBCursorWithValue.h"
>-#include <JavaScriptCore/HeapInlines.h>
>+#include <JavaScriptCore/JSCInlines.h>
> 
> namespace WebCore {
> using namespace JSC;
>diff --git a/Source/WebCore/bindings/js/JSPerformanceObserverCustom.cpp b/Source/WebCore/bindings/js/JSPerformanceObserverCustom.cpp
>index 5c1b6da8da91c3aa0e81440552fb412b8432d482..a19cf0d610bb0fa6c5c8adf95ef2837034d9d1d0 100644
>--- a/Source/WebCore/bindings/js/JSPerformanceObserverCustom.cpp
>+++ b/Source/WebCore/bindings/js/JSPerformanceObserverCustom.cpp
>@@ -27,6 +27,7 @@
> #include "JSPerformanceObserver.h"
> 
> #include "PerformanceObserverCallback.h"
>+#include <JavaScriptCore/JSCInlines.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/bindings/js/WindowProxy.cpp b/Source/WebCore/bindings/js/WindowProxy.cpp
>index 91b0d6dc9ec0519b554b49bfd6bebf8425913b24..7e04588a2127f4b0f889bdd083256a8766c039d7 100644
>--- a/Source/WebCore/bindings/js/WindowProxy.cpp
>+++ b/Source/WebCore/bindings/js/WindowProxy.cpp
>@@ -32,6 +32,7 @@
> #include "ScriptController.h"
> #include "runtime_root.h"
> #include <JavaScriptCore/JSLock.h>
>+#include <JavaScriptCore/WeakGCMapInlines.h>
> #include <wtf/MemoryPressureHandler.h>
> 
> namespace WebCore {
>diff --git a/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp b/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp
>index 8f3e1d20194a28c9b2e9acf4f3d6315d8152735e..2bb2c1f39aef2f9a2e7f2e9abcd184a04ad44514 100644
>--- a/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp
>+++ b/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp
>@@ -322,7 +322,7 @@ void CanvasRenderingContext2DBase::FontProxy::fontsNeedUpdate(FontSelector& sele
>     update(selector);
> }
> 
>-inline void CanvasRenderingContext2DBase::FontProxy::initialize(FontSelector& fontSelector, const RenderStyle& newStyle)
>+void CanvasRenderingContext2DBase::FontProxy::initialize(FontSelector& fontSelector, const RenderStyle& newStyle)
> {
>     // Beware! m_font.fontSelector() might not point to document.fontSelector()!
>     ASSERT(newStyle.fontCascade().fontSelector() == &fontSelector);
>@@ -334,22 +334,22 @@ inline void CanvasRenderingContext2DBase::FontProxy::initialize(FontSelector& fo
>     m_font.fontSelector()->registerForInvalidationCallbacks(*this);
> }
> 
>-inline const FontMetrics& CanvasRenderingContext2DBase::FontProxy::fontMetrics() const
>+const FontMetrics& CanvasRenderingContext2DBase::FontProxy::fontMetrics() const
> {
>     return m_font.fontMetrics();
> }
> 
>-inline const FontCascadeDescription& CanvasRenderingContext2DBase::FontProxy::fontDescription() const
>+const FontCascadeDescription& CanvasRenderingContext2DBase::FontProxy::fontDescription() const
> {
>     return m_font.fontDescription();
> }
> 
>-inline float CanvasRenderingContext2DBase::FontProxy::width(const TextRun& textRun, GlyphOverflow* overflow) const
>+float CanvasRenderingContext2DBase::FontProxy::width(const TextRun& textRun, GlyphOverflow* overflow) const
> {
>     return m_font.width(textRun, 0, overflow);
> }
> 
>-inline void CanvasRenderingContext2DBase::FontProxy::drawBidiText(GraphicsContext& context, const TextRun& run, const FloatPoint& point, FontCascade::CustomFontNotReadyAction action) const
>+void CanvasRenderingContext2DBase::FontProxy::drawBidiText(GraphicsContext& context, const TextRun& run, const FloatPoint& point, FontCascade::CustomFontNotReadyAction action) const
> {
>     context.drawBidiText(m_font, run, point, action);
> }
>@@ -1166,14 +1166,14 @@ void CanvasRenderingContext2DBase::clipInternal(const Path& path, CanvasFillRule
>     c->canvasClip(path, toWindRule(windingRule));
> }
> 
>-inline void CanvasRenderingContext2DBase::beginCompositeLayer()
>+void CanvasRenderingContext2DBase::beginCompositeLayer()
> {
> #if !USE(CAIRO)
>     drawingContext()->beginTransparencyLayer(1);
> #endif
> }
> 
>-inline void CanvasRenderingContext2DBase::endCompositeLayer()
>+void CanvasRenderingContext2DBase::endCompositeLayer()
> {
> #if !USE(CAIRO)
>     drawingContext()->endTransparencyLayer();    
>diff --git a/Source/WebCore/platform/ColorData.gperf b/Source/WebCore/platform/ColorData.gperf
>index 5af79c21832541b835b3a1af9bdbd3603f40744c..0fbb6a3386d41b8309d1e23a4c86c036903aea91 100644
>--- a/Source/WebCore/platform/ColorData.gperf
>+++ b/Source/WebCore/platform/ColorData.gperf
>@@ -1,6 +1,7 @@
> %{
> #include "HashTools.h"
> #include <string.h>
>+#include <wtf/Compiler.h>
> 
> IGNORE_WARNINGS_BEGIN("implicit-fallthrough")
> 
>diff --git a/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp b/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp
>index 02d02832ef97c2a3c43e02f77c36a64753183dfd..e2cabb15239f90cef90e2093b736eceaaebba2ce 100644
>--- a/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp
>+++ b/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp
>@@ -34,6 +34,7 @@
> #include "RealtimeMediaSourceSettings.h"
> 
> #include <wtf/NeverDestroyed.h>
>+#include <wtf/text/StringBuilder.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/platform/network/DNSResolveQueue.cpp b/Source/WebCore/platform/network/DNSResolveQueue.cpp
>index 801772692e2ee3c03c6c9b95959df1ff55511887..8850704855598b8735626be63a31160cff5503b2 100644
>--- a/Source/WebCore/platform/network/DNSResolveQueue.cpp
>+++ b/Source/WebCore/platform/network/DNSResolveQueue.cpp
>@@ -35,6 +35,7 @@
> #include "DNSResolveQueueCFNet.h"
> #endif
> 
>+#include <wtf/CompletionHandler.h>
> #include <wtf/NeverDestroyed.h>
> 
> namespace WebCore {
>diff --git a/Source/WebCore/workers/service/ServiceWorkerClientQueryOptions.h b/Source/WebCore/workers/service/ServiceWorkerClientQueryOptions.h
>index 428467292c238c0786853b3d1305bdb23f9fc9ba..d41882a6c18a3bf19a204a153a1d2ecc92dab0f6 100644
>--- a/Source/WebCore/workers/service/ServiceWorkerClientQueryOptions.h
>+++ b/Source/WebCore/workers/service/ServiceWorkerClientQueryOptions.h
>@@ -28,6 +28,7 @@
> #if ENABLE(SERVICE_WORKER)
> 
> #include "ServiceWorkerClientType.h"
>+#include <wtf/Optional.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/workers/service/ServiceWorkerContainer.cpp b/Source/WebCore/workers/service/ServiceWorkerContainer.cpp
>index 3d849c5bdd4deb724d1d923eed8f8c48a040c648..dfda10d818ac13d160f35429a2245f704732b5f4 100644
>--- a/Source/WebCore/workers/service/ServiceWorkerContainer.cpp
>+++ b/Source/WebCore/workers/service/ServiceWorkerContainer.cpp
>@@ -36,6 +36,7 @@
> #include "JSDOMPromiseDeferred.h"
> #include "JSServiceWorkerRegistration.h"
> #include "Logging.h"
>+#include "MessageEvent.h"
> #include "NavigatorBase.h"
> #include "ResourceError.h"
> #include "SchemeRegistry.h"
>diff --git a/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h b/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h
>index 45666dc401cce617752b83535c098f3de5661a2c..12946a6b05737b52be80315f42be4d86f617624e 100644
>--- a/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h
>+++ b/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h
>@@ -32,9 +32,8 @@
> #include <WebCore/SQLiteDatabase.h>
> #include <WebCore/SQLiteStatement.h>
> #include <wtf/CompletionHandler.h>
>-#include <wtf/UniqueRef.h>
>+#include <wtf/StdSet.h>
> #include <wtf/Vector.h>
>-#include <wtf/WeakPtr.h>
> #include <wtf/WorkQueue.h>
> 
> namespace WebCore {
>diff --git a/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp b/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp
>index bef8d06ee18d5ff0dcffc1036829a71497cb4c4e..2b0a1c379ecd8662b0081f4db2ee517905a955c4 100644
>--- a/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp
>@@ -32,6 +32,7 @@
> #include "NetworkLoadParameters.h"
> #include "NetworkProcess.h"
> #include <WebCore/CrossOriginAccessControl.h>
>+#include <WebCore/SecurityOrigin.h>
> 
> #define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(m_parameters.sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkCORSPreflightChecker::" fmt, this, ##__VA_ARGS__)
> 
>diff --git a/Source/WebKit/NetworkProcess/NetworkDataTask.cpp b/Source/WebKit/NetworkProcess/NetworkDataTask.cpp
>index 3e5adaf11b9cd77b9607f839ff09228ccf0e6794..f1f01115d231aabd7de0ed00c0784f188f09cc54 100644
>--- a/Source/WebKit/NetworkProcess/NetworkDataTask.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkDataTask.cpp
>@@ -29,6 +29,7 @@
> #include "NetworkDataTaskBlob.h"
> #include "NetworkLoadParameters.h"
> #include "NetworkSession.h"
>+#include <WebCore/ResourceError.h>
> #include <WebCore/ResourceResponse.h>
> #include <wtf/RunLoop.h>
> 
>diff --git a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp
>index f2fb5cddc1312a5a7f3d4f4e5c4c4a09c2f49983..156a625ce58454cb24141f84a7a87dd479c63d13 100644
>--- a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp
>@@ -33,7 +33,6 @@
> #include <wtf/CompletionHandler.h>
> #include <wtf/NeverDestroyed.h>
> #include <wtf/RunLoop.h>
>-#include <wtf/WorkQueue.h>
> 
> #define RELEASE_LOG_IF_ALLOWED(sessionID, fmt, ...) RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkHTTPSUpgradeChecker::" fmt, this, ##__VA_ARGS__)
> #define RELEASE_LOG_ERROR_IF_ALLOWED(sessionID, fmt, ...) RELEASE_LOG_ERROR_IF(sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkHTTPSUpgradeChecker::" fmt, this, ##__VA_ARGS__)
>diff --git a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h
>index afae1dcdf6a7ee233ba483d28f7afa9ba1c6a443..cc39f036374f70376b1afe8a82e7a6f1b90987b7 100644
>--- a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h
>+++ b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h
>@@ -25,11 +25,10 @@
> 
> #pragma once
> 
>+#include <atomic>
>+#include <wtf/Forward.h>
> #include <wtf/UniqueRef.h>
>-
>-namespace WTF {
>-class WorkQueue;
>-}
>+#include <wtf/WorkQueue.h>
> 
> namespace WebCore {
> class SQLiteDatabase;
>@@ -54,9 +53,9 @@ public:
>     void query(String&&, PAL::SessionID, CompletionHandler<void(bool)>&&);
> 
> private:
>-    Ref<WTF::WorkQueue> m_workQueue;
>-    WTF::UniqueRef<WebCore::SQLiteDatabase> m_database;
>-    WTF::UniqueRef<WebCore::SQLiteStatement> m_statement;
>+    Ref<WorkQueue> m_workQueue;
>+    UniqueRef<WebCore::SQLiteDatabase> m_database;
>+    UniqueRef<WebCore::SQLiteStatement> m_statement;
>     std::atomic<bool> m_didSetupCompleteSuccessfully { false };
> };
> 
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>index 0ccbce838a038ae4c7a9c0f032b45272a3688722..076bc825c5a06957f63cef7c0e9f1c9518dd10bc 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>@@ -32,6 +32,7 @@
> #include "AuthenticationManager.h"
> #include "AuxiliaryProcessMessages.h"
> #include "DataReference.h"
>+#include "Download.h"
> #include "DownloadProxyMessages.h"
> #if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
> #include "LegacyCustomProtocolManager.h"
>@@ -39,9 +40,11 @@
> #include "Logging.h"
> #include "NetworkConnectionToWebProcess.h"
> #include "NetworkContentRuleListManagerMessages.h"
>+#include "NetworkLoad.h"
> #include "NetworkProcessCreationParameters.h"
> #include "NetworkProcessPlatformStrategies.h"
> #include "NetworkProcessProxyMessages.h"
>+#include "NetworkResourceLoadMap.h"
> #include "NetworkResourceLoader.h"
> #include "NetworkSession.h"
> #include "NetworkSessionCreationParameters.h"
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoadMap.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoadMap.cpp
>index c20fb8a7e7bab7eaf9a22b730aeacfb9668e54cd..b0868f10239732910dcba6b10e8494c31a85573e 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoadMap.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoadMap.cpp
>@@ -26,6 +26,8 @@
> #include "config.h"
> #include "NetworkResourceLoadMap.h"
> 
>+#include "NetworkConnectionToWebProcess.h"
>+
> namespace WebKit {
> 
> NetworkResourceLoadMap::MapType::AddResult NetworkResourceLoadMap::add(ResourceLoadIdentifier identifier, Ref<NetworkResourceLoader>&& loader)
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoadMap.h b/Source/WebKit/NetworkProcess/NetworkResourceLoadMap.h
>index 7ef45b5eb0eaa7190798befe82e23a4275f5f942..e38cbdc4c2f310012d7c7488f21450351bc90b47 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoadMap.h
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoadMap.h
>@@ -25,7 +25,6 @@
> 
> #pragma once
> 
>-#include "NetworkConnectionToWebProcess.h"
> #include "NetworkResourceLoader.h"
> #include <wtf/HashMap.h>
> #include <wtf/HashSet.h>
>@@ -36,6 +35,8 @@
> 
> namespace WebKit {
> 
>+class NetworkConnectionToWebProcess;
>+
> typedef uint64_t ResourceLoadIdentifier;
> 
> class NetworkResourceLoadMap {
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>index 4ac4ffa2c0fb8f5bee9a946ef2b4ab5d8e2adef2..f1459d7dc2e7f10385efbbbb1953bcf5d75a6c5d 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>@@ -35,6 +35,7 @@
> #include "NetworkLoadChecker.h"
> #include "NetworkProcess.h"
> #include "NetworkProcessConnectionMessages.h"
>+#include "NetworkSession.h"
> #include "SharedBufferDataReference.h"
> #include "WebCoreArgumentCoders.h"
> #include "WebErrors.h"
>diff --git a/Source/WebKit/NetworkProcess/PingLoad.h b/Source/WebKit/NetworkProcess/PingLoad.h
>index c4a097eb446081940adb37cf5386d4d921cf53e0..90aaae45170919bd984982854ead91c5a7195659 100644
>--- a/Source/WebKit/NetworkProcess/PingLoad.h
>+++ b/Source/WebKit/NetworkProcess/PingLoad.h
>@@ -35,6 +35,7 @@
> 
> namespace WebKit {
> 
>+class NetworkConnectionToWebProcess;
> class NetworkLoadChecker;
> class NetworkProcess;
> 
>diff --git a/Source/WebKit/Shared/WebCompiledContentRuleListData.cpp b/Source/WebKit/Shared/WebCompiledContentRuleListData.cpp
>index 9f4239b6792dbdaa62e976e7f5a6a4115d57d1fd..650b92490c8b331b27bbb47f08cd8657b3a9a5c0 100644
>--- a/Source/WebKit/Shared/WebCompiledContentRuleListData.cpp
>+++ b/Source/WebKit/Shared/WebCompiledContentRuleListData.cpp
>@@ -29,6 +29,7 @@
> #if ENABLE(CONTENT_EXTENSIONS)
> 
> #include "ArgumentCoders.h"
>+#include "DataReference.h"
> #include "SharedBufferDataReference.h"
> 
> namespace WebKit {
>diff --git a/Source/WebKit/Shared/gtk/WebEventFactory.cpp b/Source/WebKit/Shared/gtk/WebEventFactory.cpp
>index 74f00bb53c49c4e9663ffed45d512e2a11aeffc1..3c338281419491e431872e33d517ca3ba7d9c75c 100644
>--- a/Source/WebKit/Shared/gtk/WebEventFactory.cpp
>+++ b/Source/WebKit/Shared/gtk/WebEventFactory.cpp
>@@ -40,6 +40,8 @@
> 
> namespace WebKit {
> 
>+using namespace WebCore;
>+
> static inline bool isGdkKeyCodeFromKeyPad(unsigned keyval)
> {
>     return keyval >= GDK_KP_Space && keyval <= GDK_KP_9;
>diff --git a/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp b/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp
>index 1b76bed26dcc608c9b32b8489ead2d09e843e171..2a02d04bc4afd0e4521e38ca627c4f93373efa30 100644
>--- a/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp
>+++ b/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp
>@@ -411,7 +411,7 @@ void WKWebsiteDataStoreSetStatisticsPruneEntriesDownTo(WKWebsiteDataStoreRef dat
> void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreFunction callback)
> {
> #if ENABLE(RESOURCE_LOAD_STATISTICS)
>-    WebKit::toImpl(dataStoreRef)->websiteDataStore().scheduleClearInMemoryAndPersistent(ShouldGrandfatherStatistics::Yes, [context, callback]() {
>+    WebKit::toImpl(dataStoreRef)->websiteDataStore().scheduleClearInMemoryAndPersistent(WebKit::ShouldGrandfatherStatistics::Yes, [context, callback]() {
>         callback(context);
>     });
> #else
>@@ -422,7 +422,7 @@ void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore(WKWebsiteDataSt
> void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours(WKWebsiteDataStoreRef dataStoreRef, unsigned hours, void* context, WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHoursFunction callback)
> {
> #if ENABLE(RESOURCE_LOAD_STATISTICS)
>-    WebKit::toImpl(dataStoreRef)->websiteDataStore().scheduleClearInMemoryAndPersistent(WallTime::now() - Seconds::fromHours(hours), ShouldGrandfatherStatistics::Yes, [context, callback]() {
>+    WebKit::toImpl(dataStoreRef)->websiteDataStore().scheduleClearInMemoryAndPersistent(WallTime::now() - Seconds::fromHours(hours), WebKit::ShouldGrandfatherStatistics::Yes, [context, callback]() {
>         callback(context);
>     });
> #else
>@@ -483,7 +483,7 @@ void WKWebsiteDataStoreStatisticsResetToConsistentState(WKWebsiteDataStoreRef da
>     store.resetCacheMaxAgeCapForPrevalentResources([callbackAggregator = callbackAggregator.copyRef()] { });
>     store.resetCrossSiteLoadsWithLinkDecorationForTesting([callbackAggregator = callbackAggregator.copyRef()] { });
>     store.resetParametersToDefaultValues([callbackAggregator = callbackAggregator.copyRef()] { });
>-    store.scheduleClearInMemoryAndPersistent(ShouldGrandfatherStatistics::No, [callbackAggregator = callbackAggregator.copyRef()] { });
>+    store.scheduleClearInMemoryAndPersistent(WebKit::ShouldGrandfatherStatistics::No, [callbackAggregator = callbackAggregator.copyRef()] { });
> #else
>     UNUSED_PARAM(dataStoreRef);
>     completionHandler(context);
>diff --git a/Source/WebKit/UIProcess/Downloads/DownloadProxyMap.cpp b/Source/WebKit/UIProcess/Downloads/DownloadProxyMap.cpp
>index 1a5b1ab12431d3ddd3d6e38b1ece17ebb92d85d1..29453eff0533fd5daf1beceac531479d5b4f4f4e 100644
>--- a/Source/WebKit/UIProcess/Downloads/DownloadProxyMap.cpp
>+++ b/Source/WebKit/UIProcess/Downloads/DownloadProxyMap.cpp
>@@ -30,7 +30,10 @@
> #include "DownloadProxy.h"
> #include "DownloadProxyMessages.h"
> #include "MessageReceiverMap.h"
>+#include "NetworkProcessMessages.h"
>+#include "NetworkProcessProxy.h"
> #include "ProcessAssertion.h"
>+#include "WebProcessPool.h"
> #include <wtf/StdLibExtras.h>
> 
> #if PLATFORM(COCOA)
>diff --git a/Source/WebKit/UIProcess/InspectorTargetProxy.cpp b/Source/WebKit/UIProcess/InspectorTargetProxy.cpp
>index 1e997525e87f58f85d26be6678e34632f6cbe064..62b0729f8a546ba4d545e0c159089a3b1f455ad5 100644
>--- a/Source/WebKit/UIProcess/InspectorTargetProxy.cpp
>+++ b/Source/WebKit/UIProcess/InspectorTargetProxy.cpp
>@@ -29,6 +29,7 @@
> #include "WebFrameProxy.h"
> #include "WebPageMessages.h"
> #include "WebPageProxy.h"
>+#include "WebProcessProxy.h"
> 
> namespace WebKit {
> 
>diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h
>index db3675724fcc1279c874e7e3b6d0e23bf8cd3257..fb1c2beaa55eed77a43e3d04d34ba40ce614b42f 100644
>--- a/Source/WebKit/UIProcess/PageClient.h
>+++ b/Source/WebKit/UIProcess/PageClient.h
>@@ -32,6 +32,7 @@
> #include "WebDataListSuggestionsDropdown.h"
> #include "WebPopupMenuProxy.h"
> #include <WebCore/AlternativeTextClient.h>
>+#include <WebCore/DragActions.h>
> #include <WebCore/EditorClient.h>
> #include <WebCore/FocusDirection.h>
> #include <WebCore/InputMode.h>
>@@ -82,6 +83,10 @@ class Region;
> class TextIndicator;
> class WebMediaSessionManager;
> 
>+#if PLATFORM(GTK)
>+class SelectionData;
>+#endif
>+
> enum class RouteSharingPolicy : uint8_t;
> enum class ScrollbarStyle : uint8_t;
> enum class TextIndicatorWindowLifetime : uint8_t;
>diff --git a/Source/WebKit/UIProcess/ProcessAssertion.cpp b/Source/WebKit/UIProcess/ProcessAssertion.cpp
>index edb06d3b209bb26ddbc9f934f4065ce5c06e95d1..2fd0783a9fca2d48727ac486b0d43e9871b111b9 100644
>--- a/Source/WebKit/UIProcess/ProcessAssertion.cpp
>+++ b/Source/WebKit/UIProcess/ProcessAssertion.cpp
>@@ -28,6 +28,8 @@
> 
> #if !PLATFORM(IOS_FAMILY)
> 
>+#include "WKBase.h"
>+
> namespace WebKit {
> 
> ProcessAssertion::ProcessAssertion(ProcessID, const String&, AssertionState assertionState)
>diff --git a/Source/WebKit/UIProcess/ProvisionalPageProxy.h b/Source/WebKit/UIProcess/ProvisionalPageProxy.h
>index 5f5924a71a8af2793f1578cb09606831cb648773..b1bbc5a8dcbcfd8ac444429deda5d74ecd3e6ed5 100644
>--- a/Source/WebKit/UIProcess/ProvisionalPageProxy.h
>+++ b/Source/WebKit/UIProcess/ProvisionalPageProxy.h
>@@ -32,6 +32,10 @@
> #include "WebsitePoliciesData.h"
> #include <wtf/WeakPtr.h>
> 
>+namespace API {
>+class Navigation;
>+}
>+
> namespace IPC {
> class FormDataReference;
> }
>diff --git a/Source/WebKit/UIProcess/WebPageInspectorTargetAgent.h b/Source/WebKit/UIProcess/WebPageInspectorTargetAgent.h
>index 8dd6ccd3e5f0b80f695658166afb673410856482..938bfd00a9a0ed49a29ba3523573d546406bc8be 100644
>--- a/Source/WebKit/UIProcess/WebPageInspectorTargetAgent.h
>+++ b/Source/WebKit/UIProcess/WebPageInspectorTargetAgent.h
>@@ -25,6 +25,7 @@
> 
> #pragma once
> 
>+#include <JavaScriptCore/InspectorFrontendChannel.h>
> #include <JavaScriptCore/InspectorTargetAgent.h>
> 
> namespace WebKit {
>diff --git a/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp b/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp
>index 8287464493985dc0f0050e78696f44af36b4956f..6db698850515507f980ca7879a14b9642a9df8df 100644
>--- a/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp
>+++ b/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp
>@@ -29,6 +29,7 @@
> #include <WebCore/GeolocationPosition.h>
> #include <gio/gio.h>
> #include <glib/gi18n-lib.h>
>+#include <wtf/glib/GUniquePtr.h>
> 
> #if USE(GLIB_EVENT_LOOP)
> #include <wtf/glib/RunLoopSourcePriority.h>
>diff --git a/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp b/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp
>index fd254dc8e5149282837b54ccd495f947484ded1f..0b8ffb16440d30bdabf5529cd363af9797d31c48 100644
>--- a/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp
>+++ b/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp
>@@ -152,7 +152,7 @@ void WebCacheStorageConnection::engineRepresentationCompleted(uint64_t requestId
>         callback(result);
> }
> 
>-void WebCacheStorageConnection::updateQuotaBasedOnSpaceUsage(const ClientOrigin& origin)
>+void WebCacheStorageConnection::updateQuotaBasedOnSpaceUsage(const WebCore::ClientOrigin& origin)
> {
>     connection().send(Messages::NetworkProcess::UpdateQuotaBasedOnSpaceUsageForTesting(m_sessionID, origin), 0);
> }
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp
>index f6106a3b5e4d86b21ec9513ff79e64b86630b325..f7ae0d6dac0c89e4eb99fecd353b8b1b9a564ff3 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp
>@@ -248,7 +248,7 @@ void WKBundleClearAllDatabases(WKBundleRef)
> void WKBundleSetDatabaseQuota(WKBundleRef bundleRef, uint64_t quota)
> {
>     // Historically, we've used the following (somewhat nonsensical) string for the databaseIdentifier of local files.
>-    WebCore::DatabaseTracker::singleton().setQuota(*WebKit::SecurityOriginData::fromDatabaseIdentifier("file__0"), quota);
>+    WebCore::DatabaseTracker::singleton().setQuota(*WebCore::SecurityOriginData::fromDatabaseIdentifier("file__0"), quota);
> }
> 
> void WKBundleReleaseMemory(WKBundleRef)
>diff --git a/Source/WebKit/WebProcess/Storage/WebServiceWorkerFetchTaskClient.h b/Source/WebKit/WebProcess/Storage/WebServiceWorkerFetchTaskClient.h
>index d8804f76d077fc68a49af3a7fe2c578ab0b78671..e0f47d86a968fc8cf95cef3a3e1504354bb1ef55 100644
>--- a/Source/WebKit/WebProcess/Storage/WebServiceWorkerFetchTaskClient.h
>+++ b/Source/WebKit/WebProcess/Storage/WebServiceWorkerFetchTaskClient.h
>@@ -31,7 +31,6 @@
> #include <WebCore/FetchIdentifier.h>
> #include <WebCore/FetchLoader.h>
> #include <WebCore/FetchLoaderClient.h>
>-#include <WebCore/ResourceError.h>
> #include <WebCore/ServiceWorkerFetch.h>
> #include <WebCore/ServiceWorkerTypes.h>
> #include <wtf/UniqueRef.h>
>@@ -83,7 +82,7 @@ private:
>     Optional<BlobLoader> m_blobLoader;
>     bool m_needsContinueDidReceiveResponseMessage { false };
>     bool m_waitingForContinueDidReceiveResponseMessage { false };
>-    Variant<std::nullptr_t, Ref<WebCore::SharedBuffer>, Ref<FormData>, UniqueRef<ResourceError>> m_responseData;
>+    Variant<std::nullptr_t, Ref<WebCore::SharedBuffer>, Ref<WebCore::FormData>, UniqueRef<WebCore::ResourceError>> m_responseData;
>     bool m_didFinish { false };
> };
>

Actions: View | Formatted Diff | Diff

Attachments on bug 196845: 367273 | 367274 | 367331