Attachment 348525 Details for Bug 189009 – Patch

[patch] Patch

bug-189009-20180830121139.patch (text/plain), 62.88 KB, created by Tim Horton on 2018-08-30 12:11:40 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2018-08-30 12:11:40 PDT

Size: 62.88 KB

patch

obsolete

>Subversion Revision: 235514
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 165c56ece927544259e49ba02e49cbba412dbe62..9267c1f9909e5a8a76a4ee1e4bfe074fdaaa8847 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-08-30  Tim Horton  <timothy_horton@apple.com>
>+
>+        Bundle unified sources more tightly in projects with deep directory structures
>+        https://bugs.webkit.org/show_bug.cgi?id=189009
>+
>+        Reviewed by Simon Fraser.
>+
>+        * Scripts/generate-unified-source-bundles.rb:
>+        It turns out our plan to switch unified source bundle every time the directory
>+        changes is not a good fit for projects like WebKit2 with many small directories.
>+        It leaves many unified source bundles with only a single source file,
>+        achieving only ~40% density.
>+
>+        Instead, switch unified source bundles every time the top-level directory changes.
>+        This still achieves the goal of *usually* only rebuilding the one top-level
>+        directory you touched, and increases source bundle density wildly, to ~95%.
>+
>+        * wtf/Platform.h:
>+
> 2018-08-29  David Kilzer  <ddkilzer@apple.com>
> 
>         Rename wtf/text/mac/StringMac.mm to wtf/text/cococa/StringCococa.mm
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1c4dde3f2b5225f5a73fb3d71221c596ff863222..6e66b24c946c1f3369b3ec23beba391382ceeb76 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,38 @@
>+2018-08-30  Tim Horton  <timothy_horton@apple.com>
>+
>+        Bundle unified sources more tightly in projects with deep directory structures
>+        https://bugs.webkit.org/show_bug.cgi?id=189009
>+
>+        Reviewed by Simon Fraser.
>+
>+        Fix a variety of unification errors due to reshuffling the bundles.
>+
>+        * Modules/mediastream/RTCController.cpp:
>+        * SourcesCocoa.txt:
>+        * WebCore.xcodeproj/project.pbxproj:
>+        * crypto/algorithms/CryptoAlgorithmECDSA.cpp:
>+        (WebCore::CryptoAlgorithmECDSA::importKey):
>+        * dom/Document.h:
>+        * html/parser/HTMLTreeBuilder.cpp:
>+        * loader/appcache/ApplicationCacheResourceLoader.h:
>+        * page/AlternativeTextClient.h:
>+        * platform/Pasteboard.h:
>+        * platform/graphics/DisplayRefreshMonitor.cpp:
>+        * platform/graphics/FontFamilySpecificationNull.cpp:
>+        * platform/graphics/cocoa/WebGLLayer.mm:
>+        (-[WebGLLayer initWithGraphicsContext3D:]):
>+        (-[WebGLLayer copyImageSnapshotWithColorSpace:]):
>+        (-[WebGLLayer display]):
>+        (-[WebGLLayer allocateIOSurfaceBackingStoreWithSize:usingAlpha:]):
>+        * platform/graphics/cocoa/WebGPULayer.mm:
>+        (-[WebGPULayer initWithGPUDevice:]):
>+        * platform/graphics/metal/GPUCommandQueueMetal.mm:
>+        * platform/mac/PasteboardMac.mm:
>+        * platform/mediastream/mac/DisplayCaptureManagerCocoa.cpp:
>+        * platform/network/ResourceRequestBase.cpp:
>+        * rendering/updating/RenderTreeBuilderBlockFlow.cpp:
>+        * rendering/updating/RenderTreeBuilderInline.cpp:
>+
> 2018-08-30  Eric Carlson  <eric.carlson@apple.com>
> 
>         Mock video devices should only support discrete sizes
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 9688a9a162ecff3a44cf3f9c04f504f350383387..0b9cb378096ce5107d7d38a9266f679da3a7ab87 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,53 @@
>+2018-08-30  Tim Horton  <timothy_horton@apple.com>
>+
>+        Bundle unified sources more tightly in projects with deep directory structures
>+        https://bugs.webkit.org/show_bug.cgi?id=189009
>+
>+        Reviewed by Simon Fraser.
>+
>+        Fix a variety of unification errors due to reshuffling the bundles.
>+
>+        * Shared/APIWebArchive.mm:
>+        * Shared/APIWebArchiveResource.mm:
>+        * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
>+        * Shared/Plugins/Netscape/mac/PluginInformationMac.mm:
>+        * SourcesCocoa.txt:
>+        * SourcesGTK.txt:
>+        * UIProcess/API/APIAutomationSessionClient.h:
>+        (API::AutomationSessionClient::sessionIdentifier const):
>+        (API::AutomationSessionClient::messageOfCurrentJavaScriptDialogOnPage):
>+        (API::AutomationSessionClient::setUserInputForCurrentJavaScriptPromptOnPage):
>+        * UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm:
>+        (-[WKCustomProtocolLoader initWithLegacyCustomProtocolManagerProxy:customProtocolID:request:]):
>+        (-[WKCustomProtocolLoader connection:didFailWithError:]):
>+        (-[WKCustomProtocolLoader connection:didReceiveResponse:]):
>+        * UIProcess/Plugins/PluginProcessProxy.cpp:
>+        (WebKit::generatePluginProcessCallbackID):
>+        (WebKit::PluginProcessProxy::fetchWebsiteData):
>+        (WebKit::PluginProcessProxy::deleteWebsiteData):
>+        (WebKit::PluginProcessProxy::deleteWebsiteDataForHostNames):
>+        (WebKit::generateCallbackID): Deleted.
>+        * UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm:
>+        (-[WKScrollingNodeScrollViewDelegate scrollViewWillEndDragging:withVelocity:targetContentOffset:]):
>+        * UIProcess/Storage/StorageProcessProxy.cpp:
>+        (WebKit::generateStorageProcessCallbackID):
>+        (WebKit::StorageProcessProxy::fetchWebsiteData):
>+        (WebKit::StorageProcessProxy::deleteWebsiteData):
>+        (WebKit::StorageProcessProxy::deleteWebsiteDataForOrigins):
>+        (WebKit::generateCallbackID): Deleted.
>+        * WebKit.xcodeproj/project.pbxproj:
>+        * WebProcess/Plugins/PDF/PDFPlugin.mm:
>+        (-[WKPDFPluginAccessibilityObject accessibilityPerformAction:]):
>+        (-[WKPDFPluginAccessibilityObject accessibilityFocusedUIElement]):
>+        (-[WKPDFPluginAccessibilityObject accessibilityAssociatedControlForAnnotation:]):
>+        (-[WKPDFPluginAccessibilityObject accessibilityHitTest:]):
>+        (-[WKPDFLayerControllerDelegate updateScrollPosition:]):
>+        (WebKit::PDFPlugin::updateCursor):
>+        (WebKit::coreCursor):
>+        (appendValuesInPDFNameSubtreeToVector): Deleted.
>+        (getAllValuesInPDFNameTree): Deleted.
>+        (getAllScriptsInPDFDocument): Deleted.
>+
> 2018-08-30  Eric Carlson  <eric.carlson@apple.com>
> 
>         Mock video devices should only support discrete sizes
>diff --git a/Source/WTF/Scripts/generate-unified-source-bundles.rb b/Source/WTF/Scripts/generate-unified-source-bundles.rb
>index c01966ee1b2c67d9760f03a5bbcaa3cb572612b3..1fb36566d92edad1f6fa34d16ab495a5346d5490 100644
>--- a/Source/WTF/Scripts/generate-unified-source-bundles.rb
>+++ b/Source/WTF/Scripts/generate-unified-source-bundles.rb
>@@ -210,10 +210,20 @@ class BundleManager
>     end
> end
> 
>+def TopLevelDirectoryForPath(path)
>+    if !path
>+        return nil
>+    end
>+    while path.dirname != path.dirname.dirname
>+        path = path.dirname
>+    end
>+    return path
>+end
>+
> def ProcessFileForUnifiedSourceGeneration(sourceFile)
>     path = sourceFile.path
>-    if ($currentDirectory != path.dirname)
>-        log("Flushing because new dirname; old: #{$currentDirectory}, new: #{path.dirname}")
>+    if (TopLevelDirectoryForPath($currentDirectory) != TopLevelDirectoryForPath(path.dirname))
>+        log("Flushing because new top level directory; old: #{$currentDirectory}, new: #{path.dirname}")
>         $bundleManagers.each_value { |x| x.flush }
>         $currentDirectory = path.dirname
>     end
>diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
>index 0c6efb862982539d2b4b2cc4f8f8b5fcb4ec88e8..67cfa93313c90421eb6cf179d98ef703da0e49db 100644
>--- a/Source/WTF/wtf/Platform.h
>+++ b/Source/WTF/wtf/Platform.h
>@@ -1314,6 +1314,7 @@
> #if PLATFORM(MAC)
> #define HAVE_TOUCH_BAR 1
> #define HAVE_ADVANCED_SPELL_CHECKING 1
>+#define USE_DICTATION_ALTERNATIVES 1
> 
> #if defined(__LP64__)
> #define ENABLE_WEB_PLAYBACK_CONTROLS_MANAGER 1
>diff --git a/Source/WTF/wtf/text/StringBuffer.h b/Source/WTF/wtf/text/StringBuffer.h
>index f293d333dbe3e45e637a1486733d0a2fd8c08c0c..e32cd260dd94db155985bfb47629b8a91136c269 100644
>--- a/Source/WTF/wtf/text/StringBuffer.h
>+++ b/Source/WTF/wtf/text/StringBuffer.h
>@@ -29,9 +29,10 @@
> #ifndef StringBuffer_h
> #define StringBuffer_h
> 
>-#include <wtf/Assertions.h>
> #include <limits>
> #include <unicode/utypes.h>
>+#include <wtf/Assertions.h>
>+#include <wtf/MallocPtr.h>
> 
> namespace WTF {
> 
>diff --git a/Source/WebCore/Modules/cache/WorkerCacheStorageConnection.cpp b/Source/WebCore/Modules/cache/WorkerCacheStorageConnection.cpp
>index ad2093219f88e6da3e1d60624e41ae9a41df4927..1ebdd5de48a7e7e1c96a01c78fed7da5bc4fb888 100644
>--- a/Source/WebCore/Modules/cache/WorkerCacheStorageConnection.cpp
>+++ b/Source/WebCore/Modules/cache/WorkerCacheStorageConnection.cpp
>@@ -29,6 +29,7 @@
> 
> #include "CacheQueryOptions.h"
> #include "CacheStorageProvider.h"
>+#include "ClientOrigin.h"
> #include "Document.h"
> #include "Page.h"
> #include "WorkerGlobalScope.h"
>@@ -36,7 +37,6 @@
> #include "WorkerRunLoop.h"
> #include "WorkerThread.h"
> 
>-
> namespace WebCore {
> using namespace WebCore::DOMCacheEngine;
> 
>diff --git a/Source/WebCore/Modules/mediastream/RTCController.cpp b/Source/WebCore/Modules/mediastream/RTCController.cpp
>index 96132e69737ae98a60f954f1f31183841071e0a9..cdb777e99929221cf0a8f01142b2d07ede9efed4 100644
>--- a/Source/WebCore/Modules/mediastream/RTCController.cpp
>+++ b/Source/WebCore/Modules/mediastream/RTCController.cpp
>@@ -27,6 +27,7 @@
> 
> #if ENABLE(WEB_RTC)
> 
>+#include "Document.h"
> #include "LibWebRTCProvider.h"
> #include "RTCPeerConnection.h"
> 
>diff --git a/Source/WebCore/Modules/paymentrequest/PaymentRequestUpdateEvent.cpp b/Source/WebCore/Modules/paymentrequest/PaymentRequestUpdateEvent.cpp
>index c205335eaa8e918a6d38ae4f2ffc81aed45a9a0f..94b71c4661924135c21aea69d4899d7b075a62a6 100644
>--- a/Source/WebCore/Modules/paymentrequest/PaymentRequestUpdateEvent.cpp
>+++ b/Source/WebCore/Modules/paymentrequest/PaymentRequestUpdateEvent.cpp
>@@ -28,6 +28,7 @@
> 
> #if ENABLE(PAYMENT_REQUEST)
> 
>+#include "EventNames.h"
> #include "PaymentRequest.h"
> 
> namespace WebCore {
>diff --git a/Source/WebCore/Modules/webvr/VRDisplay.cpp b/Source/WebCore/Modules/webvr/VRDisplay.cpp
>index adb751d0c39c0a56b5e4dc1f54210bdaa4edff78..a933d980fcf5a99174ab0e0c40020916cbf1b366 100644
>--- a/Source/WebCore/Modules/webvr/VRDisplay.cpp
>+++ b/Source/WebCore/Modules/webvr/VRDisplay.cpp
>@@ -29,6 +29,7 @@
> #include "CanvasRenderingContext.h"
> #include "Chrome.h"
> #include "DOMException.h"
>+#include "DOMWindow.h"
> #include "EventNames.h"
> #include "Page.h"
> #include "ScriptedAnimationController.h"
>diff --git a/Source/WebCore/PAL/pal/crypto/gcrypt/Utilities.h b/Source/WebCore/PAL/pal/crypto/gcrypt/Utilities.h
>index 82fe17c03b41173ec13d30b2fc31fac1d28a58df..6292a0f80bb0f5826532fe41b3baa091bde2c616 100644
>--- a/Source/WebCore/PAL/pal/crypto/gcrypt/Utilities.h
>+++ b/Source/WebCore/PAL/pal/crypto/gcrypt/Utilities.h
>@@ -28,6 +28,7 @@
> 
> #include <gcrypt.h>
> #include <wtf/Assertions.h>
>+#include <wtf/Optional.h>
> 
> namespace PAL {
> namespace GCrypt {
>diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt
>index 66f7f16bd64f82c432beaed8e70d1b5ff063a517..957e4b5b661b4020f0a21ee0095c017646e493a3 100644
>--- a/Source/WebCore/SourcesCocoa.txt
>+++ b/Source/WebCore/SourcesCocoa.txt
>@@ -389,7 +389,7 @@ platform/ios/PlatformScreenIOS.mm
> platform/ios/PlatformSpeechSynthesizerIOS.mm @no-unify
> platform/ios/PlaybackSessionInterfaceAVKit.mm @no-unify
> platform/ios/QuickLook.mm
>-platform/ios/QuickLookSoftLink.mm
>+platform/ios/QuickLookSoftLink.mm @no-unify
> platform/ios/RemoteCommandListenerIOS.mm
> platform/ios/ScrollAnimatorIOS.mm
> platform/ios/ScrollbarThemeIOS.mm
>@@ -399,7 +399,7 @@ platform/ios/SSLKeyGeneratorIOS.cpp
> platform/ios/SystemMemoryIOS.cpp
> platform/ios/ThemeIOS.mm @no-unify
> platform/ios/TileControllerMemoryHandlerIOS.cpp
>-platform/ios/UserAgentIOS.mm
>+platform/ios/UserAgentIOS.mm @no-unify
> platform/ios/ValidationBubbleIOS.mm @no-unify
> platform/ios/VideoFullscreenInterfaceAVKit.mm @no-unify
> platform/ios/WebAVPlayerController.mm
>diff --git a/Source/WebCore/SourcesGTK.txt b/Source/WebCore/SourcesGTK.txt
>index 4626b6fcbe54a495ed10c6bb82449a0497622773..e616f27e5bee090fb4c7c5c512e5b66a22c77f53 100644
>--- a/Source/WebCore/SourcesGTK.txt
>+++ b/Source/WebCore/SourcesGTK.txt
>@@ -61,14 +61,14 @@ platform/UserAgentQuirks.cpp
> 
> platform/geoclue/GeolocationProviderGeoclue.cpp
> 
>-platform/graphics/GLContext.cpp
>+platform/graphics/GLContext.cpp @no-unify
> platform/graphics/GraphicsContext3DPrivate.cpp
> 
>-platform/graphics/cairo/BackingStoreBackendCairoX11.cpp
>+platform/graphics/cairo/BackingStoreBackendCairoX11.cpp @no-unify
> 
> platform/graphics/egl/GLContextEGL.cpp
> platform/graphics/egl/GLContextEGLWayland.cpp @no-unify
>-platform/graphics/egl/GLContextEGLX11.cpp
>+platform/graphics/egl/GLContextEGLX11.cpp @no-unify
> 
> platform/graphics/glx/GLContextGLX.cpp
> 
>@@ -82,9 +82,9 @@ platform/graphics/opentype/OpenTypeVerticalData.cpp
> 
> platform/graphics/wayland/PlatformDisplayWayland.cpp
> 
>-platform/graphics/x11/PlatformDisplayX11.cpp
>-platform/graphics/x11/XErrorTrapper.cpp
>-platform/graphics/x11/XUniqueResource.cpp
>+platform/graphics/x11/PlatformDisplayX11.cpp @no-unify
>+platform/graphics/x11/XErrorTrapper.cpp @no-unify
>+platform/graphics/x11/XUniqueResource.cpp @no-unify
> 
> platform/gtk/DragDataGtk.cpp
> platform/gtk/LocalizedStringsGtk.cpp
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index f361874753b23abe7e4907b2dbbe1502bbf1b8f9..a11a2793990e93985123bee697403cc02dcf1edb 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -804,6 +804,8 @@
> 		2D8B92FF203D13E1009C868F /* UnifiedSource530.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE5F85D31FA23859006DB63B /* UnifiedSource530.cpp */; };
> 		2D8FEBDD143E3EF70072502B /* CSSCrossfadeValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8FEBDB143E3EF70072502B /* CSSCrossfadeValue.h */; };
> 		2D9066070BE141D400956998 /* LayoutState.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9066050BE141D400956998 /* LayoutState.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		2D92A79A2134AD7900F493FD /* QuickLookSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 443917FD1A91B2F8006E04F2 /* QuickLookSoftLink.mm */; };
>+		2D92A79D2134AF9500F493FD /* UserAgentIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3AF9D8320325691006CAD06 /* UserAgentIOS.mm */; };
> 		2D93AEE319DF5641002A86C3 /* ServicesOverlayController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D93AEE119DF5641002A86C3 /* ServicesOverlayController.h */; };
> 		2D97F04719DD413C001EE9C3 /* MockPageOverlayClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DAAE32C19DCAF6000E002D2 /* MockPageOverlayClient.cpp */; };
> 		2D97F04819DD4140001EE9C3 /* MockPageOverlayClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DAAE32D19DCAF6000E002D2 /* MockPageOverlayClient.h */; };
>@@ -7066,7 +7068,7 @@
> 		339B5B62131DAA3200F48D02 /* CookiesStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CookiesStrategy.h; sourceTree = "<group>"; };
> 		3662F984047CEDBE5DDDAFAA /* RenderMathMLMenclose.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMathMLMenclose.cpp; sourceTree = "<group>"; };
> 		37119A7920CCB610002C6DC9 /* WebKitTargetConditionals.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKitTargetConditionals.xcconfig; sourceTree = "<group>"; };
>-		3717D7E517ECC3A6003C276D /* extract-localizable-strings.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; name = extract-localizable-strings.pl; path = "Scripts/extract-localizable-strings.pl"; sourceTree = "<group>"; };
>+		3717D7E517ECC3A6003C276D /* extract-localizable-strings.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; name = "extract-localizable-strings.pl"; path = "Scripts/extract-localizable-strings.pl"; sourceTree = "<group>"; };
> 		371A67CA11C6C7DB00047B8B /* HyphenationCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HyphenationCF.cpp; sourceTree = "<group>"; };
> 		371E65CB13661EDC00BEEDB0 /* PageSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageSerializer.h; sourceTree = "<group>"; };
> 		371E65CD13661EED00BEEDB0 /* PageSerializer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageSerializer.cpp; sourceTree = "<group>"; };
>@@ -13352,8 +13354,8 @@
> 		CDE5959C1BF2757100A1CBE8 /* CDMSessionMediaSourceAVFObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CDMSessionMediaSourceAVFObjC.mm; sourceTree = "<group>"; };
> 		CDE6560E17CA6E7600526BA7 /* mediaControlsApple.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = mediaControlsApple.js; sourceTree = "<group>"; };
> 		CDE667A11E4BBA4D00E8154A /* PlatformAudioData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformAudioData.h; sourceTree = "<group>"; };
>-		CDE667A21E4BBF1500E8154A /* WebAudioBufferList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cocoa/WebAudioBufferList.cpp; sourceTree = "<group>"; };
>-		CDE667A31E4BBF1500E8154A /* WebAudioBufferList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa/WebAudioBufferList.h; sourceTree = "<group>"; };
>+		CDE667A21E4BBF1500E8154A /* WebAudioBufferList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebAudioBufferList.cpp; path = cocoa/WebAudioBufferList.cpp; sourceTree = "<group>"; };
>+		CDE667A31E4BBF1500E8154A /* WebAudioBufferList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebAudioBufferList.h; path = cocoa/WebAudioBufferList.h; sourceTree = "<group>"; };
> 		CDE7FC42181904B1002BBB77 /* OrderIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OrderIterator.cpp; sourceTree = "<group>"; };
> 		CDE7FC43181904B1002BBB77 /* OrderIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderIterator.h; sourceTree = "<group>"; };
> 		CDE83DAF183C44060031EAA3 /* VideoPlaybackQuality.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoPlaybackQuality.cpp; sourceTree = "<group>"; };
>@@ -31432,6 +31434,7 @@
> 				AA12DF491743DF83004DAFDF /* PlatformSpeechSynthesizerIOS.mm in Sources */,
> 				CDA29A301CBF74D400901CCF /* PlaybackSessionInterfaceAVKit.mm in Sources */,
> 				CDA29A161CBDA56C00901CCF /* PlaybackSessionInterfaceMac.mm in Sources */,
>+				2D92A79A2134AD7900F493FD /* QuickLookSoftLink.mm in Sources */,
> 				419242492127B93E00634FCF /* RealtimeOutgoingVideoSourceCocoa.mm in Sources */,
> 				316DCB8A1E7A6996001B5F87 /* RTCIceTransport.cpp in Sources */,
> 				BC51156E12B1749C00C96754 /* ScrollAnimatorMac.mm in Sources */,
>@@ -32046,6 +32049,7 @@
> 				2D8B92FD203D13E1009C868F /* UnifiedSource528.cpp in Sources */,
> 				2D8B92FE203D13E1009C868F /* UnifiedSource529.cpp in Sources */,
> 				2D8B92FF203D13E1009C868F /* UnifiedSource530.cpp in Sources */,
>+				2D92A79D2134AF9500F493FD /* UserAgentIOS.mm in Sources */,
> 				532042021F9A9F1000B81B2A /* UserAgentScriptsData.cpp in Sources */,
> 				7C3B79711908757B00B47A2D /* UserMessageHandler.cpp in Sources */,
> 				7CE68344192143A800F4D928 /* UserMessageHandlerDescriptor.cpp in Sources */,
>diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDSA.cpp b/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDSA.cpp
>index 97317e04a9797f15616de4c7608b745d9fdedef7..1b53c453b352536b4812edd2aa64d91e95df854b 100644
>--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDSA.cpp
>+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDSA.cpp
>@@ -36,12 +36,14 @@
> 
> namespace WebCore {
> 
>+namespace CryptoAlgorithmECDSAInternal {
> static const char* const ALG256 = "ES256";
> static const char* const ALG384 = "ES384";
> static const char* const ALG512 = "ES512";
> static const char* const P256 = "P-256";
> static const char* const P384 = "P-384";
> static const char* const P521 = "P-521";
>+}
> 
> Ref<CryptoAlgorithm> CryptoAlgorithmECDSA::create()
> {
>@@ -102,6 +104,7 @@ void CryptoAlgorithmECDSA::generateKey(const CryptoAlgorithmParameters& paramete
> 
> void CryptoAlgorithmECDSA::importKey(CryptoKeyFormat format, KeyData&& data, const CryptoAlgorithmParameters& parameters, bool extractable, CryptoKeyUsageBitmap usages, KeyCallback&& callback, ExceptionCallback&& exceptionCallback)
> {
>+    using namespace CryptoAlgorithmECDSAInternal;
>     const auto& ecParameters = downcast<CryptoAlgorithmEcKeyParams>(parameters);
> 
>     RefPtr<CryptoKeyEC> result;
>diff --git a/Source/WebCore/crypto/gcrypt/GCryptUtilities.h b/Source/WebCore/crypto/gcrypt/GCryptUtilities.h
>index f0a413456a94459958f9a7f02545344b5fb6c3e5..36f48d04d782d52399dd77c4bc3d7828d795a9f1 100644
>--- a/Source/WebCore/crypto/gcrypt/GCryptUtilities.h
>+++ b/Source/WebCore/crypto/gcrypt/GCryptUtilities.h
>@@ -34,6 +34,7 @@
> #include <pal/crypto/CryptoDigest.h>
> #include <pal/crypto/gcrypt/Handle.h>
> #include <pal/crypto/gcrypt/Utilities.h>
>+#include <wtf/Optional.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h
>index 9e3c31853f123ec9bea3f690b85e17bad07675d5..d39938660998862e78dc0e7bd25871a50b6af1a3 100644
>--- a/Source/WebCore/dom/Document.h
>+++ b/Source/WebCore/dom/Document.h
>@@ -641,7 +641,7 @@ public:
>     
>     WEBCORE_EXPORT DocumentLoader* loader() const;
> 
>-    WEBCORE_EXPORT ExceptionOr<RefPtr<WindowProxy>> openForBindings(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& url, const AtomicString& name, const String& features);
>+    WEBCORE_EXPORT ExceptionOr<RefPtr<WindowProxy>> openForBindings(DOMWindow& activeWindow, DOMWindow& firstDOMWindow, const String& url, const AtomicString& name, const String& features);
>     WEBCORE_EXPORT ExceptionOr<Document&> openForBindings(Document* responsibleDocument, const String& type, const String& replace);
> 
>     // FIXME: We should rename this at some point and give back the name 'open' to the HTML specified ones.
>diff --git a/Source/WebCore/html/parser/HTMLTreeBuilder.cpp b/Source/WebCore/html/parser/HTMLTreeBuilder.cpp
>index e40f9a886f15904e62f0f2688a869a69889b4a89..c731922af82983b9daa6bc7fe5227863731683fd 100644
>--- a/Source/WebCore/html/parser/HTMLTreeBuilder.cpp
>+++ b/Source/WebCore/html/parser/HTMLTreeBuilder.cpp
>@@ -32,6 +32,7 @@
> #include "HTMLDocumentParser.h"
> #include "HTMLFormControlElement.h"
> #include "HTMLFormElement.h"
>+#include "HTMLInputElement.h"
> #include "HTMLOptGroupElement.h"
> #include "HTMLOptionElement.h"
> #include "HTMLParserIdioms.h"
>diff --git a/Source/WebCore/loader/appcache/ApplicationCacheResourceLoader.h b/Source/WebCore/loader/appcache/ApplicationCacheResourceLoader.h
>index 72b29755f11d94095fa7edd530968f7c57b57beb..6d9a2da9be032007a82eda68c16fd2f28b1c1283 100644
>--- a/Source/WebCore/loader/appcache/ApplicationCacheResourceLoader.h
>+++ b/Source/WebCore/loader/appcache/ApplicationCacheResourceLoader.h
>@@ -25,6 +25,7 @@
> 
> #pragma once
> 
>+#include "ApplicationCacheResource.h"
> #include "CachedRawResource.h"
> #include "CachedRawResourceClient.h"
> #include "CachedResourceHandle.h"
>diff --git a/Source/WebCore/page/AlternativeTextClient.h b/Source/WebCore/page/AlternativeTextClient.h
>index 935593788f9899c9e2251088b4e76d005d3d2f98..143da6c47f4bcefc0a41aa876467d044715ba70a 100644
>--- a/Source/WebCore/page/AlternativeTextClient.h
>+++ b/Source/WebCore/page/AlternativeTextClient.h
>@@ -29,11 +29,6 @@
> #include <wtf/Vector.h>
> #include <wtf/text/WTFString.h>
> 
>-#if PLATFORM(MAC)
>-// Some platforms provide UI for suggesting alternative dictation text.
>-#define USE_DICTATION_ALTERNATIVES 1
>-#endif
>-
> namespace WebCore {
> 
> enum ReasonForDismissingAlternativeText {
>diff --git a/Source/WebCore/platform/Pasteboard.h b/Source/WebCore/platform/Pasteboard.h
>index d5433dd920ae0ee592bd45fd560cdd3e38a34721..e09815651bd2d60574da4236c380fad4d60215a9 100644
>--- a/Source/WebCore/platform/Pasteboard.h
>+++ b/Source/WebCore/platform/Pasteboard.h
>@@ -338,6 +338,7 @@ extern NSString *UIColorPboardType;
> #if PLATFORM(MAC)
> extern const char* const WebArchivePboardType;
> extern const char* const WebURLNamePboardType;
>+extern const char* const WebURLsWithTitlesPboardType;
> #endif
> 
> #if !PLATFORM(GTK)
>diff --git a/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp b/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp
>index 79ab9f41be5ce6de84c88e3a691810d0f49a4391..e9180988d69c96508dc121a170e712aeaaccfe5a 100644
>--- a/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp
>+++ b/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp
>@@ -33,6 +33,7 @@
> #include "NotImplemented.h"
> #include <CoreAudio/AudioHardware.h>
> #include <wtf/MainThread.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp b/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp
>index 968bb2286a1f7e58464ef88d79e61ef42490155f..3e2c82b8b12eda09db43f4c13014c5bbac0b7030 100644
>--- a/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp
>+++ b/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp
>@@ -30,6 +30,7 @@
> 
> #include "DisplayRefreshMonitorClient.h"
> #include "DisplayRefreshMonitorManager.h"
>+#include "Logging.h"
> 
> #if PLATFORM(IOS)
> #include "DisplayRefreshMonitorIOS.h"
>diff --git a/Source/WebCore/platform/graphics/FontFamilySpecificationNull.cpp b/Source/WebCore/platform/graphics/FontFamilySpecificationNull.cpp
>index 217691f723974e800579b28cc056a7b9c085c64d..15c0387698260f405e22e5bf527800308c7fe3bf 100644
>--- a/Source/WebCore/platform/graphics/FontFamilySpecificationNull.cpp
>+++ b/Source/WebCore/platform/graphics/FontFamilySpecificationNull.cpp
>@@ -27,6 +27,7 @@
> #include "FontFamilySpecificationNull.h"
> 
> #include "FontSelector.h"
>+#include <wtf/text/AtomicStringHash.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/platform/graphics/FontGenericFamilies.h b/Source/WebCore/platform/graphics/FontGenericFamilies.h
>index f762bae2ff941e75a32b49f5341c278f00ca77ea..42f42b2e5cd11204f8c6c154267e4b8ce24c5b7a 100644
>--- a/Source/WebCore/platform/graphics/FontGenericFamilies.h
>+++ b/Source/WebCore/platform/graphics/FontGenericFamilies.h
>@@ -29,6 +29,7 @@
> #include <unicode/uscript.h>
> #include <wtf/HashMap.h>
> #include <wtf/text/AtomicString.h>
>+#include <wtf/text/AtomicStringHash.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/platform/graphics/FontTaggedSettings.cpp b/Source/WebCore/platform/graphics/FontTaggedSettings.cpp
>index 61b2ebef6c4750113321bf16ba9ceee30c3f24e0..b0ca43d55c45cb50d730f892e17d80869ccd4961 100644
>--- a/Source/WebCore/platform/graphics/FontTaggedSettings.cpp
>+++ b/Source/WebCore/platform/graphics/FontTaggedSettings.cpp
>@@ -27,9 +27,8 @@
> #include "config.h"
> #include "FontTaggedSettings.h"
> 
>-#include <wtf/text/TextStream.h>
>-
> #include <wtf/text/AtomicStringHash.h>
>+#include <wtf/text/TextStream.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/platform/graphics/cairo/FontCairo.cpp b/Source/WebCore/platform/graphics/cairo/FontCairo.cpp
>index 06d9d7494a4beaa8e3a9ce7afe6dab35b1c2db78..286bc6d8e3c2653046c63b52b36d09031f208d90 100644
>--- a/Source/WebCore/platform/graphics/cairo/FontCairo.cpp
>+++ b/Source/WebCore/platform/graphics/cairo/FontCairo.cpp
>@@ -34,6 +34,7 @@
> #if USE(CAIRO)
> 
> #include "AffineTransform.h"
>+#include "CairoOperations.h"
> #include "CairoUtilities.h"
> #include "Font.h"
> #include "GlyphBuffer.h"
>diff --git a/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm b/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm
>index 3ed7e41e7c68846f3fbc172ce6ba989ff87f57eb..8ee348d899863413d6b671376e5b1da54cb13763 100644
>--- a/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm
>+++ b/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm
>@@ -42,13 +42,11 @@
> #import <OpenGL/gl.h>
> #endif
> 
>-using namespace WebCore;
>-
> @implementation WebGLLayer
> 
> @synthesize context=_context;
> 
>--(id)initWithGraphicsContext3D:(GraphicsContext3D*)context
>+-(id)initWithGraphicsContext3D:(WebCore::GraphicsContext3D*)context
> {
>     _context = context;
>     self = [super init];
>@@ -86,7 +84,7 @@ static void freeData(void *, const void *data, size_t /* size */)
> }
> #endif
> 
>--(CGImageRef)copyImageSnapshotWithColorSpace:(CGColorSpaceRef)colorSpace
>+- (CGImageRef)copyImageSnapshotWithColorSpace:(CGColorSpaceRef)colorSpace
> {
>     if (!_context)
>         return nullptr;
>@@ -96,7 +94,7 @@ -(CGImageRef)copyImageSnapshotWithColorSpace:(CGColorSpaceRef)colorSpace
> 
>     RetainPtr<CGColorSpaceRef> imageColorSpace = colorSpace;
>     if (!imageColorSpace)
>-        imageColorSpace = sRGBColorSpaceRef();
>+        imageColorSpace = WebCore::sRGBColorSpaceRef();
> 
>     CGRect layerBounds = CGRectIntegral([self bounds]);
> 
>@@ -141,19 +139,19 @@ - (void)display
> #endif
> 
>     _context->markLayerComposited();
>-    PlatformCALayer* layer = PlatformCALayer::platformCALayer((__bridge void*)self);
>+    WebCore::PlatformCALayer* layer = WebCore::PlatformCALayer::platformCALayer((__bridge void*)self);
>     if (layer && layer->owner())
>         layer->owner()->platformCALayerLayerDidDisplay(layer);
> }
> 
> #if USE(OPENGL)
>-- (void)allocateIOSurfaceBackingStoreWithSize:(IntSize)size usingAlpha:(BOOL)usingAlpha
>+- (void)allocateIOSurfaceBackingStoreWithSize:(WebCore::IntSize)size usingAlpha:(BOOL)usingAlpha
> {
>     _bufferSize = size;
>     _usingAlpha = usingAlpha;
>-    _contentsBuffer = WebCore::IOSurface::create(size, sRGBColorSpaceRef());
>-    _drawingBuffer = WebCore::IOSurface::create(size, sRGBColorSpaceRef());
>-    _spareBuffer = WebCore::IOSurface::create(size, sRGBColorSpaceRef());
>+    _contentsBuffer = WebCore::IOSurface::create(size, WebCore::sRGBColorSpaceRef());
>+    _drawingBuffer = WebCore::IOSurface::create(size, WebCore::sRGBColorSpaceRef());
>+    _spareBuffer = WebCore::IOSurface::create(size, WebCore::sRGBColorSpaceRef());
> 
>     ASSERT(_contentsBuffer);
>     ASSERT(_drawingBuffer);
>diff --git a/Source/WebCore/platform/graphics/cocoa/WebGPULayer.mm b/Source/WebCore/platform/graphics/cocoa/WebGPULayer.mm
>index 5c3557f8bd66a68c923b23aa647bb7148409e9a1..25efb8b74768024558dbcdf30f743187146955a8 100644
>--- a/Source/WebCore/platform/graphics/cocoa/WebGPULayer.mm
>+++ b/Source/WebCore/platform/graphics/cocoa/WebGPULayer.mm
>@@ -34,13 +34,11 @@
> #import <wtf/FastMalloc.h>
> #import <wtf/RetainPtr.h>
> 
>-using namespace WebCore;
>-
> @implementation WebGPULayer
> 
> @synthesize context=_context;
> 
>-- (id)initWithGPUDevice:(GPUDevice*)context
>+- (id)initWithGPUDevice:(WebCore::GPUDevice*)context
> {
>     self = [super init];
>     _context = context;
>@@ -50,7 +48,7 @@ - (id)initWithGPUDevice:(GPUDevice*)context
> 
> #if PLATFORM(MAC)
>     self.contentsScale = _devicePixelRatio;
>-    self.colorspace = sRGBColorSpaceRef();
>+    self.colorspace = WebCore::sRGBColorSpaceRef();
> #endif
>     return self;
> }
>diff --git a/Source/WebCore/platform/graphics/metal/GPUCommandQueueMetal.mm b/Source/WebCore/platform/graphics/metal/GPUCommandQueueMetal.mm
>index 820af8bc16db3b4865e79b7b824db2c7b4df3ecc..303b25da3d4a64ed1b0030b72b9fdbc6f965c33d 100644
>--- a/Source/WebCore/platform/graphics/metal/GPUCommandQueueMetal.mm
>+++ b/Source/WebCore/platform/graphics/metal/GPUCommandQueueMetal.mm
>@@ -31,6 +31,7 @@
> #import "GPUDevice.h"
> #import "Logging.h"
> #import <Metal/Metal.h>
>+#import <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/platform/mac/PasteboardMac.mm b/Source/WebCore/platform/mac/PasteboardMac.mm
>index cb504cf543eb7e80d7665cd1e57e3089affb1a70..fd6e9298774faf4fe8735bf27565adc9532bf636 100644
>--- a/Source/WebCore/platform/mac/PasteboardMac.mm
>+++ b/Source/WebCore/platform/mac/PasteboardMac.mm
>@@ -52,10 +52,10 @@ namespace WebCore {
> 
> const char* const WebArchivePboardType = "Apple Web Archive pasteboard type";
> const char* const WebURLNamePboardType = "public.url-name";
>+const char* const WebURLsWithTitlesPboardType = "WebURLsWithTitlesPboardType";
> 
> const char WebSmartPastePboardType[] = "NeXT smart paste pasteboard type";
> const char WebURLPboardType[] = "public.url";
>-const char WebURLsWithTitlesPboardType[] = "WebURLsWithTitlesPboardType";
> 
> static const Vector<String> writableTypesForURL()
> {
>diff --git a/Source/WebCore/platform/mediastream/mac/DisplayCaptureManagerCocoa.cpp b/Source/WebCore/platform/mediastream/mac/DisplayCaptureManagerCocoa.cpp
>index 5c2a9d24198a13e48c4f73e9de61dd37ade92551..f492e6142f0231b997e96ba592795885680933ac 100644
>--- a/Source/WebCore/platform/mediastream/mac/DisplayCaptureManagerCocoa.cpp
>+++ b/Source/WebCore/platform/mediastream/mac/DisplayCaptureManagerCocoa.cpp
>@@ -28,6 +28,7 @@
> 
> #if ENABLE(MEDIA_STREAM)
> 
>+#include "CoreVideoSoftLink.h"
> #include "Logging.h"
> #include <wtf/Algorithms.h>
> #include <wtf/NeverDestroyed.h>
>diff --git a/Source/WebCore/platform/network/ResourceRequestBase.cpp b/Source/WebCore/platform/network/ResourceRequestBase.cpp
>index 25409656c3d632036165fab1dd749e88fca68482..ff5836174eab959528a207bfbaab60039d9b5033 100644
>--- a/Source/WebCore/platform/network/ResourceRequestBase.cpp
>+++ b/Source/WebCore/platform/network/ResourceRequestBase.cpp
>@@ -29,6 +29,7 @@
> #include "HTTPHeaderNames.h"
> #include "PublicSuffix.h"
> #include "ResourceRequest.h"
>+#include "ResourceResponse.h"
> #include "SecurityPolicy.h"
> #include <wtf/PointerComparison.h>
> 
>diff --git a/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp b/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp
>index 29025d38a7fd36ff9b9962391f08087021ff130e..e5321c27d4d968c66e4cd4c677963f5a7d6cadfe 100644
>--- a/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp
>+++ b/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp
>@@ -42,11 +42,7 @@
> #include <wtf/StdLibExtras.h>
> #include <wtf/Threading.h>
> 
>-#if PLATFORM(IOS) && !PLATFORM(IOSMAC)
>-static const SInt32 fnfErr = -43;
>-#elif PLATFORM(MAC)
>-#include <CoreServices/CoreServices.h>
>-#endif
>+static const SInt32 fileNotFoundError = -43;
> 
> #if PLATFORM(COCOA)
> extern "C" void CFURLRequestSetHTTPRequestBody(CFMutableURLRequestRef mutableHTTPRequest, CFDataRef httpBody);
>@@ -241,7 +237,7 @@ static Boolean formOpen(CFReadStreamRef, CFStreamError* error, Boolean* openComp
> #if PLATFORM(WIN)
>         ENOENT;
> #else
>-        fnfErr;
>+        fileNotFoundError;
> #endif
>     return opened;
> }
>diff --git a/Source/WebCore/platform/network/soup/SoupNetworkSession.h b/Source/WebCore/platform/network/soup/SoupNetworkSession.h
>index c63befd2f30f15040177992478e8df4b83790232..d1e9d9ce5b289d14cc6c16593bf4ad067827e53a 100644
>--- a/Source/WebCore/platform/network/soup/SoupNetworkSession.h
>+++ b/Source/WebCore/platform/network/soup/SoupNetworkSession.h
>@@ -26,6 +26,7 @@
> #ifndef SoupNetworkSession_h
> #define SoupNetworkSession_h
> 
>+#include <gio/gio.h>
> #include <glib-object.h>
> #include <pal/SessionID.h>
> #include <wtf/Function.h>
>diff --git a/Source/WebCore/platform/text/TextCodecUTF8.cpp b/Source/WebCore/platform/text/TextCodecUTF8.cpp
>index b318e622bcbe118019a416856333556f1072d79e..21f038bc6d45b468de2aef7467985b4d025dc796 100644
>--- a/Source/WebCore/platform/text/TextCodecUTF8.cpp
>+++ b/Source/WebCore/platform/text/TextCodecUTF8.cpp
>@@ -29,6 +29,7 @@
> #include "TextCodecASCIIFastPath.h"
> #include <wtf/text/CString.h>
> #include <wtf/text/StringBuffer.h>
>+#include <wtf/text/WTFString.h>
> #include <wtf/unicode/CharacterNames.h>
> 
> namespace WebCore {
>diff --git a/Source/WebCore/platform/text/TextCodecUTF8.h b/Source/WebCore/platform/text/TextCodecUTF8.h
>index f8282b5f34a89473de9ad7a21765af6a32acf95c..84f7147e6dc34f2e75156121019baf140e5bc1e5 100644
>--- a/Source/WebCore/platform/text/TextCodecUTF8.h
>+++ b/Source/WebCore/platform/text/TextCodecUTF8.h
>@@ -26,6 +26,7 @@
> #pragma once
> 
> #include "TextCodec.h"
>+#include <unicode/utf8.h>
> #include <wtf/text/LChar.h>
> 
> namespace WebCore {
>diff --git a/Source/WebCore/rendering/updating/RenderTreeBuilderBlockFlow.cpp b/Source/WebCore/rendering/updating/RenderTreeBuilderBlockFlow.cpp
>index 3bc82c6e1abd2fac43b099c8e6e3ccf366dd853b..2c2b508fac5c6fc846285c9ffa895a7b4022b8ea 100644
>--- a/Source/WebCore/rendering/updating/RenderTreeBuilderBlockFlow.cpp
>+++ b/Source/WebCore/rendering/updating/RenderTreeBuilderBlockFlow.cpp
>@@ -27,6 +27,8 @@
> #include "RenderTreeBuilderBlockFlow.h"
> 
> #include "RenderMultiColumnFlow.h"
>+#include "RenderTreeBuilderBlock.h"
>+#include "RenderTreeBuilderMultiColumn.h"
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/rendering/updating/RenderTreeBuilderFormControls.cpp b/Source/WebCore/rendering/updating/RenderTreeBuilderFormControls.cpp
>index 827c8bb0172804d26161b64363c6355b27b8eab1..99c574784370a83a6451c1cb2a4acb2a9c4c936d 100644
>--- a/Source/WebCore/rendering/updating/RenderTreeBuilderFormControls.cpp
>+++ b/Source/WebCore/rendering/updating/RenderTreeBuilderFormControls.cpp
>@@ -28,6 +28,7 @@
> 
> #include "RenderButton.h"
> #include "RenderMenuList.h"
>+#include "RenderTreeBuilderBlock.h"
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/rendering/updating/RenderTreeBuilderInline.cpp b/Source/WebCore/rendering/updating/RenderTreeBuilderInline.cpp
>index 7cd0715df524a76fd206a23428d9dac7d7d853f8..ee639d9fbb2b98f6820d8a3df51c27ea022a331a 100644
>--- a/Source/WebCore/rendering/updating/RenderTreeBuilderInline.cpp
>+++ b/Source/WebCore/rendering/updating/RenderTreeBuilderInline.cpp
>@@ -30,6 +30,8 @@
> #include "RenderFullScreen.h"
> #include "RenderInline.h"
> #include "RenderTable.h"
>+#include "RenderTreeBuilderMultiColumn.h"
>+#include "RenderTreeBuilderTable.h"
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp b/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp
>index 7ac19bac5bbc8dd9cc624baa41d9c89c71d11a88..ac1245dc925d9c09dcc17c3025d32141dd97762c 100644
>--- a/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp
>+++ b/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp
>@@ -26,6 +26,7 @@
> #include "config.h"
> #include "RenderTreeBuilderRuby.h"
> 
>+#include "RenderAncestorIterator.h"
> #include "RenderRuby.h"
> #include "RenderRubyBase.h"
> #include "RenderRubyRun.h"
>diff --git a/Source/WebCore/rendering/updating/RenderTreeUpdater.cpp b/Source/WebCore/rendering/updating/RenderTreeUpdater.cpp
>index 7d76af942746175eb9a2c59e71a97124ffc0da24..65226a0551e5f1ee4a8348becd935e3bb400a071 100644
>--- a/Source/WebCore/rendering/updating/RenderTreeUpdater.cpp
>+++ b/Source/WebCore/rendering/updating/RenderTreeUpdater.cpp
>@@ -41,6 +41,8 @@
> #include "RenderDescendantIterator.h"
> #include "RenderFullScreen.h"
> #include "RenderInline.h"
>+#include "RenderMultiColumnFlow.h"
>+#include "RenderMultiColumnSet.h"
> #include "RenderTreeUpdaterGeneratedContent.h"
> #include "RuntimeEnabledFeatures.h"
> #include "StyleResolver.h"
>diff --git a/Source/WebKit/Shared/APIWebArchive.mm b/Source/WebKit/Shared/APIWebArchive.mm
>index b1742fdfdd3869eadd3d7c5aee705e661f97eedc..b8c972f7ec18eb7d4c9a71de2b4e1e2c65de8766 100644
>--- a/Source/WebKit/Shared/APIWebArchive.mm
>+++ b/Source/WebKit/Shared/APIWebArchive.mm
>@@ -34,9 +34,8 @@
> #include <WebCore/LegacyWebArchive.h>
> #include <wtf/RetainPtr.h>
> 
>-using namespace WebCore;
>-
> namespace API {
>+using namespace WebCore;
> 
> Ref<WebArchive> WebArchive::create(WebArchiveResource* mainResource, RefPtr<API::Array>&& subresources, RefPtr<API::Array>&& subframeArchives)
> {
>diff --git a/Source/WebKit/Shared/APIWebArchiveResource.mm b/Source/WebKit/Shared/APIWebArchiveResource.mm
>index cae5b85df177ddde68d852e5e506d8d92be2ea94..dc0f90f0f3851abf100484ba573ae4af8e80b232 100644
>--- a/Source/WebKit/Shared/APIWebArchiveResource.mm
>+++ b/Source/WebKit/Shared/APIWebArchiveResource.mm
>@@ -33,9 +33,8 @@
> #include <WebCore/URL.h>
> #include <wtf/RetainPtr.h>
> 
>-using namespace WebCore;
>-
> namespace API {
>+using namespace WebCore;
> 
> Ref<WebArchiveResource> WebArchiveResource::create(API::Data* data, const String& URL, const String& MIMEType, const String& textEncoding)
> {
>diff --git a/Source/WebKit/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm b/Source/WebKit/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
>index 68d7c6adf36275131296356286f11e849c14c2c0..c0ccac59853cfaffd9ff1d1e3d68b67d6457f7c7 100644
>--- a/Source/WebKit/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
>+++ b/Source/WebKit/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
>@@ -34,9 +34,8 @@
> #import <wtf/MainThread.h>
> #import <wtf/spi/cf/CFBundleSPI.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
> 
> static bool getPluginArchitecture(CFBundleRef bundle, PluginModuleInfo& plugin)
> {
>diff --git a/Source/WebKit/Shared/Plugins/Netscape/mac/PluginInformationMac.mm b/Source/WebKit/Shared/Plugins/Netscape/mac/PluginInformationMac.mm
>index 5ec8424959cbc192886fa75abf03f3d885bcb1d9..32584d416be0ff25e9e91ddf42870e3394f49366 100644
>--- a/Source/WebKit/Shared/Plugins/Netscape/mac/PluginInformationMac.mm
>+++ b/Source/WebKit/Shared/Plugins/Netscape/mac/PluginInformationMac.mm
>@@ -34,9 +34,8 @@
> #import "StringUtilities.h"
> #import <WebCore/PluginBlacklist.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
> 
> void getPlatformPluginModuleInformation(const PluginModuleInfo& plugin, API::Dictionary::MapType& map)
> {
>diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt
>index d8a3c90dffe322322d763ee21e7cba450fe85fcf..4b8d4806b44f2204658577eb7a9678cb8e3479bf 100644
>--- a/Source/WebKit/SourcesCocoa.txt
>+++ b/Source/WebKit/SourcesCocoa.txt
>@@ -298,9 +298,9 @@ UIProcess/API/mac/WKView.mm @no-unify
> 
> UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm
> 
>-UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm
>+UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm @no-unify
> 
>-UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm
>+UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm @no-unify
> 
> UIProcess/Authentication/cocoa/AuthenticationChallengeProxyCocoa.mm
> UIProcess/Authentication/cocoa/SecKeyProxyStore.mm
>diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt
>index a2dc5c98002b35f7f9ad568650dca1d5e63a9890..442996d91bf2ef628f6e4ccf706d8e133689e469 100644
>--- a/Source/WebKit/SourcesGTK.txt
>+++ b/Source/WebKit/SourcesGTK.txt
>@@ -207,16 +207,16 @@ UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.cpp
> 
> UIProcess/linux/MemoryPressureMonitor.cpp
> 
>-UIProcess/Plugins/gtk/PluginInfoCache.cpp
>+UIProcess/Plugins/gtk/PluginInfoCache.cpp @no-unify
> 
>-UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
>+UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp @no-unify
> UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp @no-unify
> 
> UIProcess/WebStorage/StorageManager.cpp
> 
> UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp
> 
>-UIProcess/cairo/BackingStoreCairo.cpp
>+UIProcess/cairo/BackingStoreCairo.cpp @no-unify
> 
> UIProcess/glib/RemoteInspectorClient.cpp
> 
>@@ -229,16 +229,16 @@ UIProcess/gtk/AcceleratedBackingStoreX11.cpp @no-unify
> UIProcess/gtk/DragAndDropHandler.cpp
> UIProcess/gtk/GestureController.cpp
> UIProcess/gtk/HardwareAccelerationManager.cpp
>-UIProcess/gtk/InputMethodFilter.cpp
>+UIProcess/gtk/InputMethodFilter.cpp @no-unify
> UIProcess/gtk/KeyBindingTranslator.cpp
> UIProcess/gtk/RemoteWebInspectorProxyGtk.cpp @no-unify
> UIProcess/gtk/TextCheckerGtk.cpp @no-unify
> UIProcess/gtk/WaylandCompositor.cpp @no-unify
>-UIProcess/gtk/WebColorPickerGtk.cpp
>+UIProcess/gtk/WebColorPickerGtk.cpp @no-unify
> UIProcess/gtk/WebContextMenuProxyGtk.cpp
> UIProcess/gtk/WebInspectorProxyGtk.cpp
> UIProcess/gtk/WebKitInspectorWindow.cpp
>-UIProcess/gtk/WebPageProxyGtk.cpp
>+UIProcess/gtk/WebPageProxyGtk.cpp @no-unify
> UIProcess/gtk/WebPasteboardProxyGtk.cpp
> UIProcess/gtk/WebPopupMenuProxyGtk.cpp
> UIProcess/gtk/WebPreferencesGtk.cpp
>diff --git a/Source/WebKit/UIProcess/API/APIAutomationSessionClient.h b/Source/WebKit/UIProcess/API/APIAutomationSessionClient.h
>index bfc5ee338220d9156fccf00c1e76d0bbee904190..379c8857be94b619555edffec4c3a9a6e1779484 100644
>--- a/Source/WebKit/UIProcess/API/APIAutomationSessionClient.h
>+++ b/Source/WebKit/UIProcess/API/APIAutomationSessionClient.h
>@@ -51,7 +51,7 @@ public:
> 
>     virtual ~AutomationSessionClient() { }
> 
>-    virtual String sessionIdentifier() const { return String(); }
>+    virtual WTF::String sessionIdentifier() const { return WTF::String(); }
>     virtual void didDisconnectFromRemote(WebKit::WebAutomationSession&) { }
>     virtual void requestNewPageWithOptions(WebKit::WebAutomationSession&, AutomationSessionBrowsingContextOptions, CompletionHandler<void(WebKit::WebPageProxy*)>&& completionHandler) { completionHandler(nullptr); }
>     virtual void requestMaximizeWindowOfPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&, CompletionHandler<void()>&& completionHandler) { completionHandler(); }
>@@ -61,8 +61,8 @@ public:
>     virtual bool isShowingJavaScriptDialogOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&) { return false; }
>     virtual void dismissCurrentJavaScriptDialogOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&) { }
>     virtual void acceptCurrentJavaScriptDialogOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&) { }
>-    virtual String messageOfCurrentJavaScriptDialogOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&) { return String(); }
>-    virtual void setUserInputForCurrentJavaScriptPromptOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&, const String&) { }
>+    virtual WTF::String messageOfCurrentJavaScriptDialogOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&) { return WTF::String(); }
>+    virtual void setUserInputForCurrentJavaScriptPromptOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&, const WTF::String&) { }
>     virtual std::optional<JavaScriptDialogType> typeOfCurrentJavaScriptDialogOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&) { return std::nullopt; }
> };
> 
>diff --git a/Source/WebKit/UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm b/Source/WebKit/UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm
>index 11ba37265483ffe7ff24650940d8f33a52c0c04a..19a59b42cab7b547ed94460e72fc0396cfe79287 100644
>--- a/Source/WebKit/UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm
>+++ b/Source/WebKit/UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm
>@@ -32,23 +32,20 @@
> #import <WebCore/ResourceRequest.h>
> #import <WebCore/ResourceResponse.h>
> 
>-using namespace WebCore;
>-using namespace WebKit;
>-
> @interface WKCustomProtocolLoader : NSObject <NSURLConnectionDelegate> {
> @private
>-    LegacyCustomProtocolManagerProxy* _customProtocolManagerProxy;
>+    WebKit::LegacyCustomProtocolManagerProxy* _customProtocolManagerProxy;
>     uint64_t _customProtocolID;
>     NSURLCacheStoragePolicy _storagePolicy;
>     NSURLConnection *_urlConnection;
> }
>-- (id)initWithLegacyCustomProtocolManagerProxy:(LegacyCustomProtocolManagerProxy*)customProtocolManagerProxy customProtocolID:(uint64_t)customProtocolID request:(NSURLRequest *)request;
>+- (id)initWithLegacyCustomProtocolManagerProxy:(WebKit::LegacyCustomProtocolManagerProxy*)customProtocolManagerProxy customProtocolID:(uint64_t)customProtocolID request:(NSURLRequest *)request;
> - (void)customProtocolManagerProxyDestroyed;
> @end
> 
> @implementation WKCustomProtocolLoader
> 
>-- (id)initWithLegacyCustomProtocolManagerProxy:(LegacyCustomProtocolManagerProxy*)customProtocolManagerProxy customProtocolID:(uint64_t)customProtocolID request:(NSURLRequest *)request
>+- (id)initWithLegacyCustomProtocolManagerProxy:(WebKit::LegacyCustomProtocolManagerProxy*)customProtocolManagerProxy customProtocolID:(uint64_t)customProtocolID request:(NSURLRequest *)request
> {
>     self = [super init];
>     if (!self)
>@@ -85,7 +82,7 @@ - (void)customProtocolManagerProxyDestroyed
> 
> - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
> {
>-    ResourceError coreError(error);
>+    WebCore::ResourceError coreError(error);
>     _customProtocolManagerProxy->didFailWithError(_customProtocolID, coreError);
>     _customProtocolManagerProxy->stopLoading(_customProtocolID);
> }
>@@ -99,7 +96,7 @@ - (NSCachedURLResponse *)connection:(NSURLConnection *)connection willCacheRespo
> 
> - (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response
> {
>-    ResourceResponse coreResponse(response);
>+    WebCore::ResourceResponse coreResponse(response);
>     _customProtocolManagerProxy->didReceiveResponse(_customProtocolID, coreResponse, _storagePolicy);
> }
> 
>@@ -127,6 +124,7 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection
> @end
> 
> namespace WebKit {
>+using namespace WebCore;
> 
> void LegacyCustomProtocolManagerClient::startLoading(LegacyCustomProtocolManagerProxy& manager, uint64_t customProtocolID, const ResourceRequest& coreRequest)
> {
>diff --git a/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp b/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp
>index c2b91a63973e63120aae528f8975385f7b6dbf62..eded9c7d2a4e58e3d058d8326831098182af4476 100644
>--- a/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp
>+++ b/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp
>@@ -48,7 +48,7 @@ static const Seconds snapshottingMinimumLifetime { 30_s };
> static const Seconds shutdownTimeout { 1_min };
> static const Seconds snapshottingShutdownTimeout { 15_s };
> 
>-static uint64_t generateCallbackID()
>+static uint64_t generatePluginProcessCallbackID()
> {
>     static uint64_t callbackID;
> 
>@@ -114,7 +114,7 @@ void PluginProcessProxy::getPluginProcessConnection(Messages::WebProcessProxy::G
> 
> void PluginProcessProxy::fetchWebsiteData(CompletionHandler<void (Vector<String>)>&& completionHandler)
> {
>-    uint64_t callbackID = generateCallbackID();
>+    uint64_t callbackID = generatePluginProcessCallbackID();
>     m_pendingFetchWebsiteDataCallbacks.set(callbackID, WTFMove(completionHandler));
> 
>     if (state() == State::Launching) {
>@@ -127,7 +127,7 @@ void PluginProcessProxy::fetchWebsiteData(CompletionHandler<void (Vector<String>
> 
> void PluginProcessProxy::deleteWebsiteData(WallTime modifiedSince, CompletionHandler<void ()>&& completionHandler)
> {
>-    uint64_t callbackID = generateCallbackID();
>+    uint64_t callbackID = generatePluginProcessCallbackID();
>     m_pendingDeleteWebsiteDataCallbacks.set(callbackID, WTFMove(completionHandler));
> 
>     if (state() == State::Launching) {
>@@ -140,7 +140,7 @@ void PluginProcessProxy::deleteWebsiteData(WallTime modifiedSince, CompletionHan
> 
> void PluginProcessProxy::deleteWebsiteDataForHostNames(const Vector<String>& hostNames, CompletionHandler<void ()>&& completionHandler)
> {
>-    uint64_t callbackID = generateCallbackID();
>+    uint64_t callbackID = generatePluginProcessCallbackID();
>     m_pendingDeleteWebsiteDataForHostNamesCallbacks.set(callbackID, WTFMove(completionHandler));
> 
>     if (state() == State::Launching) {
>diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm b/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm
>index 4a2e29b560961a59b1cb55197839149c310684c2..72a882f0581d5eac91fc14bc05a02f144f16c11d 100644
>--- a/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm
>+++ b/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm
>@@ -43,8 +43,6 @@
> #import <WebCore/ScrollSnapOffsetsInfo.h>
> #endif
> 
>-using namespace WebCore;
>-
> @implementation WKScrollingNodeScrollViewDelegate
> 
> - (instancetype)initWithScrollingTreeNodeDelegate:(WebKit::ScrollingTreeScrollingNodeDelegateIOS*)delegate
>@@ -80,7 +78,7 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoi
> 
>     if (!_scrollingTreeNodeDelegate->scrollingNode().horizontalSnapOffsets().isEmpty()) {
>         unsigned index;
>-        float potentialSnapPosition = closestSnapOffset(_scrollingTreeNodeDelegate->scrollingNode().horizontalSnapOffsets(), _scrollingTreeNodeDelegate->scrollingNode().horizontalSnapOffsetRanges(), horizontalTarget, velocity.x, index);
>+        float potentialSnapPosition = WebCore::closestSnapOffset(_scrollingTreeNodeDelegate->scrollingNode().horizontalSnapOffsets(), _scrollingTreeNodeDelegate->scrollingNode().horizontalSnapOffsetRanges(), horizontalTarget, velocity.x, index);
>         _scrollingTreeNodeDelegate->scrollingNode().setCurrentHorizontalSnapPointIndex(index);
>         if (horizontalTarget >= 0 && horizontalTarget <= scrollView.contentSize.width)
>             targetContentOffset->x = potentialSnapPosition;
>@@ -88,7 +86,7 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoi
> 
>     if (!_scrollingTreeNodeDelegate->scrollingNode().verticalSnapOffsets().isEmpty()) {
>         unsigned index;
>-        float potentialSnapPosition = closestSnapOffset(_scrollingTreeNodeDelegate->scrollingNode().verticalSnapOffsets(), _scrollingTreeNodeDelegate->scrollingNode().verticalSnapOffsetRanges(), verticalTarget, velocity.y, index);
>+        float potentialSnapPosition = WebCore::closestSnapOffset(_scrollingTreeNodeDelegate->scrollingNode().verticalSnapOffsets(), _scrollingTreeNodeDelegate->scrollingNode().verticalSnapOffsetRanges(), verticalTarget, velocity.y, index);
>         _scrollingTreeNodeDelegate->scrollingNode().setCurrentVerticalSnapPointIndex(index);
>         if (verticalTarget >= 0 && verticalTarget <= scrollView.contentSize.height)
>             targetContentOffset->y = potentialSnapPosition;
>@@ -122,6 +120,7 @@ - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
> @end
> 
> namespace WebKit {
>+using namespace WebCore;
> 
> ScrollingTreeScrollingNodeDelegateIOS::ScrollingTreeScrollingNodeDelegateIOS(ScrollingTreeScrollingNode& scrollingNode)
>     : ScrollingTreeScrollingNodeDelegate(scrollingNode)
>diff --git a/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp b/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp
>index efa8d13cbbd5ffa808b5f0edbf4a51dc9df857e7..3a131b4d60d8aa07e87fb5e4c614f30a7d42b574 100644
>--- a/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp
>+++ b/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp
>@@ -37,7 +37,7 @@
> namespace WebKit {
> using namespace WebCore;
> 
>-static uint64_t generateCallbackID()
>+static uint64_t generateStorageProcessCallbackID()
> {
>     static uint64_t callbackID;
> 
>@@ -105,7 +105,7 @@ void StorageProcessProxy::fetchWebsiteData(PAL::SessionID sessionID, OptionSet<W
> {
>     ASSERT(canSendMessage());
> 
>-    uint64_t callbackID = generateCallbackID();
>+    uint64_t callbackID = generateStorageProcessCallbackID();
>     m_pendingFetchWebsiteDataCallbacks.add(callbackID, WTFMove(completionHandler));
> 
>     send(Messages::StorageProcess::FetchWebsiteData(sessionID, dataTypes, callbackID), 0);
>@@ -113,7 +113,7 @@ void StorageProcessProxy::fetchWebsiteData(PAL::SessionID sessionID, OptionSet<W
> 
> void StorageProcessProxy::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, WallTime modifiedSince, CompletionHandler<void ()>&& completionHandler)
> {
>-    auto callbackID = generateCallbackID();
>+    auto callbackID = generateStorageProcessCallbackID();
> 
>     m_pendingDeleteWebsiteDataCallbacks.add(callbackID, WTFMove(completionHandler));
>     send(Messages::StorageProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0);
>@@ -123,7 +123,7 @@ void StorageProcessProxy::deleteWebsiteDataForOrigins(PAL::SessionID sessionID,
> {
>     ASSERT(canSendMessage());
> 
>-    uint64_t callbackID = generateCallbackID();
>+    uint64_t callbackID = generateStorageProcessCallbackID();
>     m_pendingDeleteWebsiteDataForOriginsCallbacks.add(callbackID, WTFMove(completionHandler));
> 
>     send(Messages::StorageProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, origins, callbackID), 0);
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
>index da0581db9af6d16188f16e67f3ab514de0a4983a..7be539858596bf153da70ed08d2e2212ac639879 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.h
>+++ b/Source/WebKit/UIProcess/WebPageProxy.h
>@@ -62,7 +62,6 @@
> #include "WebPageInjectedBundleClient.h"
> #include "WebPaymentCoordinatorProxy.h"
> #include "WebPreferences.h"
>-#include <WebCore/AlternativeTextClient.h> // FIXME: Needed by WebPageProxyMessages.h for DICTATION_ALTERNATIVES.
> #include "WebPageProxyMessages.h"
> #include "WebPopupMenuProxy.h"
> #include "WebProcessLifetimeTracker.h"
>diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>index 94c9b1ff484d1d2ecc03d4c31f4b0beaadd7daaf..938443b102c9c7a2b34858560bb0848f477b6849 100644
>--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>@@ -759,6 +759,8 @@
> 		2D92A795212B6AD400F493FD /* PluginProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D90D11281C966001EB962 /* PluginProcessCreationParameters.cpp */; };
> 		2D92A796212B6ADA00F493FD /* NetscapePluginModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A4A9C5312B816CF008FE984 /* NetscapePluginModule.cpp */; };
> 		2D92A797212B6ADA00F493FD /* PluginInformation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C3F8C8E173AF52D007B7F39 /* PluginInformation.cpp */; };
>+		2D92A79821348D8500F493FD /* WebPaymentCoordinatorProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1F77D1D1B30A9007C9BD1 /* WebPaymentCoordinatorProxyMac.mm */; };
>+		2D92A79F2134B07E00F493FD /* WebPaymentCoordinatorProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1F77B1D1B30A9007C9BD1 /* WebPaymentCoordinatorProxyIOS.mm */; };
> 		2D931169212F61B200044BFE /* WKContentView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E3D18BBE044000FCFC9 /* WKContentView.mm */; };
> 		2D93116A212F61B500044BFE /* WKContentViewInteraction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E6B18BBF26A000FCFC9 /* WKContentViewInteraction.mm */; };
> 		2D9EA30D1A96CB59002D2807 /* WKPageInjectedBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9EA30C1A96CB59002D2807 /* WKPageInjectedBundleClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -11248,6 +11250,8 @@
> 				7CE9CE101FA0767A000177DE /* WebPageUpdatePreferences.cpp in Sources */,
> 				7C4694C91A4B4EA100AD5845 /* WebPasteboardProxyMessageReceiver.cpp in Sources */,
> 				1AB1F7961D1B3613007C9BD1 /* WebPaymentCoordinatorMessageReceiver.cpp in Sources */,
>+				2D92A79F2134B07E00F493FD /* WebPaymentCoordinatorProxyIOS.mm in Sources */,
>+				2D92A79821348D8500F493FD /* WebPaymentCoordinatorProxyMac.mm in Sources */,
> 				1AB1F7981D1B3613007C9BD1 /* WebPaymentCoordinatorProxyMessageReceiver.cpp in Sources */,
> 				2D92A78D212B6AB100F493FD /* WebPlatformTouchPoint.cpp in Sources */,
> 				2D91344E212CF9F000128AFD /* WebPluginInfoProvider.cpp in Sources */,
>diff --git a/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm b/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm
>index 5307e26a7637e8a69b045abb92879f3f8c6586f2..4caa6cc0f60450c03b22a284dd13af25efd6e386 100644
>--- a/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm
>+++ b/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm
>@@ -88,8 +88,6 @@
> #import <pal/spi/mac/NSMenuSPI.h>
> #import <wtf/UUID.h>
> 
>-using namespace WebCore;
>-
> // Set overflow: hidden on the annotation container so <input> elements scrolled out of view don't show
> // scrollbars on the body. We can't add annotations directly to the body, because overflow: hidden on the body
> // will break rubber-banding.
>@@ -290,7 +288,7 @@ - (NSArray *)accessibilityActionNames
> - (void)accessibilityPerformAction:(NSString *)action
> {
>     if ([action isEqualToString:NSAccessibilityShowMenuAction])
>-        _pdfPlugin->showContextMenuAtPoint(IntRect(IntPoint(), _pdfPlugin->size()).center());
>+        _pdfPlugin->showContextMenuAtPoint(WebCore::IntRect(WebCore::IntPoint(), _pdfPlugin->size()).center());
> }
> 
> - (BOOL)accessibilityIsAttributeSettable:(NSString *)attribute
>@@ -316,8 +314,8 @@ - (id)accessibilityFocusedUIElement
> {
> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
>     if (WebKit::PDFPluginAnnotation* activeAnnotation = _pdfPlugin->activeAnnotation()) {
>-        if (AXObjectCache* existingCache = _pdfPlugin->axObjectCache()) {
>-            if (AccessibilityObject* object = existingCache->getOrCreate(activeAnnotation->element()))
>+        if (WebCore::AXObjectCache* existingCache = _pdfPlugin->axObjectCache()) {
>+            if (WebCore::AccessibilityObject* object = existingCache->getOrCreate(activeAnnotation->element()))
> #pragma clang diagnostic push
> #pragma clang diagnostic ignored "-Wdeprecated-declarations"
>                 return [object->wrapper() accessibilityAttributeValue:@"_AXAssociatedPluginParent"];
>@@ -338,11 +336,11 @@ - (id)accessibilityAssociatedControlForAnnotation:(PDFAnnotation *)annotation
>     if (!activeAnnotation || ![activeAnnotation->annotation() isEqual:annotation])
>         return nil;
>     
>-    AXObjectCache* cache = _pdfPlugin->axObjectCache();
>+    WebCore::AXObjectCache* cache = _pdfPlugin->axObjectCache();
>     if (!cache)
>         return nil;
>     
>-    AccessibilityObject* object = cache->getOrCreate(activeAnnotation->element());
>+    WebCore::AccessibilityObject* object = cache->getOrCreate(activeAnnotation->element());
>     if (!object)
>         return nil;
> 
>@@ -353,7 +351,7 @@ - (id)accessibilityAssociatedControlForAnnotation:(PDFAnnotation *)annotation
> - (id)accessibilityHitTest:(NSPoint)point
> {
> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
>-    point = _pdfPlugin->convertFromRootViewToPDFView(IntPoint(point));
>+    point = _pdfPlugin->convertFromRootViewToPDFView(WebCore::IntPoint(point));
>     return [_pdfLayerController accessibilityHitTest:point];
> #else
>     return self;
>@@ -421,7 +419,7 @@ - (id)initWithPDFPlugin:(WebKit::PDFPlugin *)plugin
> 
> - (void)updateScrollPosition:(CGPoint)newPosition
> {
>-    _pdfPlugin->notifyScrollPositionChanged(IntPoint(newPosition));
>+    _pdfPlugin->notifyScrollPositionChanged(WebCore::IntPoint(newPosition));
> }
> 
> - (void)writeItemsToPasteboard:(NSArray *)items withTypes:(NSArray *)types
>@@ -500,6 +498,10 @@ - (NSRect)convertRect:(NSRect)rect fromPage:(PDFPage *) page forScaleFactor:(CGF
> - (PDFPage *)pageNearestPoint:(NSPoint)point currentPage:(PDFPage *)currentPage;
> @end
> 
>+namespace WebKit {
>+using namespace WebCore;
>+using namespace HTMLNames;
>+
> static const char* postScriptMIMEType = "application/postscript";
> const uint64_t pdfDocumentRequestID = 1; // PluginController supports loading multiple streams, but we only need one for PDF.
> 
>@@ -596,9 +598,6 @@ static void getAllScriptsInPDFDocument(CGPDFDocumentRef pdfDocument, Vector<Reta
>     }
> }
> 
>-namespace WebKit {
>-using namespace HTMLNames;
>-
> Ref<PDFPlugin> PDFPlugin::create(WebFrame& frame)
> {
>     return adoptRef(*new PDFPlugin(frame));
>@@ -1450,7 +1449,7 @@ void PDFPlugin::updateCursor(const WebMouseEvent& event, UpdateCursorMode mode)
>     if (hitTestResult == m_lastHitTestResult && mode == UpdateIfNeeded)
>         return;
> 
>-    webFrame()->page()->send(Messages::WebPageProxy::SetCursor(hitTestResult == Text ? iBeamCursor() : pointerCursor()));
>+    webFrame()->page()->send(Messages::WebPageProxy::SetCursor(hitTestResult == Text ? WebCore::iBeamCursor() : WebCore::pointerCursor()));
>     m_lastHitTestResult = hitTestResult;
> }
> #endif
>@@ -1981,16 +1980,16 @@ void PDFPlugin::notifySelectionChanged(PDFSelection *)
>     webFrame()->page()->didChangeSelection();
> }
> 
>-static const Cursor& coreCursor(PDFLayerControllerCursorType type)
>+static const WebCore::Cursor& coreCursor(PDFLayerControllerCursorType type)
> {
>     switch (type) {
>     case kPDFLayerControllerCursorTypeHand:
>-        return handCursor();
>+        return WebCore::handCursor();
>     case kPDFLayerControllerCursorTypeIBeam:
>-        return iBeamCursor();
>+        return WebCore::iBeamCursor();
>     case kPDFLayerControllerCursorTypePointer:
>     default:
>-        return pointerCursor();
>+        return WebCore::pointerCursor();
>     }
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 189009: 348203 | 348211 | 348212 | 348213 | 348214 | 348215 | 348222 | 348228 | 348233 | 348234 | 348238 | 348245 | 348248 | 348250 | 348252 | 348254 | 348259 | 348261 | 348263 | 348264 | 348311 | 348314 | 348324 | 348474 | 348522 | 348525