diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 66e08e403c..65f9895628 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1702 -Changed: yurys@chromium.org Tue 16 Aug 2022 11:54:22 AM PDT +1703 +Changed: dpino@igalia.com Wed Aug 17 00:22:26 CEST 2022 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 9bb00a2817..18579e43a8 100644 --- a/browser_patches/webkit/UPSTREAM_CONFIG.sh +++ b/browser_patches/webkit/UPSTREAM_CONFIG.sh @@ -1,3 +1,3 @@ REMOTE_URL="https://github.com/WebKit/WebKit.git" BASE_BRANCH="main" -BASE_REVISION="f6b396ad7232f2f99822cfd5573cdc1798aa52d8" +BASE_REVISION="7db2194055b8957ce3f325a9f6823f38d156cc48" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 008a600429..dee9ace478 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -2110,7 +2110,7 @@ index 909094b0ff2cc7273f3d4ac96cf4498f0d0c6e50..51958e6eba239952f834978515b6a3c7 type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index de3041001872b2bd86e8acc5157351a8695d4fde..577541e04e82b8c187f559c7fb4670208d81af62 100644 +index 8e180a9913870eeabba0960fb3eea2aca92bbdfc..be52610f76b05af1cf86a195a2e042909bd276dd 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -527,7 +527,7 @@ CrossOriginOpenerPolicyEnabled: @@ -2154,7 +2154,7 @@ index de3041001872b2bd86e8acc5157351a8695d4fde..577541e04e82b8c187f559c7fb467020 # FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well. MediaCapabilitiesExtensionsEnabled: -@@ -1426,7 +1427,7 @@ SpeechRecognitionEnabled: +@@ -1438,7 +1439,7 @@ SpeechRecognitionEnabled: WebKitLegacy: default: false WebKit: @@ -2163,7 +2163,7 @@ index de3041001872b2bd86e8acc5157351a8695d4fde..577541e04e82b8c187f559c7fb467020 default: false WebCore: default: false -@@ -1541,6 +1542,7 @@ UseGPUProcessForDisplayCapture: +@@ -1553,6 +1554,7 @@ UseGPUProcessForDisplayCapture: WebKit: default: true @@ -2171,7 +2171,7 @@ index de3041001872b2bd86e8acc5157351a8695d4fde..577541e04e82b8c187f559c7fb467020 UseGPUProcessForWebGLEnabled: type: bool humanReadableName: "GPU Process: WebGL" -@@ -1551,7 +1553,7 @@ UseGPUProcessForWebGLEnabled: +@@ -1563,7 +1565,7 @@ UseGPUProcessForWebGLEnabled: default: false WebKit: "ENABLE(GPU_PROCESS_BY_DEFAULT) && PLATFORM(IOS_FAMILY) && !HAVE(UIKIT_WEBKIT_INTERNALS)": true @@ -2237,7 +2237,7 @@ index a7a9a06cb94a14616127b6accebeb9fb106c9699..54fc2622b16096695624a24f044f73ca #endif diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index fa513aab24baa6e1ab21a84071dfe36c195eb7db..3d51ec86d65925654358beafd68b9a15266de750 100644 +index 17ef2b99a00c53e854210ad488369ad232944c5e..59a4dfb0b80a6f8d30ec361b2dbde8e5e2bf3c3d 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -422,7 +422,7 @@ @@ -2260,10 +2260,10 @@ index fa513aab24baa6e1ab21a84071dfe36c195eb7db..3d51ec86d65925654358beafd68b9a15 #if (!defined(HAVE_LOCKDOWN_MODE_PDF_ADDITIONS) && \ diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index c4f8f4d1bb0d89ec6b63e6c835978acbd7ca7318..692f1c192df071af7a834348d827344f957dd57d 100644 +index 818de728babd72eab591b6c29243a62eb66e5192..ed532edaa08fd4d4f2814b82d358e4c69124da10 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make -@@ -989,6 +989,10 @@ JS_BINDING_IDLS := \ +@@ -994,6 +994,10 @@ JS_BINDING_IDLS := \ $(WebCore)/dom/Slotable.idl \ $(WebCore)/dom/StaticRange.idl \ $(WebCore)/dom/StringCallback.idl \ @@ -2274,7 +2274,7 @@ index c4f8f4d1bb0d89ec6b63e6c835978acbd7ca7318..692f1c192df071af7a834348d827344f $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1537,9 +1541,6 @@ JS_BINDING_IDLS := \ +@@ -1542,9 +1546,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -2434,10 +2434,10 @@ index a5938677622935e2c6ca3ed76c3a12d0eb7e04a7..cea2a0e330cfdf01b172b3f6acc60acb __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index eb2ab5326ed7266f8e8ae1b121f7f7106870120d..4654a9417088220fa6e0b0bcbaa5a45f7eddd312 100644 +index 2326514b9a201dce8dbe41a03fb7fdc4ff3ebc37..ad96db9efce294a9f462a7ef83a2acbf219ae334 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5586,6 +5586,13 @@ +@@ -5589,6 +5589,13 @@ EDE3A5000C7A430600956A37 /* ColorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE3A4FF0C7A430600956A37 /* ColorMac.h */; settings = {ATTRIBUTES = (Private, ); }; }; EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEC98020AED7E170059137F /* WebCorePrefix.h */; }; EFCC6C8F20FE914400A2321B /* CanvasActivityRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -2451,7 +2451,7 @@ index eb2ab5326ed7266f8e8ae1b121f7f7106870120d..4654a9417088220fa6e0b0bcbaa5a45f F12171F616A8CF0B000053CA /* WebVTTElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F12171F416A8BC63000053CA /* WebVTTElement.h */; }; F32BDCD92363AACA0073B6AE /* UserGestureEmulationScope.h in Headers */ = {isa = PBXBuildFile; fileRef = F32BDCD72363AACA0073B6AE /* UserGestureEmulationScope.h */; }; F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */ = {isa = PBXBuildFile; fileRef = F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */; settings = {ATTRIBUTES = (Private, ); }; }; -@@ -18066,6 +18073,14 @@ +@@ -18089,6 +18096,14 @@ EDEC98020AED7E170059137F /* WebCorePrefix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCorePrefix.h; sourceTree = ""; tabWidth = 4; usesTabs = 0; }; EFB7287B2124C73D005C2558 /* CanvasActivityRecord.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CanvasActivityRecord.cpp; sourceTree = ""; }; EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanvasActivityRecord.h; sourceTree = ""; }; @@ -2466,7 +2466,7 @@ index eb2ab5326ed7266f8e8ae1b121f7f7106870120d..4654a9417088220fa6e0b0bcbaa5a45f F12171F316A8BC63000053CA /* WebVTTElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebVTTElement.cpp; sourceTree = ""; }; F12171F416A8BC63000053CA /* WebVTTElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVTTElement.h; sourceTree = ""; }; F32BDCD52363AAC90073B6AE /* UserGestureEmulationScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserGestureEmulationScope.cpp; sourceTree = ""; }; -@@ -24801,6 +24816,11 @@ +@@ -24827,6 +24842,11 @@ BC4A5324256055590028C592 /* TextDirectionSubmenuInclusionBehavior.h */, 2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */, 2D4F96F21A1ECC240098BF88 /* TextIndicator.h */, @@ -2478,7 +2478,7 @@ index eb2ab5326ed7266f8e8ae1b121f7f7106870120d..4654a9417088220fa6e0b0bcbaa5a45f F48570A42644C76D00C05F71 /* TranslationContextMenuInfo.h */, F4E1965F21F26E4E00285078 /* UndoItem.cpp */, 2ECDBAD521D8906300F00ECD /* UndoItem.h */, -@@ -30633,6 +30653,8 @@ +@@ -30682,6 +30702,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2487,7 +2487,7 @@ index eb2ab5326ed7266f8e8ae1b121f7f7106870120d..4654a9417088220fa6e0b0bcbaa5a45f 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -32987,6 +33009,7 @@ +@@ -33038,6 +33060,7 @@ AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, @@ -2495,7 +2495,7 @@ index eb2ab5326ed7266f8e8ae1b121f7f7106870120d..4654a9417088220fa6e0b0bcbaa5a45f 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, 7CE7FA591EF882300060C9D6 /* DocumentTouch.h */, A8185F3209765765005826D9 /* DocumentType.cpp */, -@@ -37301,6 +37324,8 @@ +@@ -37354,6 +37377,8 @@ 1AD8F81B11CAB9E900E93E54 /* PlatformStrategies.h in Headers */, 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, @@ -2504,7 +2504,7 @@ index eb2ab5326ed7266f8e8ae1b121f7f7106870120d..4654a9417088220fa6e0b0bcbaa5a45f CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, -@@ -38449,6 +38474,7 @@ +@@ -38502,6 +38527,7 @@ 0F54DD081881D5F5003EEDBB /* Touch.h in Headers */, 71B7EE0D21B5C6870031C1EF /* TouchAction.h in Headers */, 0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */, @@ -2512,7 +2512,7 @@ index eb2ab5326ed7266f8e8ae1b121f7f7106870120d..4654a9417088220fa6e0b0bcbaa5a45f 0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */, 070334D71459FFD5008D8D45 /* TrackBase.h in Headers */, BE88E0C21715CE2600658D98 /* TrackListBase.h in Headers */, -@@ -39393,6 +39419,7 @@ +@@ -39447,6 +39473,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2520,7 +2520,7 @@ index eb2ab5326ed7266f8e8ae1b121f7f7106870120d..4654a9417088220fa6e0b0bcbaa5a45f 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */, -@@ -39470,6 +39497,9 @@ +@@ -39524,6 +39551,9 @@ C1692DD223D23ABD006E88F7 /* SystemBattery.mm in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2531,7 +2531,7 @@ index eb2ab5326ed7266f8e8ae1b121f7f7106870120d..4654a9417088220fa6e0b0bcbaa5a45f 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp -index 33fc129cffe12d2230de02faa08624aab65e64e6..51251629a859a351349218e864bcccc8ff588504 100644 +index b07f94f5ab6ee350110a1d9b9bd93344ea7eb692..167e4bbd7e170be76b71f5d893f1b9f6f02a975d 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -61,6 +61,7 @@ @@ -2542,7 +2542,7 @@ index 33fc129cffe12d2230de02faa08624aab65e64e6..51251629a859a351349218e864bcccc8 #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3764,9 +3765,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -3777,9 +3778,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (roleValue() == AccessibilityRole::ApplicationDialog) return AccessibilityObjectInclusion::IncludeObject; @@ -2582,7 +2582,7 @@ index 68eb22fa17f9057d5cc18baee2431f71fe665bcb..98b79d929730993e2ffe773462a6beae virtual void detachPlatformWrapper(AccessibilityDetachmentType) = 0; }; diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -index 9dd8961100cc0f5bd89fcc4f96e742b065d9657b..39ab8b145c45b526536825407cf66676c99e3586 100644 +index 66d16a6e4075540d291204fc6e10fdd41aba0d42..e11edda46dca31abbd9498b0eaeca48aabf47669 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h @@ -157,6 +157,8 @@ namespace WebCore { @@ -9300,7 +9300,7 @@ index 0f5355b305602e855195c8832b5671f91f43f819..8dcae8e77dc5c08b5deca8ed8eadff9f set(WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2GTK_INSTALLED_HEADERS}) list(REMOVE_ITEM WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit/WebKitEnumTypes.h) diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake -index a48fbcd9212256548a5fb94678b6fbeffa47c649..27b758f3acd1f9e59f23e2dd05cc8db88e169676 100644 +index 10230e9bd3d4b5afc507178e35a61a9c84624238..d9d1becc4a0b801c06f25e194cac662f96b47576 100644 --- a/Source/WebKit/PlatformWPE.cmake +++ b/Source/WebKit/PlatformWPE.cmake @@ -197,6 +197,7 @@ set(WPE_API_INSTALLED_HEADERS @@ -9534,10 +9534,10 @@ index f2f3979fcac9dfd97d0e0ead600fe35eb8defd40..ac91412e1a96bdf521b1890a66e465dc NSEvent* nativeEvent() const { return m_nativeEvent.get(); } #elif PLATFORM(GTK) diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -index 45f31504c0945236135bb476517d02a742c07ecb..2cd05dd4bda73f8e44e456ef3a8ce3af87875aca 100644 +index d8d0a639b6578d384f483ef636d3e16c51fe98fe..9cffd80bfdb19d6b131a393cc56755efb325599c 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -@@ -123,6 +123,10 @@ +@@ -124,6 +124,10 @@ #include #endif @@ -9548,7 +9548,7 @@ index 45f31504c0945236135bb476517d02a742c07ecb..2cd05dd4bda73f8e44e456ef3a8ce3af // FIXME: Seems like we could use std::tuple to cut down the code below a lot! namespace IPC { -@@ -1297,6 +1301,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature +@@ -1298,6 +1302,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature encoder << windowFeatures.resizable; encoder << windowFeatures.fullscreen; encoder << windowFeatures.dialog; @@ -9558,7 +9558,7 @@ index 45f31504c0945236135bb476517d02a742c07ecb..2cd05dd4bda73f8e44e456ef3a8ce3af } bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& windowFeatures) -@@ -1325,6 +1332,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win +@@ -1326,6 +1333,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win return false; if (!decoder.decode(windowFeatures.dialog)) return false; @@ -9571,7 +9571,7 @@ index 45f31504c0945236135bb476517d02a742c07ecb..2cd05dd4bda73f8e44e456ef3a8ce3af return true; } -@@ -1338,6 +1351,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) +@@ -1339,6 +1352,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) #if PLATFORM(COCOA) encoder << dragData.pasteboardName(); encoder << dragData.fileNames(); @@ -9583,7 +9583,7 @@ index 45f31504c0945236135bb476517d02a742c07ecb..2cd05dd4bda73f8e44e456ef3a8ce3af #endif encoder << dragData.dragDestinationActionMask(); encoder << dragData.pageID(); -@@ -1361,9 +1379,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1362,9 +1380,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(applicationFlags)) return false; @@ -9601,7 +9601,7 @@ index 45f31504c0945236135bb476517d02a742c07ecb..2cd05dd4bda73f8e44e456ef3a8ce3af if (!decoder.decode(pasteboardName)) return false; -@@ -1379,8 +1404,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1380,8 +1405,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(pageID)) return false; @@ -10095,10 +10095,10 @@ index 90df093a49c09dc670dfea55077c77d889dd1c1b..6ffd51532e29b941b8dc10f545b7f5b8 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index bdd4ea646d1fc04e9a181662515f16f12a71bd6e..9cd08b6863cf3875bed5e3a854bc77fe66d5f57f 100644 +index 69195152333b0deb19654ea685ef86b313bbb192..d7521c5e0fa48a7bc9facad0895f7debebc674ad 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -398,11 +398,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -399,11 +399,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -10113,7 +10113,7 @@ index bdd4ea646d1fc04e9a181662515f16f12a71bd6e..9cd08b6863cf3875bed5e3a854bc77fe UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -412,6 +415,7 @@ UIProcess/PageLoadState.cpp +@@ -413,6 +416,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -10121,7 +10121,7 @@ index bdd4ea646d1fc04e9a181662515f16f12a71bd6e..9cd08b6863cf3875bed5e3a854bc77fe UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -453,6 +457,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -454,6 +458,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -10130,7 +10130,7 @@ index bdd4ea646d1fc04e9a181662515f16f12a71bd6e..9cd08b6863cf3875bed5e3a854bc77fe UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPermissionControllerProxy.cpp -@@ -579,7 +585,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -580,7 +586,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -10143,10 +10143,10 @@ index bdd4ea646d1fc04e9a181662515f16f12a71bd6e..9cd08b6863cf3875bed5e3a854bc77fe UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 372c492aefa3a8df96c4a9cc6b99d83696c04a6b..042770c65715e8d5f46e3bf74a04e2c6fb7d27f7 100644 +index 0338af0551b2f3d22f27367161abe5a8806b7444..aa36dc1b2f5f272c301fc8c48b8917d3548ec8db 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -281,6 +281,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm +@@ -283,6 +283,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -10154,7 +10154,7 @@ index 372c492aefa3a8df96c4a9cc6b99d83696c04a6b..042770c65715e8d5f46e3bf74a04e2c6 UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -457,6 +458,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -459,6 +460,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -15980,31 +15980,6 @@ index 0000000000000000000000000000000000000000..6d04f9290135069359ce6bf872654648 +} // namespace WebKit + +#endif // ENABLE(REMOTE_INSPECTOR) -diff --git a/Source/WebKit/UIProcess/WebAuthentication/Cocoa/CcidService.h b/Source/WebKit/UIProcess/WebAuthentication/Cocoa/CcidService.h -index 50ed8988e4e86ab2f70b1825fa759cabb6818e2c..4f2c7a1c11ab4c2fc0c2a5edf39bd935760f400c 100644 ---- a/Source/WebKit/UIProcess/WebAuthentication/Cocoa/CcidService.h -+++ b/Source/WebKit/UIProcess/WebAuthentication/Cocoa/CcidService.h -@@ -31,6 +31,7 @@ - #include - #include - -+OBJC_CLASS NSArray; - OBJC_CLASS TKSmartCardSlot; - OBJC_CLASS TKSmartCard; - -diff --git a/Source/WebKit/UIProcess/WebAuthentication/Mock/MockCcidService.h b/Source/WebKit/UIProcess/WebAuthentication/Mock/MockCcidService.h -index 987f42e6179336af35d773aa7ff264f165f91c50..139b8fef699626711ff214783ac966b8505bce01 100644 ---- a/Source/WebKit/UIProcess/WebAuthentication/Mock/MockCcidService.h -+++ b/Source/WebKit/UIProcess/WebAuthentication/Mock/MockCcidService.h -@@ -30,6 +30,8 @@ - #include "CcidService.h" - #include - -+OBJC_CLASS NSData; -+ - namespace WebKit { - - class MockCcidService final : public CcidService { diff --git a/Source/WebKit/UIProcess/WebAuthentication/Mock/MockLocalConnection.h b/Source/WebKit/UIProcess/WebAuthentication/Mock/MockLocalConnection.h index 684b9616573761123fbcc0d94be29de519ecced6..51ff18323ece0ee15c87d63a1d6fd604377ee968 100644 --- a/Source/WebKit/UIProcess/WebAuthentication/Mock/MockLocalConnection.h @@ -16017,19 +15992,6 @@ index 684b9616573761123fbcc0d94be29de519ecced6..51ff18323ece0ee15c87d63a1d6fd604 #include namespace WebKit { -diff --git a/Source/WebKit/UIProcess/WebAuthentication/fido/CtapNfcDriver.cpp b/Source/WebKit/UIProcess/WebAuthentication/fido/CtapNfcDriver.cpp -index 680c1839ed6f00c46312aed4fdb3df8da0d7dd89..2390e936c1d870d9f8b40fdf1d585081ed46282d 100644 ---- a/Source/WebKit/UIProcess/WebAuthentication/fido/CtapNfcDriver.cpp -+++ b/Source/WebKit/UIProcess/WebAuthentication/fido/CtapNfcDriver.cpp -@@ -37,7 +37,7 @@ using namespace apdu; - using namespace fido; - - CtapNfcDriver::CtapNfcDriver(Ref&& connection) -- : CtapDriver(AuthenticatorTransport::Nfc) -+ : CtapDriver(WebCore::AuthenticatorTransport::Nfc) - , m_connection(WTFMove(connection)) - { - } diff --git a/Source/WebKit/UIProcess/WebContextMenuProxy.h b/Source/WebKit/UIProcess/WebContextMenuProxy.h index be46daa094f16baf6bd52f9cf651c119b1e1b858..bee096090050e87158764f45e1ba128071ba25bb 100644 --- a/Source/WebKit/UIProcess/WebContextMenuProxy.h @@ -16707,7 +16669,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 967ba99504555b84f9905af6eddce0ef95daebcf..cc4b1b6bcfad3302894aac2b8035270b3eac4437 100644 +index 5126e406c4ada8c0d21bf8e101470d4485823751..d856b6670c907afb9a589d642395c3da4dd3e231 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -246,6 +246,9 @@ @@ -17226,7 +17188,7 @@ index 967ba99504555b84f9905af6eddce0ef95daebcf..cc4b1b6bcfad3302894aac2b8035270b // and make it one UIClient call that calls the completionHandler with false // if there is no delegate instead of returning the completionHandler diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h -index be75b56d62b9ec68aef456008e60a597d4e53e7c..151d198f6d979b4834cd3ec3ffa8812af1442606 100644 +index 2306e725f2b79c2239dc24c065d8093c7b08cbf0..1493ffc54271945dc6d8a534e74f528e2580a805 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17489,7 +17451,7 @@ index 7f9db2b972eef69cbbb7ed9185381bf2a3dcffe5..ab985444d3485303f5226883c7b2e890 parameters.urlSchemesRegisteredAsEmptyDocument = copyToVector(m_schemesToRegisterAsEmptyDocument); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp -index a8fa26d4edcbb5ec7c04339820dbec7ac9e3bec4..56154802c90bf95007051de33beb55f2cbb43e30 100644 +index 2a208a926eb50fbe096368f6c79d3a5e1471cf5d..c5e98598a6e97c39b12e0d563e31c6fa8f2fbca2 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp @@ -148,6 +148,11 @@ HashMap& WebProcessProxy::allProcesses() @@ -17504,7 +17466,7 @@ index a8fa26d4edcbb5ec7c04339820dbec7ac9e3bec4..56154802c90bf95007051de33beb55f2 WebProcessProxy* WebProcessProxy::processForIdentifier(ProcessIdentifier identifier) { return allProcesses().get(identifier); -@@ -418,6 +423,26 @@ void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOpt +@@ -409,6 +414,26 @@ void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOpt if (WebKit::isInspectorProcessPool(processPool())) launchOptions.extraInitializationData.add("inspector-process"_s, "1"_s); @@ -17532,7 +17494,7 @@ index a8fa26d4edcbb5ec7c04339820dbec7ac9e3bec4..56154802c90bf95007051de33beb55f2 if (isPrewarmed()) diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h -index 8ebc9de56dc03d877ea6dfd749a9fc13ac1268db..6dfdae82d90fc19936b87bc9dc8995464da56f25 100644 +index 85de56c9a40c1389c10d6cad3d5dd5953d969b9f..5736d72bf2c2e064567b9df041095fa562b85134 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.h +++ b/Source/WebKit/UIProcess/WebProcessProxy.h @@ -147,6 +147,7 @@ public: @@ -17544,10 +17506,10 @@ index 8ebc9de56dc03d877ea6dfd749a9fc13ac1268db..6dfdae82d90fc19936b87bc9dc899546 WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index 17829d15c9dc0ae5a6fbde29c13854364f175dcb..881bcf0f8b92963e1e10ac81835ca9017ba2fa77 100644 +index d67e914edbe266f9319b52808fe3808e4e149a6a..5afb63e331f2d0514e95261fb66a0609e8166cb5 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -1969,6 +1969,12 @@ void WebsiteDataStore::originDirectoryForTesting(URL&& origin, URL&& topOrigin, +@@ -1970,6 +1970,12 @@ void WebsiteDataStore::originDirectoryForTesting(URL&& origin, URL&& topOrigin, networkProcess().websiteDataOriginDirectoryForTesting(m_sessionID, WTFMove(origin), WTFMove(topOrigin), type, WTFMove(completionHandler)); } @@ -18840,10 +18802,10 @@ index 0000000000000000000000000000000000000000..cf8417ab83cdd06b24420838119d68cd + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/mac/WebViewImpl.h b/Source/WebKit/UIProcess/mac/WebViewImpl.h -index e59ceef97131b7d5d1f60e8c0b192b4866aa49cd..ce4e17e0500f25768b51484ce167a5a3fa3465f1 100644 +index 9806df0d14e074cd678bf3ef923eac86a46c5275..30910188c04d4aa90b135d4a379a10d21236e28d 100644 --- a/Source/WebKit/UIProcess/mac/WebViewImpl.h +++ b/Source/WebKit/UIProcess/mac/WebViewImpl.h -@@ -509,6 +509,9 @@ public: +@@ -510,6 +510,9 @@ public: void provideDataForPasteboard(NSPasteboard *, NSString *type); NSArray *namesOfPromisedFilesDroppedAtDestination(NSURL *dropDestination); @@ -18854,10 +18816,10 @@ index e59ceef97131b7d5d1f60e8c0b192b4866aa49cd..ce4e17e0500f25768b51484ce167a5a3 void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/mac/WebViewImpl.mm b/Source/WebKit/UIProcess/mac/WebViewImpl.mm -index 757b38bc645f13ba5e613f026b41716e0bbb56aa..15569ee7273194722a74522aac0575a4e25b477e 100644 +index 3bc2628559f9a178345310319aec86b6604bb1b1..02496603e2fe99b99ec07024def183cfb69c5b54 100644 --- a/Source/WebKit/UIProcess/mac/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/mac/WebViewImpl.mm -@@ -2306,6 +2306,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() +@@ -2313,6 +2313,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() if (!m_colorSpace) m_colorSpace = [NSColorSpace sRGBColorSpace]; } @@ -18869,7 +18831,7 @@ index 757b38bc645f13ba5e613f026b41716e0bbb56aa..15569ee7273194722a74522aac0575a4 ASSERT(m_colorSpace); return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] }; -@@ -4293,6 +4298,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu +@@ -4300,6 +4305,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu return adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions)); } @@ -19648,7 +19610,7 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7918a3386 100644 +index 3d69dd50b974effc0107c70be20df28df6ee3906..d28d265e0cdb9fafef96cd36f43c63905296bb4e 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj @@ -1248,6 +1248,7 @@ @@ -19705,7 +19667,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 5CAF7AA426F93A750003F19E /* adattributiond */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = adattributiond; sourceTree = BUILT_PRODUCTS_DIR; }; 5CAF7AA526F93A950003F19E /* adattributiond.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = adattributiond.cpp; sourceTree = ""; }; 5CAF7AA626F93AA50003F19E /* adattributiond.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = adattributiond.xcconfig; sourceTree = ""; }; -@@ -7003,6 +7022,19 @@ +@@ -7009,6 +7028,19 @@ DF0C5F24252ECB8D00D921DB /* WKDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownload.h; sourceTree = ""; }; DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadInternal.h; sourceTree = ""; }; DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadDelegate.h; sourceTree = ""; }; @@ -19725,7 +19687,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHTTPCookieStorePrivate.h; sourceTree = ""; }; DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentWorldPrivate.h; sourceTree = ""; }; DF58C6311371AC5800F9A37C /* NativeWebWheelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebWheelEvent.h; sourceTree = ""; }; -@@ -7132,6 +7164,8 @@ +@@ -7138,6 +7170,8 @@ E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WKFormColorControl.h; path = ios/forms/WKFormColorControl.h; sourceTree = ""; }; E5CB07DB20E1678F0022C183 /* WKFormColorControl.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = WKFormColorControl.mm; path = ios/forms/WKFormColorControl.mm; sourceTree = ""; }; E5CBA75F27A3187800DF7858 /* UnifiedSource120.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource120.cpp; path = "DerivedSources/WebKit/unified-sources/UnifiedSource120.cpp"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -19734,7 +19696,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 E5CBA76027A3187900DF7858 /* UnifiedSource119.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource119.cpp; path = "DerivedSources/WebKit/unified-sources/UnifiedSource119.cpp"; sourceTree = BUILT_PRODUCTS_DIR; }; E5CBA76127A3187900DF7858 /* UnifiedSource118.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource118.cpp; path = "DerivedSources/WebKit/unified-sources/UnifiedSource118.cpp"; sourceTree = BUILT_PRODUCTS_DIR; }; E5CBA76227A3187900DF7858 /* UnifiedSource117.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource117.cpp; path = "DerivedSources/WebKit/unified-sources/UnifiedSource117.cpp"; sourceTree = BUILT_PRODUCTS_DIR; }; -@@ -7153,6 +7187,14 @@ +@@ -7160,6 +7194,14 @@ ECA680D31E6904B500731D20 /* ExtraPrivateSymbolsForTAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtraPrivateSymbolsForTAPI.h; sourceTree = ""; }; ECBFC1DB1E6A4D66000300C7 /* ExtraPublicSymbolsForTAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExtraPublicSymbolsForTAPI.h; sourceTree = ""; }; F036978715F4BF0500C3A80E /* WebColorPicker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebColorPicker.cpp; sourceTree = ""; }; @@ -19749,7 +19711,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDragDestinationAction.h; sourceTree = ""; }; F40D1B68220BDC0F00B49A01 /* WebAutocorrectionContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WebAutocorrectionContext.h; path = ios/WebAutocorrectionContext.h; sourceTree = ""; }; F41056612130699A0092281D /* APIAttachmentCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = APIAttachmentCocoa.mm; sourceTree = ""; }; -@@ -7287,6 +7329,7 @@ +@@ -7294,6 +7336,7 @@ 52A69BEA286CFFAC00893E8F /* CryptoTokenKit.framework in Frameworks */, 3766F9EE189A1241003CF19B /* JavaScriptCore.framework in Frameworks */, 3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */, @@ -19757,7 +19719,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, -@@ -9429,6 +9472,7 @@ +@@ -9438,6 +9481,7 @@ 99788ACA1F421DCA00C08000 /* _WKAutomationSessionConfiguration.mm */, 990D28A81C6404B000986977 /* _WKAutomationSessionDelegate.h */, 990D28AF1C65203900986977 /* _WKAutomationSessionInternal.h */, @@ -19765,7 +19727,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 5C4609E222430E4C009943C2 /* _WKContentRuleListAction.h */, 5C4609E322430E4D009943C2 /* _WKContentRuleListAction.mm */, 5C4609E422430E4D009943C2 /* _WKContentRuleListActionInternal.h */, -@@ -10522,6 +10566,7 @@ +@@ -10534,6 +10578,7 @@ E34B110C27C46BC6006D2F2E /* libWebCoreTestShim.dylib */, E34B110F27C46D09006D2F2E /* libWebCoreTestSupport.dylib */, DDE992F4278D06D900F60D26 /* libWebKitAdditions.a */, @@ -19773,7 +19735,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 57A9FF15252C6AEF006A2040 /* libWTF.a */, 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, -@@ -11057,6 +11102,12 @@ +@@ -11071,6 +11116,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -19786,7 +19748,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 ); path = Agents; sourceTree = ""; -@@ -11065,6 +11116,7 @@ +@@ -11079,6 +11130,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -19794,7 +19756,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -11608,6 +11660,7 @@ +@@ -11622,6 +11674,7 @@ E1513C65166EABB200149FCB /* AuxiliaryProcessProxy.h */, 46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */, 46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */, @@ -19802,7 +19764,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 4659F25E275FF6B200BBB369 /* CaptivePortalModeObserver.h */, 07297F9C1C1711EA003F0735 /* DeviceIdHashSaltStorage.cpp */, 07297F9D1C17BBEA223F0735 /* DeviceIdHashSaltStorage.h */, -@@ -11625,6 +11678,8 @@ +@@ -11639,6 +11692,8 @@ 2DD5A72A1EBF09A7009BA597 /* HiddenPageThrottlingAutoIncreasesCounter.h */, 839A2F2F1E2067390039057E /* HighPerformanceGraphicsUsageSampler.cpp */, 839A2F301E2067390039057E /* HighPerformanceGraphicsUsageSampler.h */, @@ -19811,7 +19773,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 5CEABA2B2333251400797797 /* LegacyGlobalSettings.cpp */, 5CEABA2A2333247700797797 /* LegacyGlobalSettings.h */, 31607F3819627002009B87DA /* LegacySessionStateCoding.h */, -@@ -11656,6 +11711,7 @@ +@@ -11670,6 +11725,7 @@ 1A0C227D2451130A00ED614D /* QuickLookThumbnailingSoftLink.mm */, 1AEE57232409F142002005D6 /* QuickLookThumbnailLoader.h */, 1AEE57242409F142002005D6 /* QuickLookThumbnailLoader.mm */, @@ -19819,7 +19781,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 BC111B08112F5E3C00337BAB /* ResponsivenessTimer.cpp */, 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */, 5CA98549210BEB5A0057EB6B /* SafeBrowsingWarning.h */, -@@ -11756,6 +11812,8 @@ +@@ -11770,6 +11826,8 @@ BC7B6204129A0A6700D174A4 /* WebPageGroup.h */, 2D9EA3101A96D9EB002D2807 /* WebPageInjectedBundleClient.cpp */, 2D9EA30E1A96CBFF002D2807 /* WebPageInjectedBundleClient.h */, @@ -19828,7 +19790,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 BC111B0B112F5E4F00337BAB /* WebPageProxy.cpp */, BC032DCB10F4389F0058C15A /* WebPageProxy.h */, BCBD38FA125BAB9A00D2C29F /* WebPageProxy.messages.in */, -@@ -11911,6 +11969,7 @@ +@@ -11925,6 +11983,7 @@ BC646C1911DD399F006455B0 /* WKBackForwardListItemRef.h */, BC646C1611DD399F006455B0 /* WKBackForwardListRef.cpp */, BC646C1711DD399F006455B0 /* WKBackForwardListRef.h */, @@ -19836,7 +19798,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 BCB9E24A1120E15C00A137E0 /* WKContext.cpp */, BCB9E2491120E15C00A137E0 /* WKContext.h */, 1AE52F9319201F6B00A1FA37 /* WKContextConfigurationRef.cpp */, -@@ -12498,6 +12557,9 @@ +@@ -12512,6 +12571,9 @@ C18173602058424700DFDA65 /* DisplayLink.h */, 31ABA79C215AF9E000C90E31 /* HighPerformanceGPUManager.h */, 31ABA79D215AF9E000C90E31 /* HighPerformanceGPUManager.mm */, @@ -19846,7 +19808,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 1AFDE65B1954E8D500C48FFA /* LegacySessionStateCoding.cpp */, 0FCB4E5818BBE3D9000FCFC9 /* PageClientImplMac.h */, 0FCB4E5918BBE3D9000FCFC9 /* PageClientImplMac.mm */, -@@ -12524,6 +12586,8 @@ +@@ -12538,6 +12600,8 @@ E568B92120A3AC6A00E3C856 /* WebDataListSuggestionsDropdownMac.mm */, E55CD20124D09F1F0042DB9C /* WebDateTimePickerMac.h */, E55CD20224D09F1F0042DB9C /* WebDateTimePickerMac.mm */, @@ -19855,7 +19817,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 BC857E8512B71EBB00EDEB2E /* WebPageProxyMac.mm */, BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */, BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */, -@@ -13713,6 +13777,7 @@ +@@ -13727,6 +13791,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -19863,7 +19825,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -13961,6 +14026,7 @@ +@@ -13975,6 +14040,7 @@ E170876C16D6CA6900F99226 /* BlobRegistryProxy.h in Headers */, 4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */, 1A5705111BE410E600874AF1 /* BlockSPI.h in Headers */, @@ -19871,7 +19833,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 BC3065FA1259344E00E71278 /* CacheModel.h in Headers */, 41897ED81F415D8A0016FA42 /* CacheStorageEngine.h in Headers */, 41FABD2A1F4DE001006A6C97 /* CacheStorageEngineCache.h in Headers */, -@@ -14228,7 +14294,11 @@ +@@ -14242,7 +14308,11 @@ 2DD45ADE1E5F8972006C355F /* InputViewUpdateDeferrer.h in Headers */, CE550E152283752200D28791 /* InsertTextOptions.h in Headers */, 9197940523DBC4BB00257892 /* InspectorBrowserAgent.h in Headers */, @@ -19883,7 +19845,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 A5E391FD2183C1F800C8FB31 /* InspectorTargetProxy.h in Headers */, 51E9049C27BCB9D400929E7E /* InstallCoordinationSPI.h in Headers */, C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */, -@@ -14446,6 +14516,7 @@ +@@ -14460,6 +14530,7 @@ CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, @@ -19891,7 +19853,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -14504,6 +14575,7 @@ +@@ -14518,6 +14589,7 @@ E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */, E36FF00327F36FBD004BE21A /* SandboxStateVariables.h in Headers */, 7BAB111025DD02B3008FC479 /* ScopedActiveMessageReceiveQueue.h in Headers */, @@ -19899,7 +19861,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 E4D54D0421F1D72D007E3C36 /* ScrollingTreeFrameScrollingNodeRemoteIOS.h in Headers */, 0F931C1C18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h in Headers */, 0F931C1C18C5711900DBB8D4 /* ScrollingTreeScrollingNodeDelegateIOS.h in Headers */, -@@ -14851,6 +14923,8 @@ +@@ -14865,6 +14937,8 @@ 2D9EA30F1A96CBFF002D2807 /* WebPageInjectedBundleClient.h in Headers */, 9197940823DBC4CB00257892 /* WebPageInspectorAgentBase.h in Headers */, A513F5402154A5D700662841 /* WebPageInspectorController.h in Headers */, @@ -19908,7 +19870,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 A543E30C215C8A8D00279CD9 /* WebPageInspectorTarget.h in Headers */, A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, -@@ -16785,6 +16859,8 @@ +@@ -16822,6 +16896,8 @@ 51E9049727BCB3D900929E7E /* ICAppBundle.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -19917,7 +19879,7 @@ index 01ae6a0fbf5cd7e6e09a0550aa72885cdd52b1c0..253b6e78a7d3b1583dff4f94d59861f7 C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */, C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */, 2984F588164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp in Sources */, -@@ -17119,6 +17195,8 @@ +@@ -17156,6 +17232,8 @@ E3816B3D27E2463A005EAFC0 /* WebMockContentFilterManager.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -21231,7 +21193,7 @@ index c534ddeb37b0b2c0b1eb5953078424f2495f2720..c6f9db5b98df828e9ed61f5aa120db4f SET_AND_EXPOSE_TO_BUILD(HAVE_OS_DARK_MODE_SUPPORT 1) diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake -index 0078b2ff6b0e267f1fb5c02d6e3b331db3013703..be378fe3aa6b3137f9a1c63ebd346304274b7d67 100644 +index 4dab99ed75adee82a1e470be270f152c4aa75bff..52e057d322b012e7f90262910d886c38ae55336a 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -9,8 +9,13 @@ if (${CMAKE_VERSION} VERSION_LESS "3.20" AND NOT ${CMAKE_GENERATOR} STREQUAL "Ni @@ -21978,24 +21940,6 @@ index ed6c15ce06c25ef12b165552bd665c5108d209dc..267612eb7239cfa91f0c675ec18d0975 # WebInspectorUI must come after JavaScriptCore and WebCore but before WebKit and WebKit2 my $webKitIndex = first { $projects[$_] eq "Source/WebKitLegacy" } 0..$#projects; -diff --git a/Tools/TestWebKitAPI/PlatformWPE.cmake b/Tools/TestWebKitAPI/PlatformWPE.cmake -index a6fb70998504aaf594d1a8c23fac30bdf1e3c218..e2bcbbf9c844767e92cddd7cd61f274ffafa468c 100644 ---- a/Tools/TestWebKitAPI/PlatformWPE.cmake -+++ b/Tools/TestWebKitAPI/PlatformWPE.cmake -@@ -116,9 +116,12 @@ set(TestJSC_LIBRARIES - set(TestJSC_FRAMEWORKS - JavaScriptCore - WTF -- bmalloc - ) - -+if (NOT USE_SYSTEM_MALLOC) -+ list(APPEND TestJSC_FRAMEWORKS bmalloc) -+endif () -+ - set(TestJSC_DEFINITIONS - WEBKIT_SRC_DIR="${CMAKE_SOURCE_DIR}" - ) diff --git a/Tools/WebKitTestRunner/CMakeLists.txt b/Tools/WebKitTestRunner/CMakeLists.txt index 9ee1f886d0148827da93466dece71d1eec5307cc..ee7d59af6b1ea62f6d4a61a19bf60a8f8c2444c5 100644 --- a/Tools/WebKitTestRunner/CMakeLists.txt @@ -22453,10 +22397,10 @@ index 8660306662de6faabab78662034958811e3e4a67..979c470d97950007ad990564eba18de9 location = "group:Source/bmalloc/bmalloc.xcodeproj"> diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/Everything up to WebKit + Tools.xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/Everything up to WebKit + Tools.xcscheme -index 1e41cbcb9a7faa6757cdf62027a236b1449c9d5f..3fbcb4663cad440849307e2f9ecfde2518db0f6e 100644 +index 4e712c4128ced91a4f7b93c543e4b231ec23e348..853d3d2f6b311c0fe009bf3ef5ab4d1d3c1d331e 100644 --- a/WebKit.xcworkspace/xcshareddata/xcschemes/Everything up to WebKit + Tools.xcscheme +++ b/WebKit.xcworkspace/xcshareddata/xcschemes/Everything up to WebKit + Tools.xcscheme -@@ -202,6 +202,20 @@ +@@ -188,6 +188,20 @@ ReferencedContainer = "container:Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj">