From f91b3bb34055bff425178e271fe21d6ea953123d Mon Sep 17 00:00:00 2001 From: Diego Pino Date: Thu, 16 Jun 2022 08:56:09 +0800 Subject: [PATCH] browser(webkit) rebase to 06/15/22 (r295573) (#14900) --- browser_patches/webkit/BUILD_NUMBER | 4 +- browser_patches/webkit/UPSTREAM_CONFIG.sh | 2 +- browser_patches/webkit/patches/bootstrap.diff | 276 +++++++++--------- 3 files changed, 137 insertions(+), 145 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 3bc2be1226..48e13bc51c 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1666 -Changed: dpino@igalia.com Tue Jun 14 09:48:53 HKT 2022 +1667 +Changed: dpino@igalia.com Thu Jun 16 08:37:46 HKT 2022 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 515c8e0e32..13a342b638 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="79ad9ed64760e9fb1d02e26be2ff69b849907061" +BASE_REVISION="9c7c94e0a7964e9b297182ad668d2bdebba74202" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 8a6c796c5e..b09dfae995 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -2037,7 +2037,7 @@ index b5f8fd479df19c98317b1113fff01be9b7da0685..6c96c4924a1d01eabc0b066bf576a44d type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index f83931fde2e4d27a289de339106081878d7d56d3..4faf91ab2a7c75232956a57be2fe5e640af1fb41 100644 +index 36acbf05d78808c8a9e7533087a850819f9e2221..3a16b04cd9c3cb873ff331f8b0599c7cf447add9 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -503,7 +503,7 @@ CrossOriginOpenerPolicyEnabled: @@ -2109,7 +2109,7 @@ index a12654571fa6e364f9490a59b3543496cfaa7aaf..1246e7b0296bf477e4782b51364b29b4 UseGPUProcessForMediaEnabled: diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index 375c6911d99ac3349ab3d47275ba857578d74f09..bb781a6d58fa184032044e8b5d4e87cd1a24fce2 100644 +index 89838c8a9f88d1a5d062b2b3a7619d819f945c8f..480cac1b65fa3e4d5defab45a62753739ebd29f7 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h @@ -416,7 +416,7 @@ @@ -2156,10 +2156,10 @@ index bb01bfeeac63f854fa656ec6b8d262fafc4c9df5..f8376ea8aada69d2e53734ba8fd234c2 if (Journald_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 57f1adb7d7de5b4c0f667b457dc7c6001776d96b..247ec5e6f0c0b9ee22772c985636ed76eb1bb877 100644 +index 7c6dc376eb433b7c3bf27af79a2a1fe7a84b42c3..5897572a6b9929483db8a9195dff67a4b0e1995c 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h -@@ -419,7 +419,7 @@ +@@ -426,7 +426,7 @@ #define HAVE_FOUNDATION_WITH_SAME_SITE_COOKIE_SUPPORT 1 #endif @@ -2361,10 +2361,10 @@ index 82f617e0d496ee71ffc2f2ce4c00ddc0e640f0de..ad47858a0ba283ed44a486dbee29c10a __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb531da727ed 100644 +index c0b4c7bdb834386cc7fdcceda6f1ca3931ad46bb..d6d9c2d3c07b0878e23dad08f3afc858e000c308 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5552,6 +5552,13 @@ +@@ -5551,6 +5551,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, ); }; }; @@ -2378,7 +2378,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 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, ); }; }; -@@ -17936,6 +17943,14 @@ +@@ -17927,6 +17934,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 = ""; }; @@ -2393,7 +2393,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 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 = ""; }; -@@ -24624,6 +24639,11 @@ +@@ -24615,6 +24630,11 @@ BC4A5324256055590028C592 /* TextDirectionSubmenuInclusionBehavior.h */, 2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */, 2D4F96F21A1ECC240098BF88 /* TextIndicator.h */, @@ -2405,7 +2405,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 F48570A42644C76D00C05F71 /* TranslationContextMenuInfo.h */, F4E1965F21F26E4E00285078 /* UndoItem.cpp */, 2ECDBAD521D8906300F00ECD /* UndoItem.h */, -@@ -24765,8 +24785,6 @@ +@@ -24756,8 +24776,6 @@ 6FB7D2D5250FD7B5000207AA /* flex */ = { isa = PBXGroup; children = ( @@ -2414,7 +2414,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 6FB17475283A8FF40067D8CA /* FlexFormattingConstraints.h */, 6FB7D2D7250FD7E5000207AA /* FlexFormattingContext.cpp */, 6FB7D2D9250FD7FC000207AA /* FlexFormattingContext.h */, -@@ -24774,6 +24792,8 @@ +@@ -24765,6 +24783,8 @@ 6FF911F626487FC8002021DF /* FlexFormattingGeometry.h */, 6FB7D2D8250FD7EF000207AA /* FlexFormattingState.cpp */, 6FB7D2DA250FD7FC000207AA /* FlexFormattingState.h */, @@ -2423,7 +2423,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 6FB9105B2830BC8A00004929 /* FlexRect.h */, ); path = flex; -@@ -29458,6 +29478,8 @@ +@@ -29443,6 +29463,8 @@ B23540F00D00782E002382FA /* StringTruncator.cpp */, B23540F10D00782E002382FA /* StringTruncator.h */, 087558C413B4A57D00F49307 /* SurrogatePairAwareTextIterator.h */, @@ -2432,7 +2432,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 95E9F44427C9A39B00945337 /* SystemImage.h */, 3BB6B80F22A7D311003A2A69 /* TabSize.h */, 722AF2E327E1CF110078D997 /* TextBoxIterator.h */, -@@ -29487,8 +29509,6 @@ +@@ -29471,8 +29493,6 @@ 501BAAA813950E2C00F7ACEB /* WindRule.h */, 379919941200DDF400EA041C /* WOFFFileFormat.cpp */, 379919951200DDF400EA041C /* WOFFFileFormat.h */, @@ -2441,7 +2441,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 ); path = graphics; sourceTree = ""; -@@ -29586,6 +29606,7 @@ +@@ -29570,6 +29590,7 @@ F48D2AA32159740D00C6752B /* ColorCocoa.h */, F48D2AA42159740D00C6752B /* ColorCocoa.mm */, B275354C0B053814002CE64F /* FloatRectCocoa.mm */, @@ -2449,7 +2449,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 1C3969CF1B74211E002BCFA7 /* FontCacheCoreText.cpp */, C2458E611FE8979E00594759 /* FontCacheCoreText.h */, B2AFFC780D00A5C10030074D /* FontCascadeCocoa.cpp */, -@@ -29616,6 +29637,7 @@ +@@ -29600,6 +29621,7 @@ CDEB3D7324C41A6E001FBEEF /* SourceBufferParser.h */, CD8F667024C0F208000C421C /* SourceBufferParserWebM.cpp */, CD8F667224C0F208000C421C /* SourceBufferParserWebM.h */, @@ -2457,7 +2457,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 E4E8B4ED216B79F400B8834D /* SystemFontDatabaseCoreText.cpp */, E4E8B4EA216B79E500B8834D /* SystemFontDatabaseCoreText.h */, 526724F21CB2FDF60075974D /* TextTrackRepresentationCocoa.h */, -@@ -29633,8 +29655,6 @@ +@@ -29617,8 +29639,6 @@ 07F5CFF42582A4F800662EF5 /* WebMAudioUtilitiesCocoa.h */, 07F5CFF22582A4F800662EF5 /* WebMAudioUtilitiesCocoa.mm */, 7B1619102719880E00C40EAC /* WebProcessGraphicsContextGLCocoa.mm */, @@ -2466,7 +2466,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 ); path = cocoa; sourceTree = ""; -@@ -30438,6 +30458,8 @@ +@@ -30422,6 +30442,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2475,7 +2475,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -32749,6 +32771,7 @@ +@@ -32732,6 +32754,7 @@ AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, @@ -2483,7 +2483,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, 7CE7FA591EF882300060C9D6 /* DocumentTouch.h */, A8185F3209765765005826D9 /* DocumentType.cpp */, -@@ -34059,6 +34082,7 @@ +@@ -34042,6 +34065,7 @@ 7A45033018DB717200377B34 /* BufferedLineReader.h in Headers */, 2DFA488F1DB541D000362B99 /* BufferSource.h in Headers */, F55B3DB01251F12D003EF269 /* ButtonInputType.h in Headers */, @@ -2491,7 +2491,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 07C046C41E42508B007201E7 /* CAAudioStreamDescription.h in Headers */, 6353E1E61F91743100A34208 /* CachedApplicationManifest.h in Headers */, BCB16C1A0979C3BD00467741 /* CachedCSSStyleSheet.h in Headers */, -@@ -34944,6 +34968,7 @@ +@@ -34926,6 +34950,7 @@ 6FB7D2DD250FD828000207AA /* FlexFormattingContext.h in Headers */, 6FF911F726487FC8002021DF /* FlexFormattingGeometry.h in Headers */, 6FB7D2DE250FD82E000207AA /* FlexFormattingState.h in Headers */, @@ -2499,7 +2499,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 6FB9105C2830BC8A00004929 /* FlexRect.h in Headers */, 6FFDC442212EFF1700A9CA91 /* FloatAvoider.h in Headers */, BC073BAA0C399B1F000F5979 /* FloatConversion.h in Headers */, -@@ -35353,6 +35378,7 @@ +@@ -35335,6 +35360,7 @@ 7C7903B31F86F95C00463A70 /* ImageBitmapRenderingContext.h in Headers */, 318EAD4D1FA91380008CEF86 /* ImageBitmapRenderingContextSettings.h in Headers */, B2A10B920B3818BD00099AA4 /* ImageBuffer.h in Headers */, @@ -2507,7 +2507,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 72BAC3AE23E1F0B0008D741C /* ImageBufferBackend.h in Headers */, 550640B02407587E00AAE045 /* ImageBufferCGBackend.h in Headers */, 2D7705C925528D34001D0C94 /* ImageBufferCGBitmapBackend.h in Headers */, -@@ -35373,7 +35399,6 @@ +@@ -35355,7 +35381,6 @@ BC7F44A80B9E324E00A9D081 /* ImageObserver.h in Headers */, 2D5A5931152525D00036EE51 /* ImageOrientation.h in Headers */, F46D5386273D7E460009FA80 /* ImageOverlay.h in Headers */, @@ -2515,7 +2515,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 F482434B260C33060022497C /* ImageOverlayController.h in Headers */, F446EDE1265DB1E50031DA8F /* ImageOverlayDataDetectionResultIdentifier.h in Headers */, 72283F0E230B268C00F5D828 /* ImagePaintingOptions.h in Headers */, -@@ -35407,7 +35432,6 @@ +@@ -35389,7 +35414,6 @@ 517138F81BF128BB000D5F01 /* IndexValueStore.h in Headers */, CD063F831E23FA8900812BE3 /* InitDataRegistry.h in Headers */, E4F819C626FB4EBF0094E162 /* InlineBoxPainter.h in Headers */, @@ -2523,7 +2523,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 E30592641E27A3AD00D57C98 /* InlineClassicScript.h in Headers */, 6FE198172178397C00446F08 /* InlineContentBreaker.h in Headers */, 111FA1C826F0F30F003B8F16 /* InlineDamage.h in Headers */, -@@ -37039,6 +37063,8 @@ +@@ -37022,6 +37046,8 @@ 1AD8F81B11CAB9E900E93E54 /* PlatformStrategies.h in Headers */, 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, @@ -2532,7 +2532,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, -@@ -37371,7 +37397,6 @@ +@@ -37354,7 +37380,6 @@ BE20507E18A458C20080647E /* RenderVTTCue.h in Headers */, A871DFE40A15376B00B12A68 /* RenderWidget.h in Headers */, A89CCC530F44E98100B5DA10 /* ReplaceNodeWithSpanCommand.h in Headers */, @@ -2540,7 +2540,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 2DF512CE1D873E47001D6780 /* ReplaceRangeWithTextCommand.h in Headers */, 93309E0A099E64920056E581 /* ReplaceSelectionCommand.h in Headers */, 071C00342707D95500D027C7 /* ReplayKitCaptureSource.h in Headers */, -@@ -37838,7 +37863,6 @@ +@@ -37821,7 +37846,6 @@ 0FF50272102BA96A0066F39A /* StyleMedia.h in Headers */, BC5EB74E0E81E06700B25965 /* StyleMultiColData.h in Headers */, E4DACE6A1D12E10B0075980F /* StylePendingResources.h in Headers */, @@ -2548,7 +2548,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 A80E6DFC0A199067007FB8C5 /* StyleProperties.h in Headers */, 4BD781BF21C1965F00D9703E /* StylePropertyMap.h in Headers */, 4BAFD0CF2190F9B500C0AB64 /* StylePropertyMapReadOnly.h in Headers */, -@@ -38080,6 +38104,7 @@ +@@ -38062,6 +38086,7 @@ 517A53461F50C17F00DCDC0A /* SWServerWorker.h in Headers */, E180811716FCF9CB00B80D07 /* SynchronousLoaderClient.h in Headers */, C1692DD523D23E08006E88F7 /* SystemBattery.h in Headers */, @@ -2556,7 +2556,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 E4E8B4EC216B79E500B8834D /* SystemFontDatabaseCoreText.h in Headers */, 95E9F44627C9A39C00945337 /* SystemImage.h in Headers */, 0F03C0741884695E00A5F8CA /* SystemMemory.h in Headers */, -@@ -38185,6 +38210,7 @@ +@@ -38167,6 +38192,7 @@ 0F54DD081881D5F5003EEDBB /* Touch.h in Headers */, 71B7EE0D21B5C6870031C1EF /* TouchAction.h in Headers */, 0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */, @@ -2564,7 +2564,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */, 070334D71459FFD5008D8D45 /* TrackBase.h in Headers */, BE88E0C21715CE2600658D98 /* TrackListBase.h in Headers */, -@@ -39141,6 +39167,7 @@ +@@ -39123,6 +39149,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2572,7 +2572,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */, -@@ -39217,6 +39244,9 @@ +@@ -39199,6 +39226,9 @@ C1692DD223D23ABD006E88F7 /* SystemBattery.mm in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2583,7 +2583,7 @@ index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb53 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 f54be5414e003305257b29abe2e2ac38b9191dc2..6b3cfe10bc504b8a598f04feb0d88df19380e486 100644 +index 89cbf3eb4724a79027d2a9b0c2ff013fa3a04949..6e57930d195fc5cdbb04d0b977c46f518f7a128a 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -61,6 +61,7 @@ @@ -2594,7 +2594,7 @@ index f54be5414e003305257b29abe2e2ac38b9191dc2..6b3cfe10bc504b8a598f04feb0d88df1 #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3732,9 +3733,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -3731,9 +3732,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (roleValue() == AccessibilityRole::ApplicationDialog) return AccessibilityObjectInclusion::IncludeObject; @@ -9374,10 +9374,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 3c37fbf7146d39e8fa3050174f70fbc7f5fcb51e..d64a009948c274db21db74c52602f901dd89019b 100644 +index 3d89f35e99fa47cba2b0cc74cb40fefe6b1678c5..b5c7bf5272e47d9ca14dbf0dd03baabf8c509f0f 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -@@ -123,6 +123,10 @@ +@@ -122,6 +122,10 @@ #include #endif @@ -9388,7 +9388,7 @@ index 3c37fbf7146d39e8fa3050174f70fbc7f5fcb51e..d64a009948c274db21db74c52602f901 // FIXME: Seems like we could use std::tuple to cut down the code below a lot! namespace IPC { -@@ -1412,6 +1416,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature +@@ -1275,6 +1279,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature encoder << windowFeatures.resizable; encoder << windowFeatures.fullscreen; encoder << windowFeatures.dialog; @@ -9398,7 +9398,7 @@ index 3c37fbf7146d39e8fa3050174f70fbc7f5fcb51e..d64a009948c274db21db74c52602f901 } bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& windowFeatures) -@@ -1440,6 +1447,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win +@@ -1303,6 +1310,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win return false; if (!decoder.decode(windowFeatures.dialog)) return false; @@ -9411,7 +9411,7 @@ index 3c37fbf7146d39e8fa3050174f70fbc7f5fcb51e..d64a009948c274db21db74c52602f901 return true; } -@@ -1453,6 +1466,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) +@@ -1316,6 +1329,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) #if PLATFORM(COCOA) encoder << dragData.pasteboardName(); encoder << dragData.fileNames(); @@ -9423,7 +9423,7 @@ index 3c37fbf7146d39e8fa3050174f70fbc7f5fcb51e..d64a009948c274db21db74c52602f901 #endif encoder << dragData.dragDestinationActionMask(); encoder << dragData.pageID(); -@@ -1476,9 +1494,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1339,9 +1357,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(applicationFlags)) return false; @@ -9441,7 +9441,7 @@ index 3c37fbf7146d39e8fa3050174f70fbc7f5fcb51e..d64a009948c274db21db74c52602f901 if (!decoder.decode(pasteboardName)) return false; -@@ -1494,8 +1519,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1357,8 +1382,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(pageID)) return false; @@ -10003,10 +10003,10 @@ index 14bb808bb4d659faaca9df623a2ed3213dccf3ee..e36d2ea060310a90a73a0f8af7d96040 UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm UIProcess/Inspector/mac/WKInspectorViewController.mm diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt -index aea86652a260ea0dd130a442a3f5b479eda1f574..171476dc84ed2981059a82ee657feacd1ccd5c39 100644 +index c8d48a081abcb7cdb6ce4f7229e4ac64e5ecefbc..428636b072e631bdf02833720bd806cb8bbca3ed 100644 --- a/Source/WebKit/SourcesGTK.txt +++ b/Source/WebKit/SourcesGTK.txt -@@ -128,6 +128,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify +@@ -129,6 +129,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify UIProcess/API/glib/WebKitBackForwardList.cpp @no-unify UIProcess/API/glib/WebKitBackForwardListItem.cpp @no-unify @@ -10014,7 +10014,7 @@ index aea86652a260ea0dd130a442a3f5b479eda1f574..171476dc84ed2981059a82ee657feacd UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify UIProcess/API/glib/WebKitCookieManager.cpp @no-unify UIProcess/API/glib/WebKitCredential.cpp @no-unify -@@ -247,6 +248,7 @@ UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp +@@ -248,6 +249,7 @@ UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp UIProcess/cairo/BackingStoreCairo.cpp @no-unify @@ -10022,7 +10022,7 @@ index aea86652a260ea0dd130a442a3f5b479eda1f574..171476dc84ed2981059a82ee657feacd UIProcess/glib/WebPageProxyGLib.cpp UIProcess/glib/WebProcessPoolGLib.cpp UIProcess/glib/WebProcessProxyGLib.cpp -@@ -264,6 +266,7 @@ UIProcess/gtk/ClipboardGtk4.cpp @no-unify +@@ -265,6 +267,7 @@ UIProcess/gtk/ClipboardGtk4.cpp @no-unify UIProcess/gtk/WebDateTimePickerGtk.cpp UIProcess/gtk/GtkSettingsManager.cpp UIProcess/gtk/HardwareAccelerationManager.cpp @@ -10030,7 +10030,7 @@ index aea86652a260ea0dd130a442a3f5b479eda1f574..171476dc84ed2981059a82ee657feacd UIProcess/gtk/KeyBindingTranslator.cpp UIProcess/gtk/PointerLockManager.cpp @no-unify UIProcess/gtk/PointerLockManagerWayland.cpp @no-unify -@@ -276,6 +279,8 @@ UIProcess/gtk/WaylandCompositor.cpp @no-unify +@@ -277,6 +280,8 @@ UIProcess/gtk/WaylandCompositor.cpp @no-unify UIProcess/gtk/WebColorPickerGtk.cpp UIProcess/gtk/WebContextMenuProxyGtk.cpp UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp @@ -10040,7 +10040,7 @@ index aea86652a260ea0dd130a442a3f5b479eda1f574..171476dc84ed2981059a82ee657feacd UIProcess/gtk/WebPasteboardProxyGtk.cpp UIProcess/gtk/WebPopupMenuProxyGtk.cpp diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt -index f417f7cea69735cd2c558a3ec776982b17e51538..38fec53ff3ad872a2e37f3209ca2e4715bf24d87 100644 +index 24962250ca5c823c8679a94455bfb303b01e72c0..9783d5f1bb82aa307c1cfdf6ca4861abb8f653e0 100644 --- a/Source/WebKit/SourcesWPE.txt +++ b/Source/WebKit/SourcesWPE.txt @@ -87,6 +87,7 @@ Shared/glib/ProcessExecutablePathGLib.cpp @@ -10051,7 +10051,7 @@ index f417f7cea69735cd2c558a3ec776982b17e51538..38fec53ff3ad872a2e37f3209ca2e471 Shared/libwpe/NativeWebKeyboardEventLibWPE.cpp Shared/libwpe/NativeWebMouseEventLibWPE.cpp Shared/libwpe/NativeWebTouchEventLibWPE.cpp -@@ -121,6 +122,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify +@@ -122,6 +123,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify UIProcess/API/glib/WebKitBackForwardList.cpp @no-unify UIProcess/API/glib/WebKitBackForwardListItem.cpp @no-unify @@ -10059,7 +10059,7 @@ index f417f7cea69735cd2c558a3ec776982b17e51538..38fec53ff3ad872a2e37f3209ca2e471 UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify UIProcess/API/glib/WebKitCookieManager.cpp @no-unify UIProcess/API/glib/WebKitCredential.cpp @no-unify -@@ -155,6 +157,7 @@ UIProcess/API/glib/WebKitOptionMenu.cpp @no-unify +@@ -156,6 +158,7 @@ UIProcess/API/glib/WebKitOptionMenu.cpp @no-unify UIProcess/API/glib/WebKitOptionMenuItem.cpp @no-unify UIProcess/API/glib/WebKitPermissionRequest.cpp @no-unify UIProcess/API/glib/WebKitPlugin.cpp @no-unify @@ -10067,7 +10067,7 @@ index f417f7cea69735cd2c558a3ec776982b17e51538..38fec53ff3ad872a2e37f3209ca2e471 UIProcess/API/glib/WebKitPolicyDecision.cpp @no-unify UIProcess/API/glib/WebKitPrivate.cpp @no-unify UIProcess/API/glib/WebKitProtocolHandler.cpp @no-unify -@@ -189,6 +192,7 @@ UIProcess/API/wpe/InputMethodFilterWPE.cpp @no-unify +@@ -190,6 +193,7 @@ UIProcess/API/wpe/InputMethodFilterWPE.cpp @no-unify UIProcess/API/wpe/PageClientImpl.cpp @no-unify UIProcess/API/wpe/TouchGestureController.cpp @no-unify UIProcess/API/wpe/WebKitColor.cpp @no-unify @@ -10075,7 +10075,7 @@ index f417f7cea69735cd2c558a3ec776982b17e51538..38fec53ff3ad872a2e37f3209ca2e471 UIProcess/API/wpe/WebKitInputMethodContextWPE.cpp @no-unify UIProcess/API/wpe/WebKitPopupMenu.cpp @no-unify UIProcess/API/wpe/WebKitRectangle.cpp @no-unify -@@ -205,6 +209,7 @@ UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp +@@ -206,6 +210,7 @@ UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp UIProcess/geoclue/GeoclueGeolocationProvider.cpp @@ -10083,7 +10083,7 @@ index f417f7cea69735cd2c558a3ec776982b17e51538..38fec53ff3ad872a2e37f3209ca2e471 UIProcess/glib/WebPageProxyGLib.cpp UIProcess/glib/WebProcessPoolGLib.cpp UIProcess/glib/WebProcessProxyGLib.cpp -@@ -230,6 +235,11 @@ UIProcess/linux/MemoryPressureMonitor.cpp +@@ -231,6 +236,11 @@ UIProcess/linux/MemoryPressureMonitor.cpp UIProcess/soup/WebProcessPoolSoup.cpp @@ -10095,7 +10095,7 @@ index f417f7cea69735cd2c558a3ec776982b17e51538..38fec53ff3ad872a2e37f3209ca2e471 UIProcess/wpe/WebPageProxyWPE.cpp WebProcess/GPU/graphics/gbm/RemoteGraphicsContextGLProxyGBM.cpp -@@ -260,6 +270,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp +@@ -261,6 +271,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp @@ -10820,7 +10820,7 @@ index 78d1578f94793e9e59a3d4d2b33e79ea8530fa04..493cdadac3873508b3efa3048638e73a #endif +int webkitWebContextExistingCount(); diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp -index 484239165b6dd5352906e7741d17fd508b465bc9..fbff73e2aa3847c5ab1a7d0a2fe728b4b93b84e0 100644 +index 50e8f960e18a718152b465b94a375f83a9295b04..151756797374f34d6c51684a4f55c0a70657968e 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp @@ -32,6 +32,7 @@ @@ -11812,10 +11812,10 @@ index e0da4d3e5e457c1f1d785028f0245c9a610b8e30..22e42a550171be4940574901e2f84e3f #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index e445bba4c08a0a1fc810c69cf2dd1db7e82d780c..4868414f7c03f8e50c1f6a71b45f3168bf6f81aa 100644 +index 63d301372cfcaec642712f7a41a3ead5ea7a2cdc..5b243aa3f332b967c8ab27a64f06e9e81fea8c00 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -@@ -360,7 +360,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process +@@ -364,7 +364,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process auto screenProperties = WebCore::collectScreenProperties(); parameters.screenProperties = WTFMove(screenProperties); #if PLATFORM(MAC) @@ -11824,7 +11824,7 @@ index e445bba4c08a0a1fc810c69cf2dd1db7e82d780c..4868414f7c03f8e50c1f6a71b45f3168 #endif #if PLATFORM(IOS) -@@ -615,8 +615,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -619,8 +619,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -16495,7 +16495,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63cea674bb0 100644 +index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b950c516b9b 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -247,6 +247,9 @@ @@ -16807,7 +16807,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4728,6 +4880,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4731,6 +4883,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -16815,7 +16815,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4953,6 +5106,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4956,6 +5109,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -16824,7 +16824,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c // If the provisional page's load fails then we destroy the provisional page. if (m_provisionalPage && m_provisionalPage->mainFrame() == &frame && willContinueLoading == WillContinueLoading::No) m_provisionalPage = nullptr; -@@ -5432,7 +5587,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5435,7 +5590,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, NavigationActionData&& navigationActionData, FrameInfoData&& originatingFrameInfo, std::optional originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&& request, IPC::FormDataReference&& requestBody, WebCore::ResourceResponse&& redirectResponse, const UserData& userData, uint64_t listenerID) { @@ -16840,7 +16840,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -6021,6 +6183,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -6024,6 +6186,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa if (originatingPage) openerAppInitiatedState = originatingPage->lastNavigationWasAppInitiated(); @@ -16848,7 +16848,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c auto completionHandler = [this, protectedThis = Ref { *this }, mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement, openerAppInitiatedState = WTFMove(openerAppInitiatedState)] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -6067,6 +6230,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -6070,6 +6233,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -16856,7 +16856,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c } void WebPageProxy::exitFullscreenImmediately() -@@ -6126,6 +6290,10 @@ void WebPageProxy::closePage() +@@ -6129,6 +6293,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -16867,7 +16867,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -6162,6 +6330,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -6165,6 +6333,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f } runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { @@ -16876,7 +16876,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -6183,6 +6353,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -6186,6 +6356,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -16885,7 +16885,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { page.m_uiClient->runJavaScriptConfirm(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](bool result) mutable { -@@ -6206,6 +6378,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -6209,6 +6381,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -16894,7 +16894,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply), defaultValue](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { page.m_uiClient->runJavaScriptPrompt(page, message, defaultValue, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](auto& result) mutable { -@@ -6333,6 +6507,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6336,6 +6510,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -16903,7 +16903,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7597,6 +7773,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7600,6 +7776,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -16912,7 +16912,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c } break; } -@@ -7611,10 +7789,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7614,10 +7792,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) pageClient().wheelEventWasNotHandledByWebCore(oldestProcessedEvent); } @@ -16929,7 +16929,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c break; } -@@ -7623,7 +7804,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7626,7 +7807,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) case WebEvent::RawKeyDown: case WebEvent::Char: { LOG(KeyHandling, "WebPageProxy::didReceiveEvent: %s (queue empty %d)", webKeyboardEventTypeString(type), m_keyEventQueue.isEmpty()); @@ -16937,7 +16937,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7642,7 +7822,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7645,7 +7825,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) // The call to doneWithKeyEvent may close this WebPage. // Protect against this being destroyed. Ref protect(*this); @@ -16945,7 +16945,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7651,6 +7830,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7654,6 +7833,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -16953,7 +16953,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c } break; } -@@ -7984,7 +8164,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7987,7 +8167,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%{public}s", processTerminationReasonToString(reason)); @@ -16965,7 +16965,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8318,6 +8501,7 @@ static Span gpuMachServices() +@@ -8321,6 +8504,7 @@ static Span gpuMachServices() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -16973,7 +16973,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8510,6 +8694,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8513,6 +8697,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.httpsUpgradeEnabled = preferences().upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false; @@ -16982,7 +16982,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c #if PLATFORM(IOS) // FIXME: This is also being passed over the to WebProcess via the PreferencesStore. parameters.allowsDeprecatedSynchronousXMLHttpRequestDuringUnload = allowsDeprecatedSynchronousXMLHttpRequestDuringUnload(); -@@ -8582,6 +8768,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8585,6 +8771,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -16997,7 +16997,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8675,6 +8869,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8678,6 +8872,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17226,7 +17226,7 @@ index d18d9e197f8a366cd5efeaa63600bec4e7f1d9d6..3c9db1f1cb5523923ec010f935d88393 } diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index 62361654f39a1879689e15ae201f54537a122482..ee93de7e8b9766e84e6fea38b56a0890cca1f7bb 100644 +index 5593029e4f27efc9140ead901d1cc2646d8e9785..7221d3f5d792adc756305a397ca3f652cc2b97fe 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp @@ -534,6 +534,14 @@ void WebProcessPool::establishRemoteWorkerContextConnectionToNetworkProcess(Remo @@ -19326,7 +19326,7 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b6000578d4f 100644 +index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d0b8efe3a 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj @@ -1242,6 +1242,7 @@ @@ -19356,7 +19356,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 DF462E0F23F22F5500EFF35F /* WKHTTPCookieStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF462E1223F338BE00EFF35F /* WKContentWorldPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF84CEE4249AA24D009096F6 /* WKPDFHUDView.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF84CEE2249AA21F009096F6 /* WKPDFHUDView.mm */; }; -@@ -2283,6 +2296,8 @@ +@@ -2284,6 +2297,8 @@ E5BEF6822130C48000F31111 /* WebDataListSuggestionsDropdownIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = E5BEF6802130C47F00F31111 /* WebDataListSuggestionsDropdownIOS.h */; }; E5CB07DC20E1678F0022C183 /* WKFormColorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */; }; E5CBA76427A318E100DF7858 /* UnifiedSource120.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA75F27A3187800DF7858 /* UnifiedSource120.cpp */; }; @@ -19365,7 +19365,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 E5CBA76527A318E100DF7858 /* UnifiedSource118.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA76127A3187900DF7858 /* UnifiedSource118.cpp */; }; E5CBA76627A318E100DF7858 /* UnifiedSource116.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA76327A3187B00DF7858 /* UnifiedSource116.cpp */; }; E5CBA76727A318E100DF7858 /* UnifiedSource119.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA76027A3187900DF7858 /* UnifiedSource119.cpp */; }; -@@ -2299,6 +2314,9 @@ +@@ -2300,6 +2315,9 @@ EBA8D3B627A5E33F00CB7900 /* MockPushServiceConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = EBA8D3B027A5E33F00CB7900 /* MockPushServiceConnection.mm */; }; EBA8D3B727A5E33F00CB7900 /* PushServiceConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = EBA8D3B127A5E33F00CB7900 /* PushServiceConnection.mm */; }; ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -19375,7 +19375,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 F409BA181E6E64BC009DA28E /* WKDragDestinationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */; settings = {ATTRIBUTES = (Private, ); }; }; F4299507270E234D0032298B /* StreamMessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = F4299506270E234C0032298B /* StreamMessageReceiver.h */; }; F42D634122A0EFDF00D2FB3A /* WebAutocorrectionData.h in Headers */ = {isa = PBXBuildFile; fileRef = F42D633F22A0EFD300D2FB3A /* WebAutocorrectionData.h */; }; -@@ -5260,6 +5278,7 @@ +@@ -5261,6 +5279,7 @@ 5CABDC8522C40FCC001EDE8E /* WKMessageListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMessageListener.h; sourceTree = ""; }; 5CADDE0D2151AA010067D309 /* AuthenticationChallengeDisposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallengeDisposition.h; sourceTree = ""; }; 5CAECB5E27465AE300AB78D0 /* UnifiedSource115.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource115.cpp; path = "DerivedSources/WebKit/unified-sources/UnifiedSource115.cpp"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -19383,7 +19383,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 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 = ""; }; -@@ -6974,6 +6993,19 @@ +@@ -6975,6 +6994,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 = ""; }; @@ -19403,7 +19403,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 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 = ""; }; -@@ -7102,6 +7134,8 @@ +@@ -7104,6 +7136,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; }; @@ -19412,7 +19412,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 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; }; -@@ -7123,6 +7157,14 @@ +@@ -7125,6 +7159,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 = ""; }; @@ -19427,7 +19427,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 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 = ""; }; -@@ -7256,6 +7298,7 @@ +@@ -7258,6 +7300,7 @@ files = ( 3766F9EE189A1241003CF19B /* JavaScriptCore.framework in Frameworks */, 3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */, @@ -19435,7 +19435,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, -@@ -9398,6 +9441,7 @@ +@@ -9401,6 +9444,7 @@ 99788ACA1F421DCA00C08000 /* _WKAutomationSessionConfiguration.mm */, 990D28A81C6404B000986977 /* _WKAutomationSessionDelegate.h */, 990D28AF1C65203900986977 /* _WKAutomationSessionInternal.h */, @@ -19443,7 +19443,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 5C4609E222430E4C009943C2 /* _WKContentRuleListAction.h */, 5C4609E322430E4D009943C2 /* _WKContentRuleListAction.mm */, 5C4609E422430E4D009943C2 /* _WKContentRuleListActionInternal.h */, -@@ -10487,6 +10531,7 @@ +@@ -10490,6 +10534,7 @@ E34B110C27C46BC6006D2F2E /* libWebCoreTestShim.dylib */, E34B110F27C46D09006D2F2E /* libWebCoreTestSupport.dylib */, DDE992F4278D06D900F60D26 /* libWebKitAdditions.a */, @@ -19451,7 +19451,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 57A9FF15252C6AEF006A2040 /* libWTF.a */, 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, -@@ -11014,6 +11059,12 @@ +@@ -11017,6 +11062,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -19464,7 +19464,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 ); path = Agents; sourceTree = ""; -@@ -11022,6 +11073,7 @@ +@@ -11025,6 +11076,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -19472,7 +19472,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -11566,6 +11618,7 @@ +@@ -11569,6 +11621,7 @@ E1513C65166EABB200149FCB /* AuxiliaryProcessProxy.h */, 46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */, 46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */, @@ -19480,7 +19480,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 4659F25E275FF6B200BBB369 /* CaptivePortalModeObserver.h */, 07297F9C1C1711EA003F0735 /* DeviceIdHashSaltStorage.cpp */, 07297F9D1C17BBEA223F0735 /* DeviceIdHashSaltStorage.h */, -@@ -11583,6 +11636,8 @@ +@@ -11586,6 +11639,8 @@ 2DD5A72A1EBF09A7009BA597 /* HiddenPageThrottlingAutoIncreasesCounter.h */, 839A2F2F1E2067390039057E /* HighPerformanceGraphicsUsageSampler.cpp */, 839A2F301E2067390039057E /* HighPerformanceGraphicsUsageSampler.h */, @@ -19489,7 +19489,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 5CEABA2B2333251400797797 /* LegacyGlobalSettings.cpp */, 5CEABA2A2333247700797797 /* LegacyGlobalSettings.h */, 31607F3819627002009B87DA /* LegacySessionStateCoding.h */, -@@ -11612,6 +11667,7 @@ +@@ -11615,6 +11670,7 @@ 1A0C227D2451130A00ED614D /* QuickLookThumbnailingSoftLink.mm */, 1AEE57232409F142002005D6 /* QuickLookThumbnailLoader.h */, 1AEE57242409F142002005D6 /* QuickLookThumbnailLoader.mm */, @@ -19497,7 +19497,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 BC111B08112F5E3C00337BAB /* ResponsivenessTimer.cpp */, 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */, 5CA98549210BEB5A0057EB6B /* SafeBrowsingWarning.h */, -@@ -11712,6 +11768,8 @@ +@@ -11715,6 +11771,8 @@ BC7B6204129A0A6700D174A4 /* WebPageGroup.h */, 2D9EA3101A96D9EB002D2807 /* WebPageInjectedBundleClient.cpp */, 2D9EA30E1A96CBFF002D2807 /* WebPageInjectedBundleClient.h */, @@ -19506,7 +19506,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 BC111B0B112F5E4F00337BAB /* WebPageProxy.cpp */, BC032DCB10F4389F0058C15A /* WebPageProxy.h */, BCBD38FA125BAB9A00D2C29F /* WebPageProxy.messages.in */, -@@ -11864,6 +11922,7 @@ +@@ -11867,6 +11925,7 @@ BC646C1911DD399F006455B0 /* WKBackForwardListItemRef.h */, BC646C1611DD399F006455B0 /* WKBackForwardListRef.cpp */, BC646C1711DD399F006455B0 /* WKBackForwardListRef.h */, @@ -19514,7 +19514,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 BCB9E24A1120E15C00A137E0 /* WKContext.cpp */, BCB9E2491120E15C00A137E0 /* WKContext.h */, 1AE52F9319201F6B00A1FA37 /* WKContextConfigurationRef.cpp */, -@@ -12448,6 +12507,9 @@ +@@ -12451,6 +12510,9 @@ C18173602058424700DFDA65 /* DisplayLink.h */, 31ABA79C215AF9E000C90E31 /* HighPerformanceGPUManager.h */, 31ABA79D215AF9E000C90E31 /* HighPerformanceGPUManager.mm */, @@ -19524,7 +19524,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 1AFDE65B1954E8D500C48FFA /* LegacySessionStateCoding.cpp */, 0FCB4E5818BBE3D9000FCFC9 /* PageClientImplMac.h */, 0FCB4E5918BBE3D9000FCFC9 /* PageClientImplMac.mm */, -@@ -12474,6 +12536,8 @@ +@@ -12477,6 +12539,8 @@ E568B92120A3AC6A00E3C856 /* WebDataListSuggestionsDropdownMac.mm */, E55CD20124D09F1F0042DB9C /* WebDateTimePickerMac.h */, E55CD20224D09F1F0042DB9C /* WebDateTimePickerMac.mm */, @@ -19533,7 +19533,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 BC857E8512B71EBB00EDEB2E /* WebPageProxyMac.mm */, BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */, BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */, -@@ -13658,6 +13722,7 @@ +@@ -13661,6 +13725,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -19541,7 +19541,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -13906,6 +13971,7 @@ +@@ -13909,6 +13974,7 @@ E170876C16D6CA6900F99226 /* BlobRegistryProxy.h in Headers */, 4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */, 1A5705111BE410E600874AF1 /* BlockSPI.h in Headers */, @@ -19549,7 +19549,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 BC3065FA1259344E00E71278 /* CacheModel.h in Headers */, 41897ED81F415D8A0016FA42 /* CacheStorageEngine.h in Headers */, 41FABD2A1F4DE001006A6C97 /* CacheStorageEngineCache.h in Headers */, -@@ -14172,7 +14238,11 @@ +@@ -14175,7 +14241,11 @@ 2DD45ADE1E5F8972006C355F /* InputViewUpdateDeferrer.h in Headers */, CE550E152283752200D28791 /* InsertTextOptions.h in Headers */, 9197940523DBC4BB00257892 /* InspectorBrowserAgent.h in Headers */, @@ -19561,7 +19561,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 A5E391FD2183C1F800C8FB31 /* InspectorTargetProxy.h in Headers */, 51E9049C27BCB9D400929E7E /* InstallCoordinationSPI.h in Headers */, C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */, -@@ -14392,6 +14462,7 @@ +@@ -14395,6 +14465,7 @@ CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, @@ -19569,7 +19569,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -14450,6 +14521,7 @@ +@@ -14453,6 +14524,7 @@ E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */, E36FF00327F36FBD004BE21A /* SandboxStateVariables.h in Headers */, 7BAB111025DD02B3008FC479 /* ScopedActiveMessageReceiveQueue.h in Headers */, @@ -19577,7 +19577,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 E4D54D0421F1D72D007E3C36 /* ScrollingTreeFrameScrollingNodeRemoteIOS.h in Headers */, 0F931C1C18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h in Headers */, 0F931C1C18C5711900DBB8D4 /* ScrollingTreeScrollingNodeDelegateIOS.h in Headers */, -@@ -14798,6 +14870,8 @@ +@@ -14801,6 +14873,8 @@ 2D9EA30F1A96CBFF002D2807 /* WebPageInjectedBundleClient.h in Headers */, 9197940823DBC4CB00257892 /* WebPageInspectorAgentBase.h in Headers */, A513F5402154A5D700662841 /* WebPageInspectorController.h in Headers */, @@ -19586,7 +19586,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 A543E30C215C8A8D00279CD9 /* WebPageInspectorTarget.h in Headers */, A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, -@@ -16703,6 +16777,8 @@ +@@ -16729,6 +16803,8 @@ 51E9049727BCB3D900929E7E /* ICAppBundle.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -19595,7 +19595,7 @@ index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b60 C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */, C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */, 2984F588164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp in Sources */, -@@ -17037,6 +17113,8 @@ +@@ -17063,6 +17139,8 @@ E3816B3D27E2463A005EAFC0 /* WebMockContentFilterManager.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -19757,10 +19757,10 @@ index cfa563b7d34056c9375d4382ff42d55dab3daa14..baf0bdc4f441721d085ff86bd152a7cc } // namespace WebKit diff --git a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp -index 55f27e1460de28cfef51bbc37e5d828c7869d80e..25769cf2285b59d199c1901d2730426676a9bd0d 100644 +index 529ad5482554d07bd7bedbf3d48dc9f76e323c7c..b66401713b40e607f646414b90d6bf87c7e14d60 100644 --- a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp +++ b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp -@@ -195,9 +195,6 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR +@@ -197,9 +197,6 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR } m_coreLoader->didReceiveResponse(inspectorResponse, [this, protectedThis = WTFMove(protectedThis), interceptedRequestIdentifier, policyDecisionCompletionHandler = WTFMove(policyDecisionCompletionHandler), overrideData = WTFMove(overrideData)]() mutable { @@ -19770,7 +19770,7 @@ index 55f27e1460de28cfef51bbc37e5d828c7869d80e..25769cf2285b59d199c1901d27304266 if (!m_coreLoader || !m_coreLoader->identifier()) { m_interceptController.continueResponse(interceptedRequestIdentifier); return; -@@ -215,6 +212,8 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR +@@ -217,6 +214,8 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR } }); }); @@ -20227,7 +20227,7 @@ index f127d64d005ab7b93875591b94a5899205e91579..df0de26e4dc449a0fbf93e7037444df4 uint64_t m_navigationID; }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -index 9588700ed768321bf1fa6f5bb2979e5adf25629e..66cc52428e352cc71ea378e43c981e79035db23b 100644 +index 052623be7310bde73b3669cfb2a22dcb2d24ffdc..39cabdfacfa39eb2363085c5a30b6b4894db91ef 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp @@ -934,6 +934,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) @@ -20479,7 +20479,7 @@ index 9588700ed768321bf1fa6f5bb2979e5adf25629e..66cc52428e352cc71ea378e43c981e79 void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6994,6 +7107,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6995,6 +7108,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -21246,10 +21246,10 @@ index 62629b4c1c25ae82bd797b39bbf9de0331f8eed2..5de7900a29b0e629f1ac404bbb0dc5b4 typedef struct _BrowserWindow BrowserWindow; diff --git a/Tools/MiniBrowser/gtk/main.c b/Tools/MiniBrowser/gtk/main.c -index 817e8fec7e18b3fbde85aa534263def60458b1a8..e722f02eeb891538d2d5b1c2b7d4cd1c54046827 100644 +index c3beeba577d32dc32ea5f0fb80cd46ebe118bb34..ed7714a20ab2869d188aa1d30cee49f69e68db86 100644 --- a/Tools/MiniBrowser/gtk/main.c +++ b/Tools/MiniBrowser/gtk/main.c -@@ -57,7 +57,12 @@ static gboolean enableITP; +@@ -61,7 +61,12 @@ static gboolean enableITP; static gboolean enableSandbox; static gboolean exitAfterLoad; static gboolean webProcessCrashed; @@ -21262,7 +21262,7 @@ index 817e8fec7e18b3fbde85aa534263def60458b1a8..e722f02eeb891538d2d5b1c2b7d4cd1c typedef enum { MINI_BROWSER_ERROR_INVALID_ABOUT_PATH -@@ -152,6 +157,10 @@ static const GOptionEntry commandLineOptions[] = +@@ -156,6 +161,10 @@ static const GOptionEntry commandLineOptions[] = { "exit-after-load", 0, 0, G_OPTION_ARG_NONE, &exitAfterLoad, "Quit the browser after the load finishes", NULL }, { "time-zone", 't', 0, G_OPTION_ARG_STRING, &timeZone, "Set time zone", "TIMEZONE" }, { "version", 'v', 0, G_OPTION_ARG_NONE, &printVersion, "Print the WebKitGTK version", NULL }, @@ -21273,7 +21273,7 @@ index 817e8fec7e18b3fbde85aa534263def60458b1a8..e722f02eeb891538d2d5b1c2b7d4cd1c { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, 0, "[URL…]" }, { 0, 0, 0, 0, 0, 0, 0 } }; -@@ -620,6 +629,57 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul +@@ -624,6 +633,57 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul g_main_loop_quit(data->mainLoop); } @@ -21331,7 +21331,7 @@ index 817e8fec7e18b3fbde85aa534263def60458b1a8..e722f02eeb891538d2d5b1c2b7d4cd1c static void startup(GApplication *application) { const char *actionAccels[] = { -@@ -650,10 +710,22 @@ static void startup(GApplication *application) +@@ -654,10 +714,22 @@ static void startup(GApplication *application) static void activate(GApplication *application, WebKitSettings *webkitSettings) { @@ -21356,7 +21356,7 @@ index 817e8fec7e18b3fbde85aa534263def60458b1a8..e722f02eeb891538d2d5b1c2b7d4cd1c char *dataDirectory = g_build_filename(g_get_user_data_dir(), "webkitgtk-" WEBKITGTK_API_VERSION_STRING, "MiniBrowser", NULL); char *cacheDirectory = g_build_filename(g_get_user_cache_dir(), "webkitgtk-" WEBKITGTK_API_VERSION_STRING, "MiniBrowser", NULL); manager = webkit_website_data_manager_new("base-data-directory", dataDirectory, "base-cache-directory", cacheDirectory, NULL); -@@ -678,6 +750,7 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings) +@@ -682,6 +754,7 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings) #endif "time-zone-override", timeZone, NULL); @@ -21364,7 +21364,7 @@ index 817e8fec7e18b3fbde85aa534263def60458b1a8..e722f02eeb891538d2d5b1c2b7d4cd1c g_object_unref(manager); if (enableSandbox) -@@ -759,9 +832,7 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings) +@@ -763,9 +836,7 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings) if (exitAfterLoad) exitAfterWebViewLoadFinishes(webView, application); } @@ -21375,8 +21375,8 @@ index 817e8fec7e18b3fbde85aa534263def60458b1a8..e722f02eeb891538d2d5b1c2b7d4cd1c } } else { WebKitWebView *webView = createBrowserTab(mainWindow, webkitSettings, userContentManager, defaultWebsitePolicies); -@@ -805,7 +876,7 @@ int main(int argc, char *argv[]) - g_option_context_add_group(context, gtk_get_option_group(TRUE)); +@@ -812,7 +883,7 @@ int main(int argc, char *argv[]) + g_option_context_add_group(context, gst_init_get_option_group()); #endif - WebKitSettings *webkitSettings = webkit_settings_new(); @@ -21384,7 +21384,7 @@ index 817e8fec7e18b3fbde85aa534263def60458b1a8..e722f02eeb891538d2d5b1c2b7d4cd1c webkit_settings_set_enable_developer_extras(webkitSettings, TRUE); webkit_settings_set_enable_webgl(webkitSettings, TRUE); webkit_settings_set_enable_media_stream(webkitSettings, TRUE); -@@ -837,9 +908,11 @@ int main(int argc, char *argv[]) +@@ -844,9 +915,11 @@ int main(int argc, char *argv[]) } GtkApplication *application = gtk_application_new("org.webkitgtk.MiniBrowser", G_APPLICATION_NON_UNIQUE); @@ -21397,10 +21397,10 @@ index 817e8fec7e18b3fbde85aa534263def60458b1a8..e722f02eeb891538d2d5b1c2b7d4cd1c return exitAfterLoad && webProcessCrashed ? 1 : 0; diff --git a/Tools/MiniBrowser/wpe/main.cpp b/Tools/MiniBrowser/wpe/main.cpp -index cd1d3647c8bfaa6cc9642ce63060a5aa6c594791..1e0516b437d01e8af70da1e8865b7840514522e7 100644 +index 38fd6896339c7ca66e5f31ff6ad93cc0f330f7e5..f154e7e7da2f03f4a34e6e329ad5f38a33690b57 100644 --- a/Tools/MiniBrowser/wpe/main.cpp +++ b/Tools/MiniBrowser/wpe/main.cpp -@@ -41,6 +41,9 @@ static gboolean headlessMode; +@@ -45,6 +45,9 @@ static gboolean headlessMode; static gboolean privateMode; static gboolean automationMode; static gboolean ignoreTLSErrors; @@ -21410,7 +21410,7 @@ index cd1d3647c8bfaa6cc9642ce63060a5aa6c594791..1e0516b437d01e8af70da1e8865b7840 static const char* contentFilter; static const char* cookiesFile; static const char* cookiesPolicy; -@@ -66,6 +69,9 @@ static const GOptionEntry commandLineOptions[] = +@@ -70,6 +73,9 @@ static const GOptionEntry commandLineOptions[] = { "enable-itp", 0, 0, G_OPTION_ARG_NONE, &enableITP, "Enable Intelligent Tracking Prevention (ITP)", nullptr }, { "time-zone", 't', 0, G_OPTION_ARG_STRING, &timeZone, "Set time zone", "TIMEZONE" }, { "version", 'v', 0, G_OPTION_ARG_NONE, &printVersion, "Print the WPE version", nullptr }, @@ -21420,7 +21420,7 @@ index cd1d3647c8bfaa6cc9642ce63060a5aa6c594791..1e0516b437d01e8af70da1e8865b7840 { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, nullptr, "[URL]" }, { nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr } }; -@@ -150,13 +156,36 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul +@@ -154,13 +160,36 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul g_main_loop_quit(data->mainLoop); } @@ -21458,7 +21458,7 @@ index cd1d3647c8bfaa6cc9642ce63060a5aa6c594791..1e0516b437d01e8af70da1e8865b7840 { auto backend = createViewBackend(1280, 720); struct wpe_view_backend* wpeBackend = backend->backend(); -@@ -168,17 +197,88 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi +@@ -172,17 +201,88 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi delete static_cast(data); }, backend.release()); @@ -21549,7 +21549,7 @@ index cd1d3647c8bfaa6cc9642ce63060a5aa6c594791..1e0516b437d01e8af70da1e8865b7840 int main(int argc, char *argv[]) { #if ENABLE_DEVELOPER_MODE -@@ -210,6 +310,16 @@ int main(int argc, char *argv[]) +@@ -218,6 +318,16 @@ int main(int argc, char *argv[]) } auto* loop = g_main_loop_new(nullptr, FALSE); @@ -21566,7 +21566,7 @@ index cd1d3647c8bfaa6cc9642ce63060a5aa6c594791..1e0516b437d01e8af70da1e8865b7840 auto backend = createViewBackend(1280, 720); struct wpe_view_backend* wpeBackend = backend->backend(); -@@ -219,7 +329,15 @@ int main(int argc, char *argv[]) +@@ -227,7 +337,15 @@ int main(int argc, char *argv[]) return 1; } @@ -21583,7 +21583,7 @@ index cd1d3647c8bfaa6cc9642ce63060a5aa6c594791..1e0516b437d01e8af70da1e8865b7840 webkit_website_data_manager_set_itp_enabled(manager, enableITP); if (proxy) { -@@ -232,6 +350,7 @@ int main(int argc, char *argv[]) +@@ -240,6 +358,7 @@ int main(int argc, char *argv[]) webkit_website_data_manager_set_tls_errors_policy(manager, WEBKIT_TLS_ERRORS_POLICY_IGNORE); auto* webContext = WEBKIT_WEB_CONTEXT(g_object_new(WEBKIT_TYPE_WEB_CONTEXT, "website-data-manager", manager, "time-zone-override", timeZone, nullptr)); @@ -21591,7 +21591,7 @@ index cd1d3647c8bfaa6cc9642ce63060a5aa6c594791..1e0516b437d01e8af70da1e8865b7840 g_object_unref(manager); if (cookiesPolicy) { -@@ -290,7 +409,14 @@ int main(int argc, char *argv[]) +@@ -298,7 +417,14 @@ int main(int argc, char *argv[]) auto* viewBackend = webkit_web_view_backend_new(wpeBackend, [](gpointer data) { delete static_cast(data); }, backend.release()); @@ -21607,7 +21607,7 @@ index cd1d3647c8bfaa6cc9642ce63060a5aa6c594791..1e0516b437d01e8af70da1e8865b7840 auto* webView = WEBKIT_WEB_VIEW(g_object_new(WEBKIT_TYPE_WEB_VIEW, "backend", viewBackend, "web-context", webContext, -@@ -307,8 +433,6 @@ int main(int argc, char *argv[]) +@@ -315,8 +441,6 @@ int main(int argc, char *argv[]) backendPtr->setAccessibleChild(ATK_OBJECT(accessible)); #endif @@ -21616,7 +21616,7 @@ index cd1d3647c8bfaa6cc9642ce63060a5aa6c594791..1e0516b437d01e8af70da1e8865b7840 webkit_web_context_set_automation_allowed(webContext, automationMode); g_signal_connect(webContext, "automation-started", G_CALLBACK(automationStartedCallback), webView); g_signal_connect(webView, "permission-request", G_CALLBACK(decidePermissionRequest), nullptr); -@@ -321,16 +445,9 @@ int main(int argc, char *argv[]) +@@ -329,16 +453,9 @@ int main(int argc, char *argv[]) webkit_web_view_set_background_color(webView, &color); if (uriArguments) { @@ -21636,7 +21636,7 @@ index cd1d3647c8bfaa6cc9642ce63060a5aa6c594791..1e0516b437d01e8af70da1e8865b7840 webkit_web_view_load_uri(webView, "about:blank"); else webkit_web_view_load_uri(webView, "https://wpewebkit.org"); -@@ -340,8 +457,7 @@ int main(int argc, char *argv[]) +@@ -348,8 +465,7 @@ int main(int argc, char *argv[]) g_hash_table_destroy(openViews); @@ -21657,10 +21657,10 @@ index ef4407cfc114e602d98ed81724da504f453e258f..448dd483715162baba484f756fbcc1d7 + add_subdirectory(Playwright/win) endif () diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit -index 00664ad09f902ba55d79426ac3c3a472670529d0..1c12f1969fcc5bc0ce9bbd0931febbc01aa60d49 100755 +index 3401b5cf9c25d4b7932cf2fba29f038e4bed2345..7d005e1671b79f1e1fc73e69eea243c0d010afd3 100755 --- a/Tools/Scripts/build-webkit +++ b/Tools/Scripts/build-webkit -@@ -252,7 +252,7 @@ if (isAppleCocoaWebKit()) { +@@ -256,7 +256,7 @@ if (isAppleCocoaWebKit()) { push @projects, ("Source/WebKit"); if (!isEmbeddedWebKit()) { @@ -22922,10 +22922,10 @@ index b0a503013185f29feeca47e4313b27e349973c02..ee1f87780a99b2b626b1ada984d63109 + } // namespace WTR diff --git a/Tools/glib/dependencies/apt b/Tools/glib/dependencies/apt -index 017c992209e39859a0b56c1145bb79d9fdc6e939..d438dbf99c57f3d8b38b9f7b2f0e9069c2695baf 100644 +index dbf1d28ab1e501e26af3a188465267e3b1d521a6..23df2162e3eb12b4e974100d966d5cab67dd071c 100644 --- a/Tools/glib/dependencies/apt +++ b/Tools/glib/dependencies/apt -@@ -45,9 +45,11 @@ PACKAGES=( +@@ -56,9 +56,11 @@ PACKAGES=( libwayland-dev libwebp-dev libwoff-dev @@ -22937,14 +22937,6 @@ index 017c992209e39859a0b56c1145bb79d9fdc6e939..d438dbf99c57f3d8b38b9f7b2f0e9069 ruby # These are dependencies necessary for running tests. -@@ -58,7 +60,6 @@ PACKAGES=( - libcgi-pm-perl - psmisc - pulseaudio-utils -- python-gi - ruby-highline - ruby-json - diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules index 3eb911ba48eca35de2de9ee671cb577a0a96ec27..916b45a541486e59380d66b524a004a77d955ed8 100644 --- a/Tools/gtk/jhbuild.modules