diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index b06c3abaca..3394260e0f 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1669 -Changed: yurys@chromium.org Tue 21 Jun 2022 12:39:05 PM PDT +1670 +Changed: dpino@igalia.com Thu Jun 23 10:28:43 AM HKT 2022 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 13a342b638..a65a5addc4 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="9c7c94e0a7964e9b297182ad668d2bdebba74202" +BASE_REVISION="6e14685cafbd406eb0bf2a9dac5d3518213183a1" diff --git a/browser_patches/webkit/build.sh b/browser_patches/webkit/build.sh index dee53b66b7..063d2c413f 100755 --- a/browser_patches/webkit/build.sh +++ b/browser_patches/webkit/build.sh @@ -53,7 +53,7 @@ fi if is_mac; then selectXcodeVersionOrDie $(node "$SCRIPT_FOLDER/../get_xcode_version.js" webkit) - ./Tools/Scripts/build-webkit --release --touch-events --orientation-events --no-use-workspace + ./Tools/Scripts/build-webkit --release --touch-events --orientation-events elif is_linux; then if [[ $# == 0 || (-z "$1") ]]; then echo diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index f68c6b9fa9..de37bf023a 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -31,10 +31,10 @@ index 0aa6bbc263dcefd52c5660a3c16a517116b2482d..73a0bfbd99e77e4a00f590a4c206b2cf ${JAVASCRIPTCORE_DIR}/inspector/protocol/ServiceWorker.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Target.json diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make -index 19f09213a6f7ddade2380ac3d60d24aab99ade5a..5f049b829ec3fd1b87c9130ddaca14fc1844c741 100644 +index 0fd5ff880ac1add676c385722decd3a74468d78d..03eae0d873add089da986df79b762ebdd2acc8f4 100644 --- a/Source/JavaScriptCore/DerivedSources.make +++ b/Source/JavaScriptCore/DerivedSources.make -@@ -292,22 +292,27 @@ INSPECTOR_DOMAINS := \ +@@ -290,22 +290,27 @@ INSPECTOR_DOMAINS := \ $(JavaScriptCore)/inspector/protocol/CSS.json \ $(JavaScriptCore)/inspector/protocol/Canvas.json \ $(JavaScriptCore)/inspector/protocol/Console.json \ @@ -2006,10 +2006,10 @@ index e4b94b59216277aae01696e6d4846abf8f287dce..8cbe085788ba582ee4615faef20769b6 isa = XCConfigurationList; buildConfigurations = ( diff --git a/Source/WTF/Scripts/Preferences/WebPreferences.yaml b/Source/WTF/Scripts/Preferences/WebPreferences.yaml -index b5f8fd479df19c98317b1113fff01be9b7da0685..6c96c4924a1d01eabc0b066bf576a44da0693b55 100644 +index d5570255afc5eb0f43b5bcb9a621355daf360db6..82d4528e0716740d15b3ddc5c407e3bebd2cb056 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferences.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferences.yaml -@@ -965,7 +965,7 @@ InspectorStartsAttached: +@@ -977,7 +977,7 @@ InspectorStartsAttached: exposed: [ WebKit ] defaultValue: WebKit: @@ -2018,7 +2018,7 @@ index b5f8fd479df19c98317b1113fff01be9b7da0685..6c96c4924a1d01eabc0b066bf576a44d InspectorWindowFrame: type: String -@@ -1724,6 +1724,17 @@ PluginsEnabled: +@@ -1736,6 +1736,17 @@ PluginsEnabled: WebCore: default: false @@ -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 36acbf05d78808c8a9e7533087a850819f9e2221..3a16b04cd9c3cb873ff331f8b0599c7cf447add9 100644 +index cbb7afb4a4d74a039dfe3c4fa8ebc750d7c79e8e..a232ef7d45585851996169b2506c31f5207c2469 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -503,7 +503,7 @@ CrossOriginOpenerPolicyEnabled: @@ -2088,10 +2088,10 @@ index 36acbf05d78808c8a9e7533087a850819f9e2221..3a16b04cd9c3cb873ff331f8b0599c7c UserGesturePromisePropagationEnabled: diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml -index a12654571fa6e364f9490a59b3543496cfaa7aaf..1246e7b0296bf477e4782b51364b29b44c3f040c 100644 +index 03e44cf23a5f2a02d34a5c45b4061b2468628d0b..781a061f018f97b47e6da586b6d933c0dace5952 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml -@@ -905,6 +905,7 @@ UseCGDisplayListsForDOMRendering: +@@ -918,6 +918,7 @@ UseCGDisplayListsForDOMRendering: WebKit: default: true @@ -2099,7 +2099,7 @@ index a12654571fa6e364f9490a59b3543496cfaa7aaf..1246e7b0296bf477e4782b51364b29b4 UseGPUProcessForCanvasRenderingEnabled: type: bool humanReadableName: "GPU Process: Canvas Rendering" -@@ -915,7 +916,7 @@ UseGPUProcessForCanvasRenderingEnabled: +@@ -928,7 +929,7 @@ UseGPUProcessForCanvasRenderingEnabled: defaultValue: WebKit: "ENABLE(GPU_PROCESS_BY_DEFAULT)": true @@ -2109,7 +2109,7 @@ index a12654571fa6e364f9490a59b3543496cfaa7aaf..1246e7b0296bf477e4782b51364b29b4 UseGPUProcessForMediaEnabled: diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index 89838c8a9f88d1a5d062b2b3a7619d819f945c8f..480cac1b65fa3e4d5defab45a62753739ebd29f7 100644 +index 5ad56f9bc9b46939b719a2a8bcfe5196286fc22f..b9e2ca132f66c60dce682c857356147b7442846b 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h @@ -416,7 +416,7 @@ @@ -2131,10 +2131,10 @@ index 89838c8a9f88d1a5d062b2b3a7619d819f945c8f..480cac1b65fa3e4d5defab45a6275373 #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index dbe21780fb9e4831616ec70e4fddc15554bcb699..3419ac6dc056f3bd54a752d711a6f9ca2f21d06b 100644 +index cea074e8b58caa50312bdf52760cf504f446da05..24d7fd9ba4e84125f4294292b062c8a385f4283b 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h -@@ -243,7 +243,7 @@ +@@ -247,7 +247,7 @@ #define ENABLE_DATA_DETECTION 1 #endif @@ -2156,7 +2156,7 @@ index bb01bfeeac63f854fa656ec6b8d262fafc4c9df5..f8376ea8aada69d2e53734ba8fd234c2 if (Journald_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 7c6dc376eb433b7c3bf27af79a2a1fe7a84b42c3..5897572a6b9929483db8a9195dff67a4b0e1995c 100644 +index 50fbc3a00a9c01e4bbc359851e32ae5dd55e1cc5..4a06a92890ce2d0c56cce93eefd78b5559b4c2d7 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -426,7 +426,7 @@ @@ -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 c0b4c7bdb834386cc7fdcceda6f1ca3931ad46bb..d6d9c2d3c07b0878e23dad08f3afc858e000c308 100644 +index 0bde451102e4376097b3ad13bdbe0fcc8dc652e8..97eb39d89500d97eede9a328470eaddf73f05d2e 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5551,6 +5551,13 @@ +@@ -5555,6 +5555,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 c0b4c7bdb834386cc7fdcceda6f1ca3931ad46bb..d6d9c2d3c07b0878e23dad08f3afc858 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, ); }; }; -@@ -17927,6 +17934,14 @@ +@@ -17942,6 +17949,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 c0b4c7bdb834386cc7fdcceda6f1ca3931ad46bb..d6d9c2d3c07b0878e23dad08f3afc858 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 = ""; }; -@@ -24615,6 +24630,11 @@ +@@ -24632,6 +24647,11 @@ BC4A5324256055590028C592 /* TextDirectionSubmenuInclusionBehavior.h */, 2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */, 2D4F96F21A1ECC240098BF88 /* TextIndicator.h */, @@ -2405,68 +2405,7 @@ index c0b4c7bdb834386cc7fdcceda6f1ca3931ad46bb..d6d9c2d3c07b0878e23dad08f3afc858 F48570A42644C76D00C05F71 /* TranslationContextMenuInfo.h */, F4E1965F21F26E4E00285078 /* UndoItem.cpp */, 2ECDBAD521D8906300F00ECD /* UndoItem.h */, -@@ -24756,8 +24776,6 @@ - 6FB7D2D5250FD7B5000207AA /* flex */ = { - isa = PBXGroup; - children = ( -- 6F047A9128453EDB00C25EE7 /* FlexLayout.h */, -- 6F047A9028453ED200C25EE7 /* FlexLayout.cpp */, - 6FB17475283A8FF40067D8CA /* FlexFormattingConstraints.h */, - 6FB7D2D7250FD7E5000207AA /* FlexFormattingContext.cpp */, - 6FB7D2D9250FD7FC000207AA /* FlexFormattingContext.h */, -@@ -24765,6 +24783,8 @@ - 6FF911F626487FC8002021DF /* FlexFormattingGeometry.h */, - 6FB7D2D8250FD7EF000207AA /* FlexFormattingState.cpp */, - 6FB7D2DA250FD7FC000207AA /* FlexFormattingState.h */, -+ 6F047A9028453ED200C25EE7 /* FlexLayout.cpp */, -+ 6F047A9128453EDB00C25EE7 /* FlexLayout.h */, - 6FB9105B2830BC8A00004929 /* FlexRect.h */, - ); - path = flex; -@@ -29443,6 +29463,8 @@ - B23540F00D00782E002382FA /* StringTruncator.cpp */, - B23540F10D00782E002382FA /* StringTruncator.h */, - 087558C413B4A57D00F49307 /* SurrogatePairAwareTextIterator.h */, -+ 1C4C77DE284DA83900BD0936 /* SystemFontDatabase.cpp */, -+ 1C4C77DF284DA83900BD0936 /* SystemFontDatabase.h */, - 95E9F44427C9A39B00945337 /* SystemImage.h */, - 3BB6B80F22A7D311003A2A69 /* TabSize.h */, - 722AF2E327E1CF110078D997 /* TextBoxIterator.h */, -@@ -29471,8 +29493,6 @@ - 501BAAA813950E2C00F7ACEB /* WindRule.h */, - 379919941200DDF400EA041C /* WOFFFileFormat.cpp */, - 379919951200DDF400EA041C /* WOFFFileFormat.h */, -- 1C4C77DE284DA83900BD0936 /* SystemFontDatabase.cpp */, -- 1C4C77DF284DA83900BD0936 /* SystemFontDatabase.h */, - ); - path = graphics; - sourceTree = ""; -@@ -29570,6 +29590,7 @@ - F48D2AA32159740D00C6752B /* ColorCocoa.h */, - F48D2AA42159740D00C6752B /* ColorCocoa.mm */, - B275354C0B053814002CE64F /* FloatRectCocoa.mm */, -+ 1C16B86C284D73EF00318FEC /* FontCacheCocoa.mm */, - 1C3969CF1B74211E002BCFA7 /* FontCacheCoreText.cpp */, - C2458E611FE8979E00594759 /* FontCacheCoreText.h */, - B2AFFC780D00A5C10030074D /* FontCascadeCocoa.cpp */, -@@ -29600,6 +29621,7 @@ - CDEB3D7324C41A6E001FBEEF /* SourceBufferParser.h */, - CD8F667024C0F208000C421C /* SourceBufferParserWebM.cpp */, - CD8F667224C0F208000C421C /* SourceBufferParserWebM.h */, -+ 1C16B86A284D6B8200318FEC /* SystemFontDatabaseCocoa.mm */, - E4E8B4ED216B79F400B8834D /* SystemFontDatabaseCoreText.cpp */, - E4E8B4EA216B79E500B8834D /* SystemFontDatabaseCoreText.h */, - 526724F21CB2FDF60075974D /* TextTrackRepresentationCocoa.h */, -@@ -29617,8 +29639,6 @@ - 07F5CFF42582A4F800662EF5 /* WebMAudioUtilitiesCocoa.h */, - 07F5CFF22582A4F800662EF5 /* WebMAudioUtilitiesCocoa.mm */, - 7B1619102719880E00C40EAC /* WebProcessGraphicsContextGLCocoa.mm */, -- 1C16B86C284D73EF00318FEC /* FontCacheCocoa.mm */, -- 1C16B86A284D6B8200318FEC /* SystemFontDatabaseCocoa.mm */, - ); - path = cocoa; - sourceTree = ""; -@@ -30422,6 +30442,8 @@ +@@ -30447,6 +30467,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2475,7 +2414,7 @@ index c0b4c7bdb834386cc7fdcceda6f1ca3931ad46bb..d6d9c2d3c07b0878e23dad08f3afc858 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -32732,6 +32754,7 @@ +@@ -32758,6 +32780,7 @@ AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, @@ -2483,47 +2422,7 @@ index c0b4c7bdb834386cc7fdcceda6f1ca3931ad46bb..d6d9c2d3c07b0878e23dad08f3afc858 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, 7CE7FA591EF882300060C9D6 /* DocumentTouch.h */, A8185F3209765765005826D9 /* DocumentType.cpp */, -@@ -34042,6 +34065,7 @@ - 7A45033018DB717200377B34 /* BufferedLineReader.h in Headers */, - 2DFA488F1DB541D000362B99 /* BufferSource.h in Headers */, - F55B3DB01251F12D003EF269 /* ButtonInputType.h in Headers */, -+ 72C11DAD2849425800E826DD /* ByteArrayPixelBuffer.h in Headers */, - 07C046C41E42508B007201E7 /* CAAudioStreamDescription.h in Headers */, - 6353E1E61F91743100A34208 /* CachedApplicationManifest.h in Headers */, - BCB16C1A0979C3BD00467741 /* CachedCSSStyleSheet.h in Headers */, -@@ -34926,6 +34950,7 @@ - 6FB7D2DD250FD828000207AA /* FlexFormattingContext.h in Headers */, - 6FF911F726487FC8002021DF /* FlexFormattingGeometry.h in Headers */, - 6FB7D2DE250FD82E000207AA /* FlexFormattingState.h in Headers */, -+ 6F047A9228453EDB00C25EE7 /* FlexLayout.h in Headers */, - 6FB9105C2830BC8A00004929 /* FlexRect.h in Headers */, - 6FFDC442212EFF1700A9CA91 /* FloatAvoider.h in Headers */, - BC073BAA0C399B1F000F5979 /* FloatConversion.h in Headers */, -@@ -35335,6 +35360,7 @@ - 7C7903B31F86F95C00463A70 /* ImageBitmapRenderingContext.h in Headers */, - 318EAD4D1FA91380008CEF86 /* ImageBitmapRenderingContextSettings.h in Headers */, - B2A10B920B3818BD00099AA4 /* ImageBuffer.h in Headers */, -+ 724DCF2328486C9B0026ACF4 /* ImageBufferAllocator.h in Headers */, - 72BAC3AE23E1F0B0008D741C /* ImageBufferBackend.h in Headers */, - 550640B02407587E00AAE045 /* ImageBufferCGBackend.h in Headers */, - 2D7705C925528D34001D0C94 /* ImageBufferCGBitmapBackend.h in Headers */, -@@ -35355,7 +35381,6 @@ - BC7F44A80B9E324E00A9D081 /* ImageObserver.h in Headers */, - 2D5A5931152525D00036EE51 /* ImageOrientation.h in Headers */, - F46D5386273D7E460009FA80 /* ImageOverlay.h in Headers */, -- 6F047A9228453EDB00C25EE7 /* FlexLayout.h in Headers */, - F482434B260C33060022497C /* ImageOverlayController.h in Headers */, - F446EDE1265DB1E50031DA8F /* ImageOverlayDataDetectionResultIdentifier.h in Headers */, - 72283F0E230B268C00F5D828 /* ImagePaintingOptions.h in Headers */, -@@ -35389,7 +35414,6 @@ - 517138F81BF128BB000D5F01 /* IndexValueStore.h in Headers */, - CD063F831E23FA8900812BE3 /* InitDataRegistry.h in Headers */, - E4F819C626FB4EBF0094E162 /* InlineBoxPainter.h in Headers */, -- 72C11DAD2849425800E826DD /* ByteArrayPixelBuffer.h in Headers */, - E30592641E27A3AD00D57C98 /* InlineClassicScript.h in Headers */, - 6FE198172178397C00446F08 /* InlineContentBreaker.h in Headers */, - 111FA1C826F0F30F003B8F16 /* InlineDamage.h in Headers */, -@@ -37022,6 +37046,8 @@ +@@ -37053,6 +37076,8 @@ 1AD8F81B11CAB9E900E93E54 /* PlatformStrategies.h in Headers */, 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, @@ -2532,31 +2431,7 @@ index c0b4c7bdb834386cc7fdcceda6f1ca3931ad46bb..d6d9c2d3c07b0878e23dad08f3afc858 CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, -@@ -37354,7 +37380,6 @@ - BE20507E18A458C20080647E /* RenderVTTCue.h in Headers */, - A871DFE40A15376B00B12A68 /* RenderWidget.h in Headers */, - A89CCC530F44E98100B5DA10 /* ReplaceNodeWithSpanCommand.h in Headers */, -- 1CFD5D7E284DBE7F00089667 /* SystemFontDatabase.h in Headers */, - 2DF512CE1D873E47001D6780 /* ReplaceRangeWithTextCommand.h in Headers */, - 93309E0A099E64920056E581 /* ReplaceSelectionCommand.h in Headers */, - 071C00342707D95500D027C7 /* ReplayKitCaptureSource.h in Headers */, -@@ -37821,7 +37846,6 @@ - 0FF50272102BA96A0066F39A /* StyleMedia.h in Headers */, - BC5EB74E0E81E06700B25965 /* StyleMultiColData.h in Headers */, - E4DACE6A1D12E10B0075980F /* StylePendingResources.h in Headers */, -- 724DCF2328486C9B0026ACF4 /* ImageBufferAllocator.h in Headers */, - A80E6DFC0A199067007FB8C5 /* StyleProperties.h in Headers */, - 4BD781BF21C1965F00D9703E /* StylePropertyMap.h in Headers */, - 4BAFD0CF2190F9B500C0AB64 /* StylePropertyMapReadOnly.h in Headers */, -@@ -38062,6 +38086,7 @@ - 517A53461F50C17F00DCDC0A /* SWServerWorker.h in Headers */, - E180811716FCF9CB00B80D07 /* SynchronousLoaderClient.h in Headers */, - C1692DD523D23E08006E88F7 /* SystemBattery.h in Headers */, -+ 1CFD5D7E284DBE7F00089667 /* SystemFontDatabase.h in Headers */, - E4E8B4EC216B79E500B8834D /* SystemFontDatabaseCoreText.h in Headers */, - 95E9F44627C9A39C00945337 /* SystemImage.h in Headers */, - 0F03C0741884695E00A5F8CA /* SystemMemory.h in Headers */, -@@ -38167,6 +38192,7 @@ +@@ -38197,6 +38222,7 @@ 0F54DD081881D5F5003EEDBB /* Touch.h in Headers */, 71B7EE0D21B5C6870031C1EF /* TouchAction.h in Headers */, 0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */, @@ -2564,7 +2439,7 @@ index c0b4c7bdb834386cc7fdcceda6f1ca3931ad46bb..d6d9c2d3c07b0878e23dad08f3afc858 0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */, 070334D71459FFD5008D8D45 /* TrackBase.h in Headers */, BE88E0C21715CE2600658D98 /* TrackListBase.h in Headers */, -@@ -39123,6 +39149,7 @@ +@@ -39153,6 +39179,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2572,7 +2447,7 @@ index c0b4c7bdb834386cc7fdcceda6f1ca3931ad46bb..d6d9c2d3c07b0878e23dad08f3afc858 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */, -@@ -39199,6 +39226,9 @@ +@@ -39229,6 +39256,9 @@ C1692DD223D23ABD006E88F7 /* SystemBattery.mm in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2583,7 +2458,7 @@ index c0b4c7bdb834386cc7fdcceda6f1ca3931ad46bb..d6d9c2d3c07b0878e23dad08f3afc858 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 89cbf3eb4724a79027d2a9b0c2ff013fa3a04949..6e57930d195fc5cdbb04d0b977c46f518f7a128a 100644 +index 1e7f09000c0cd721939b4c6ea9068ebcb54cb1f6..6d13ccfa71ee59296339a5cd451933965da9c75d 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -61,6 +61,7 @@ @@ -2594,7 +2469,7 @@ index 89cbf3eb4724a79027d2a9b0c2ff013fa3a04949..6e57930d195fc5cdbb04d0b977c46f51 #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3731,9 +3732,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -3734,9 +3735,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (roleValue() == AccessibilityRole::ApplicationDialog) return AccessibilityObjectInclusion::IncludeObject; @@ -2731,7 +2606,7 @@ index 0000000000000000000000000000000000000000..dd2d8452302999e4a89b0bc18e842645 + +#endif // ENABLE(ACCESSIBILITY) && !USE(ATK) && !USE(ATSPI) diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -index d0735146084d058b7c9a59db6f06fc32a8638278..bad4fdb901745169ad84bb869c0a761bd5ade71f 100644 +index 8a81d9d56d0184e9d1ebabf2ec00e2d6aba2aa60..7790111683bcf27b9683159752a6a4e9e8e15ed6 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h @@ -151,6 +151,8 @@ namespace WebCore { @@ -5578,7 +5453,7 @@ index a2c6d72b5ba0f04a49ca6dc710ef6fa5e0125c33..759b0d34b7db839027063a1b6ce8fb0f void ProgressTracker::incrementProgress(ResourceLoaderIdentifier identifier, const ResourceResponse& response) diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h -index 4a65cd84e5b3c627f16712427d8059a73c759403..90a6262005694741aaaa59c869d35d5cd539a1eb 100644 +index 81a36fc8222e4345aa3474056e164757f8fe94ed..23be7d3bb2a8679227b7876599eafc2f685c51df 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h @@ -320,7 +320,7 @@ public: @@ -7000,10 +6875,10 @@ index 0000000000000000000000000000000000000000..f0c3a183e5bc44bdfa4201e0db2067b4 + +#endif // ENABLE(SPEECH_SYNTHESIS) diff --git a/Source/WebCore/platform/graphics/FontCascade.h b/Source/WebCore/platform/graphics/FontCascade.h -index ee63764693bb08b70a4ee6c54bf566f5143182cf..947c9c4f4bde763469e66b915e054f8d6426fe31 100644 +index b9f5a43f03f9708014d5f9fbf043b16357f4878e..58ab030548916e850d9fa1c28f97e5f596bf41bf 100644 --- a/Source/WebCore/platform/graphics/FontCascade.h +++ b/Source/WebCore/platform/graphics/FontCascade.h -@@ -306,7 +306,8 @@ private: +@@ -308,7 +308,8 @@ private: return true; if (textRenderingMode == TextRenderingMode::OptimizeSpeed) return false; @@ -8915,7 +8790,7 @@ index 11b3fc7c4267ef9e412d7d48bb6cfbe70b2bdfeb..af1fb6660696cf9c91d319670d554272 HashSet> m_keptAliveLoads; diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 8b32817b6c0efbcbd221dc7a3ebe420b42d8b51d..a468653cffcfaca8824e94d628c48b7b5d61e164 100644 +index 1dc6df3e1145332a0aeb902c0f5d7d5d727593be..230d268489a52391f7d4f336d22311e35c9f8278 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm @@ -720,7 +720,7 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didRece @@ -9374,10 +9249,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 3d89f35e99fa47cba2b0cc74cb40fefe6b1678c5..b5c7bf5272e47d9ca14dbf0dd03baabf8c509f0f 100644 +index 99ffa8b82f520c65d42bd102a9f7f2a26e68bd87..023bddefda4145020e96970888f0436dd1c1db21 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -@@ -122,6 +122,10 @@ +@@ -123,6 +123,10 @@ #include #endif @@ -9388,7 +9263,7 @@ index 3d89f35e99fa47cba2b0cc74cb40fefe6b1678c5..b5c7bf5272e47d9ca14dbf0dd03baabf // FIXME: Seems like we could use std::tuple to cut down the code below a lot! namespace IPC { -@@ -1275,6 +1279,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature +@@ -1303,6 +1307,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature encoder << windowFeatures.resizable; encoder << windowFeatures.fullscreen; encoder << windowFeatures.dialog; @@ -9398,7 +9273,7 @@ index 3d89f35e99fa47cba2b0cc74cb40fefe6b1678c5..b5c7bf5272e47d9ca14dbf0dd03baabf } bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& windowFeatures) -@@ -1303,6 +1310,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win +@@ -1331,6 +1338,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win return false; if (!decoder.decode(windowFeatures.dialog)) return false; @@ -9411,7 +9286,7 @@ index 3d89f35e99fa47cba2b0cc74cb40fefe6b1678c5..b5c7bf5272e47d9ca14dbf0dd03baabf return true; } -@@ -1316,6 +1329,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) +@@ -1344,6 +1357,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) #if PLATFORM(COCOA) encoder << dragData.pasteboardName(); encoder << dragData.fileNames(); @@ -9423,7 +9298,7 @@ index 3d89f35e99fa47cba2b0cc74cb40fefe6b1678c5..b5c7bf5272e47d9ca14dbf0dd03baabf #endif encoder << dragData.dragDestinationActionMask(); encoder << dragData.pageID(); -@@ -1339,9 +1357,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1367,9 +1385,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(applicationFlags)) return false; @@ -9441,7 +9316,7 @@ index 3d89f35e99fa47cba2b0cc74cb40fefe6b1678c5..b5c7bf5272e47d9ca14dbf0dd03baabf if (!decoder.decode(pasteboardName)) return false; -@@ -1357,8 +1382,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1385,8 +1410,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(pageID)) return false; @@ -9935,10 +9810,10 @@ index 90df093a49c09dc670dfea55077c77d889dd1c1b..6ffd51532e29b941b8dc10f545b7f5b8 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index c03306be47340b44317c7e70c0df9ebe9dbe6fe9..2b2494459e169e2ab0762a494e4110b6e38a67f7 100644 +index 176db7b86ea45229243298e6e1817ee5940d72c3..9b52cae9b11e75cd2a30a1774a2626923afab8f8 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -397,11 +397,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -398,11 +398,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -9953,7 +9828,7 @@ index c03306be47340b44317c7e70c0df9ebe9dbe6fe9..2b2494459e169e2ab0762a494e4110b6 UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -410,6 +413,7 @@ UIProcess/PageLoadState.cpp +@@ -411,6 +414,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -9961,7 +9836,7 @@ index c03306be47340b44317c7e70c0df9ebe9dbe6fe9..2b2494459e169e2ab0762a494e4110b6 UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -451,6 +455,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -452,6 +456,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -9970,7 +9845,7 @@ index c03306be47340b44317c7e70c0df9ebe9dbe6fe9..2b2494459e169e2ab0762a494e4110b6 UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPreferences.cpp -@@ -574,7 +580,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -575,7 +581,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -10200,7 +10075,7 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0 } #endif diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp -index e4e510ce2a2e56460a23c45d6dda374a75537c4b..010cc5812d7ccb42120876f184b4a2204ca43f85 100644 +index 84f2508ed682d76ee33aabb8d5deaa3cf6f1080e..6014296c0419ad7390a51cd846e6da6ad148193d 100644 --- a/Source/WebKit/UIProcess/API/C/WKPage.cpp +++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp @@ -1762,6 +1762,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient @@ -10778,10 +10653,10 @@ index 64c90f9f25fc44911e819ab94fa973bf0b82a0e4..8d8c739fb903b71f7881801cb41901f2 bool canRunBeforeUnloadConfirmPanel() const final { return true; } diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -index be4999328ad31e635b1cb2093b129140e852b450..c6b0aaac648a6686142a9085da383e14ef8a204f 100644 +index 3c6482c9fa52135d6aa0ceee148a02c02c4b080c..97860d7823c9f6367f2ead31735b1eeed8b1c9bb 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -@@ -403,10 +403,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa +@@ -404,10 +404,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa } } @@ -10801,7 +10676,7 @@ index be4999328ad31e635b1cb2093b129140e852b450..c6b0aaac648a6686142a9085da383e14 GUniquePtr bundleFilename(g_build_filename(injectedBundleDirectory(), INJECTED_BUNDLE_FILENAME, nullptr)); WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object); -@@ -459,6 +468,8 @@ static void webkitWebContextConstructed(GObject* object) +@@ -460,6 +469,8 @@ static void webkitWebContextConstructed(GObject* object) static void webkitWebContextDispose(GObject* object) { @@ -10820,7 +10695,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 50e8f960e18a718152b465b94a375f83a9295b04..151756797374f34d6c51684a4f55c0a70657968e 100644 +index b3f5f45aeb30c1019dfa6470edd6e8cecb717ba8..ebfb314c82bdc1ef844870a7b5d0d6071db0dd81 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp @@ -32,6 +32,7 @@ @@ -10855,7 +10730,7 @@ index 50e8f960e18a718152b465b94a375f83a9295b04..151756797374f34d6c51684a4f55c0a7 DECIDE_POLICY, PERMISSION_REQUEST, -@@ -465,6 +467,9 @@ void WebKitWebViewClient::handleDownloadRequest(WKWPE::View&, DownloadProxy& dow +@@ -471,6 +473,9 @@ void WebKitWebViewClient::handleDownloadRequest(WKWPE::View&, DownloadProxy& dow void WebKitWebViewClient::frameDisplayed(WKWPE::View&) { @@ -10865,7 +10740,7 @@ index 50e8f960e18a718152b465b94a375f83a9295b04..151756797374f34d6c51684a4f55c0a7 { SetForScope inFrameDisplayedGuard(m_webView->priv->inFrameDisplayed, true); for (const auto& callback : m_webView->priv->frameDisplayedCallbacks) { -@@ -495,6 +500,7 @@ void WebKitWebViewClient::didReceiveUserMessage(WKWPE::View&, UserMessage&& mess +@@ -501,6 +506,7 @@ void WebKitWebViewClient::didReceiveUserMessage(WKWPE::View&, UserMessage&& mess { webkitWebViewDidReceiveUserMessage(m_webView, WTFMove(message), WTFMove(completionHandler)); } @@ -10873,7 +10748,7 @@ index 50e8f960e18a718152b465b94a375f83a9295b04..151756797374f34d6c51684a4f55c0a7 #endif static gboolean webkitWebViewLoadFail(WebKitWebView* webView, WebKitLoadEvent, const char* failingURI, GError* error) -@@ -546,7 +552,7 @@ static gboolean webkitWebViewDecidePolicy(WebKitWebView*, WebKitPolicyDecision* +@@ -552,7 +558,7 @@ static gboolean webkitWebViewDecidePolicy(WebKitWebView*, WebKitPolicyDecision* static gboolean webkitWebViewPermissionRequest(WebKitWebView*, WebKitPermissionRequest* request) { @@ -10882,7 +10757,7 @@ index 50e8f960e18a718152b465b94a375f83a9295b04..151756797374f34d6c51684a4f55c0a7 if (WEBKIT_IS_POINTER_LOCK_PERMISSION_REQUEST(request)) { webkit_permission_request_allow(request); return TRUE; -@@ -1722,6 +1728,15 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) +@@ -1784,6 +1790,15 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) G_TYPE_BOOLEAN, 1, WEBKIT_TYPE_SCRIPT_DIALOG); @@ -10898,7 +10773,7 @@ index 50e8f960e18a718152b465b94a375f83a9295b04..151756797374f34d6c51684a4f55c0a7 /** * WebKitWebView::decide-policy: * @web_view: the #WebKitWebView on which the signal is emitted -@@ -2554,6 +2569,23 @@ void webkitWebViewRunJavaScriptBeforeUnloadConfirm(WebKitWebView* webView, const +@@ -2616,6 +2631,23 @@ void webkitWebViewRunJavaScriptBeforeUnloadConfirm(WebKitWebView* webView, const webkit_script_dialog_unref(webView->priv->currentScriptDialog); } @@ -11733,7 +11608,7 @@ index be5ac6eefad0e4b6f3c02bb5c60765dbfb7eb1ff..dfc01d10998ec98d0affd93c4f176535 { if (!m_uiDelegate) diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -index e0da4d3e5e457c1f1d785028f0245c9a610b8e30..22e42a550171be4940574901e2f84e3fcbd0f6c5 100644 +index 6f380789014dc0f6ffa648055760370ff22391a9..f6e6d4054b5c75af0effd8e8b36a3d2c5941b212 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm @@ -37,6 +37,7 @@ @@ -11742,8 +11617,8 @@ index e0da4d3e5e457c1f1d785028f0245c9a610b8e30..22e42a550171be4940574901e2f84e3f #import "PageClient.h" +#import "PasteboardTypes.h" #import "PlaybackSessionManagerProxy.h" - #import "QuarantineSPI.h" #import "QuickLookThumbnailLoader.h" + #import "SafeBrowsingSPI.h" @@ -252,9 +253,66 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting() void WebPageProxy::startDrag(const DragItem& dragItem, const ShareableBitmap::Handle& dragImageHandle) @@ -11812,7 +11687,7 @@ index e0da4d3e5e457c1f1d785028f0245c9a610b8e30..22e42a550171be4940574901e2f84e3f #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index 63d301372cfcaec642712f7a41a3ead5ea7a2cdc..5b243aa3f332b967c8ab27a64f06e9e81fea8c00 100644 +index eda0b0c5f950e711a2ef85610c293e6bfb32f199..3b1a2db57b474ddb13711aae3d3abc18d1b7be66 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm @@ -364,7 +364,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process @@ -11824,7 +11699,7 @@ index 63d301372cfcaec642712f7a41a3ead5ea7a2cdc..5b243aa3f332b967c8ab27a64f06e9e8 #endif #if PLATFORM(IOS) -@@ -619,8 +619,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -626,8 +626,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -11835,6 +11710,19 @@ index 63d301372cfcaec642712f7a41a3ead5ea7a2cdc..5b243aa3f332b967c8ab27a64f06e9e8 }]; m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSApp queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { +diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm +index 0428712939af82492f3189d4e1dc5131ad975280..489276896291352114adc46fb58b1de06103af4e 100644 +--- a/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm ++++ b/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm +@@ -271,7 +271,7 @@ void WebProcessProxy::hardwareConsoleStateChanged() + { + m_isConnectedToHardwareConsole = WindowServerConnection::singleton().hardwareConsoleState() == WindowServerConnection::HardwareConsoleState::Connected; + for (const auto& page : m_pageMap.values()) +- page->activityStateDidChange(ActivityState::IsConnectedToHardwareConsole); ++ page->activityStateDidChange(WebCore::ActivityState::IsConnectedToHardwareConsole); + } + #endif + diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h index 1234f6f1344764cdb086ba6b9d05680d23dff34b..a04ecc1d18e5787624af5a86637064484881c3ff 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h @@ -12041,7 +11929,7 @@ index f3dfe6614bad532c49995cf7afc5f6818a469ca6..78971e7296e5395079590fdf491b1ba1 } // namespace WebKit diff --git a/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp b/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp -index 7f5868577fd5bb251bd9eb25f2edeaa225ee0845..9894d5fcd9ee69ecdbdc5fc58a2d99779ec8794f 100644 +index 447320824dcb6f91eedc15f469f5fc57ce68703f..7f8b2a0ee2c5985e86ef888c6ebc709ec8fc2647 100644 --- a/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp +++ b/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp @@ -42,8 +42,10 @@ @@ -12053,9 +11941,9 @@ index 7f5868577fd5bb251bd9eb25f2edeaa225ee0845..9894d5fcd9ee69ecdbdc5fc58a2d9977 #include +#include - namespace WebKit { - using namespace WebCore; -@@ -56,7 +58,10 @@ DownloadProxy::DownloadProxy(DownloadProxyMap& downloadProxyMap, WebsiteDataStor + #if PLATFORM(MAC) + #include +@@ -60,7 +62,10 @@ DownloadProxy::DownloadProxy(DownloadProxyMap& downloadProxyMap, WebsiteDataStor , m_request(resourceRequest) , m_originatingPage(originatingPage) , m_frameInfo(API::FrameInfo::create(FrameInfoData { frameInfoData }, originatingPage)) @@ -12066,7 +11954,7 @@ index 7f5868577fd5bb251bd9eb25f2edeaa225ee0845..9894d5fcd9ee69ecdbdc5fc58a2d9977 } DownloadProxy::~DownloadProxy() -@@ -75,9 +80,12 @@ static RefPtr createData(const IPC::DataReference& data) +@@ -79,9 +84,12 @@ static RefPtr createData(const IPC::DataReference& data) void DownloadProxy::cancel(CompletionHandler&& completionHandler) { if (m_dataStore) { @@ -12080,7 +11968,7 @@ index 7f5868577fd5bb251bd9eb25f2edeaa225ee0845..9894d5fcd9ee69ecdbdc5fc58a2d9977 m_downloadProxyMap.downloadFinished(*this); }); } else -@@ -163,6 +171,21 @@ void DownloadProxy::decideDestinationWithSuggestedFilename(const WebCore::Resour +@@ -167,6 +175,21 @@ void DownloadProxy::decideDestinationWithSuggestedFilename(const WebCore::Resour suggestedFilename = m_suggestedFilename; suggestedFilename = MIMETypeRegistry::appendFileExtensionIfNecessary(suggestedFilename, response.mimeType()); @@ -12102,16 +11990,16 @@ index 7f5868577fd5bb251bd9eb25f2edeaa225ee0845..9894d5fcd9ee69ecdbdc5fc58a2d9977 m_client->decideDestinationWithSuggestedFilename(*this, response, ResourceResponseBase::sanitizeSuggestedFilename(suggestedFilename), [this, protectedThis = Ref { *this }, completionHandler = WTFMove(completionHandler)] (AllowOverwrite allowOverwrite, String destination) mutable { SandboxExtension::Handle sandboxExtensionHandle; if (!destination.isNull()) { -@@ -183,6 +206,8 @@ void DownloadProxy::didCreateDestination(const String& path) - void DownloadProxy::didFinish() - { +@@ -215,6 +238,8 @@ void DownloadProxy::didFinish() + updateQuarantinePropertiesIfPossible(); + #endif m_client->didFinish(*this); + if (auto* instrumentation = m_dataStore->downloadInstrumentation()) + instrumentation->downloadFinished(m_uuid, String()); // This can cause the DownloadProxy object to be deleted. m_downloadProxyMap.downloadFinished(*this); -@@ -193,6 +218,8 @@ void DownloadProxy::didFail(const ResourceError& error, const IPC::DataReference +@@ -225,6 +250,8 @@ void DownloadProxy::didFail(const ResourceError& error, const IPC::DataReference m_legacyResumeData = createData(resumeData); m_client->didFail(*this, error, m_legacyResumeData.get()); @@ -12121,10 +12009,10 @@ index 7f5868577fd5bb251bd9eb25f2edeaa225ee0845..9894d5fcd9ee69ecdbdc5fc58a2d9977 // This can cause the DownloadProxy object to be deleted. m_downloadProxyMap.downloadFinished(*this); diff --git a/Source/WebKit/UIProcess/Downloads/DownloadProxy.h b/Source/WebKit/UIProcess/Downloads/DownloadProxy.h -index e87f14a1772973db924624671dd40fe919904a5e..711335158c64e743a17e31c082a402eb0be9ac23 100644 +index 26c569d3cf475e6d4320f2388e43d77014caad86..79eebdc32a322b902ed9ada16a2084c0f214049a 100644 --- a/Source/WebKit/UIProcess/Downloads/DownloadProxy.h +++ b/Source/WebKit/UIProcess/Downloads/DownloadProxy.h -@@ -147,6 +147,7 @@ private: +@@ -149,6 +149,7 @@ private: #if PLATFORM(COCOA) RetainPtr m_progress; #endif @@ -16495,7 +16383,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b950c516b9b 100644 +index b8c135539eabdfd7e047c4c990590ea98c1b97d2..f454c67a79ed948729d44dc91a9061da67bb47f8 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -247,6 +247,9 @@ @@ -16508,7 +16396,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 #include #endif -@@ -625,6 +628,10 @@ WebPageProxy::~WebPageProxy() +@@ -629,6 +632,10 @@ WebPageProxy::~WebPageProxy() if (m_preferences->mediaSessionCoordinatorEnabled()) GroupActivitiesSessionNotifier::sharedNotifier().removeWebPage(*this); #endif @@ -16519,7 +16407,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 } void WebPageProxy::addAllMessageReceivers() -@@ -1041,6 +1048,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) +@@ -1045,6 +1052,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) m_pageLoadState.didSwapWebProcesses(); if (reason != ProcessLaunchReason::InitialProcess) m_drawingArea->waitForBackingStoreUpdateOnNextPaint(); @@ -16527,7 +16415,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 } void WebPageProxy::didAttachToRunningProcess() -@@ -1394,6 +1402,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1398,6 +1406,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -16549,7 +16437,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1945,6 +1968,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1949,6 +1972,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -16581,7 +16469,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2135,6 +2183,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2139,6 +2187,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -16607,7 +16495,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2729,6 +2796,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2756,6 +2823,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -16616,7 +16504,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2739,6 +2808,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2766,6 +2835,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -16625,7 +16513,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2754,18 +2825,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2774,6 +2868,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2801,6 +2895,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -16695,7 +16583,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2786,8 +2898,18 @@ void WebPageProxy::didStartDrag() +@@ -2813,8 +2925,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -16715,7 +16603,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2892,16 +3014,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2919,16 +3041,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -16760,7 +16648,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3065,7 +3209,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3092,7 +3236,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -16769,7 +16657,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); auto updateTrackingType = [this, location](TrackingType& trackingType, EventTrackingRegions::EventType eventType) { -@@ -3097,7 +3241,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3124,7 +3268,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -16778,7 +16666,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3486,6 +3630,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3513,6 +3657,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -16787,7 +16675,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 receivedPolicyDecision(policyAction, navigation, navigation->websitePolicies(), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3556,6 +3702,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3583,6 +3729,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, RefPtr&& websitePolicies, std::variant, Ref>&& navigationActionOrResponse, Ref&& sender, WillContinueLoadInNewProcess willContinueLoadInNewProcess, std::optional sandboxExtensionHandle) { @@ -16795,7 +16683,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4330,6 +4477,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4357,6 +4504,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -16807,7 +16695,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4731,6 +4883,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4758,6 +4910,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -16815,7 +16703,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4956,6 +5109,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4983,6 +5136,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -16824,7 +16712,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 // 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; -@@ -5435,7 +5590,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5462,7 +5617,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 +16728,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -6024,6 +6186,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -6052,6 +6214,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa if (originatingPage) openerAppInitiatedState = originatingPage->lastNavigationWasAppInitiated(); @@ -16848,7 +16736,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 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); -@@ -6070,6 +6233,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -6098,6 +6261,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -16856,7 +16744,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 } void WebPageProxy::exitFullscreenImmediately() -@@ -6129,6 +6293,10 @@ void WebPageProxy::closePage() +@@ -6157,6 +6321,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -16867,7 +16755,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -6165,6 +6333,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -6193,6 +6361,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 +16764,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -6186,6 +6356,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -6214,6 +6384,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -16885,7 +16773,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 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 { -@@ -6209,6 +6381,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -6237,6 +6409,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -16894,7 +16782,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 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 { -@@ -6336,6 +6510,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6364,6 +6538,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -16903,7 +16791,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7600,6 +7776,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7631,6 +7807,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -16912,7 +16800,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 } break; } -@@ -7614,10 +7792,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7645,10 +7823,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) pageClient().wheelEventWasNotHandledByWebCore(oldestProcessedEvent); } @@ -16929,7 +16817,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 break; } -@@ -7626,7 +7807,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7657,7 +7838,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 +16825,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7645,7 +7825,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7676,7 +7856,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 +16833,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7654,6 +7833,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7685,6 +7864,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -16953,7 +16841,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 } break; } -@@ -7987,7 +8167,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -8020,7 +8200,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%{public}s", processTerminationReasonToString(reason)); @@ -16965,7 +16853,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8321,6 +8504,7 @@ static Span gpuMachServices() +@@ -8354,6 +8537,7 @@ static Span gpuMachServices() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -16973,7 +16861,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8513,6 +8697,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8546,6 +8730,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.httpsUpgradeEnabled = preferences().upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false; @@ -16982,7 +16870,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 #if PLATFORM(IOS) // FIXME: This is also being passed over the to WebProcess via the PreferencesStore. parameters.allowsDeprecatedSynchronousXMLHttpRequestDuringUnload = allowsDeprecatedSynchronousXMLHttpRequestDuringUnload(); -@@ -8585,6 +8771,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8618,6 +8804,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -16997,7 +16885,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8678,6 +8872,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8711,6 +8905,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17014,7 +16902,7 @@ index 6d5184c5a8fd6055f8782412ea9ecfa422c9a643..953e373b7e22ca21dbdb64546e436b95 // 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 c186e2e3cd9e2ef50c7bab0c3630e82380fce903..00d99f5b7b192c650817302b5e38bc786f047d05 100644 +index d37d6a2e874120d5686787c4315df95ff7c8864b..78f706cff5e0408a9b2999f5a06e123cf4e1c6b9 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17097,7 +16985,7 @@ index c186e2e3cd9e2ef50c7bab0c3630e82380fce903..00d99f5b7b192c650817302b5e38bc78 RefPtr loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemesButNotAppLinks, API::Object* userData = nullptr); RefPtr loadFile(const String& fileURL, const String& resourceDirectoryURL, bool isAppInitiated = true, API::Object* userData = nullptr); RefPtr loadData(const IPC::DataReference&, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow); -@@ -1212,6 +1232,7 @@ public: +@@ -1214,6 +1234,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -17105,7 +16993,7 @@ index c186e2e3cd9e2ef50c7bab0c3630e82380fce903..00d99f5b7b192c650817302b5e38bc78 void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1299,14 +1320,20 @@ public: +@@ -1301,14 +1322,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -17127,7 +17015,7 @@ index c186e2e3cd9e2ef50c7bab0c3630e82380fce903..00d99f5b7b192c650817302b5e38bc78 #endif void processDidBecomeUnresponsive(); -@@ -1557,6 +1584,8 @@ public: +@@ -1559,6 +1586,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -17136,7 +17024,7 @@ index c186e2e3cd9e2ef50c7bab0c3630e82380fce903..00d99f5b7b192c650817302b5e38bc78 #endif #if ENABLE(WEB_CRYPTO) -@@ -2733,6 +2762,7 @@ private: +@@ -2735,6 +2764,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17144,7 +17032,7 @@ index c186e2e3cd9e2ef50c7bab0c3630e82380fce903..00d99f5b7b192c650817302b5e38bc78 #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -3002,6 +3032,20 @@ private: +@@ -3004,6 +3034,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17165,7 +17053,7 @@ index c186e2e3cd9e2ef50c7bab0c3630e82380fce903..00d99f5b7b192c650817302b5e38bc78 #endif PageLoadState m_pageLoadState; -@@ -3212,6 +3256,9 @@ private: +@@ -3216,6 +3260,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17176,7 +17064,7 @@ index c186e2e3cd9e2ef50c7bab0c3630e82380fce903..00d99f5b7b192c650817302b5e38bc78 #if PLATFORM(IOS_FAMILY) && ENABLE(DEVICE_ORIENTATION) std::unique_ptr m_webDeviceOrientationUpdateProviderProxy; diff --git a/Source/WebKit/UIProcess/WebPageProxy.messages.in b/Source/WebKit/UIProcess/WebPageProxy.messages.in -index bc758641100c9ab2bb70c878f7a10a6db198cf01..fa3764f7c417363a0da953552fb9b6ff45c4d8f2 100644 +index b5c402af8bddbfc2ac11bc46902665b166e5459d..af2036d7bc8f562800b5dc9b41d632c6e0b84693 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -17211,7 +17099,7 @@ index bc758641100c9ab2bb70c878f7a10a6db198cf01..fa3764f7c417363a0da953552fb9b6ff DidPerformDragOperation(bool handled) #endif diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index 5593029e4f27efc9140ead901d1cc2646d8e9785..7221d3f5d792adc756305a397ca3f652cc2b97fe 100644 +index abc6cbd41160f202bffd5b3c6854388151c59812..3d2229909eec35dc9ba88312e5c81068c46fe519 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp @@ -534,6 +534,14 @@ void WebProcessPool::establishRemoteWorkerContextConnectionToNetworkProcess(Remo @@ -17246,7 +17134,7 @@ index e3bca858c06e2e4d2f078fcc7c683ffc18a58b3b..b8c2f10c98d150f547eee9249270395c { return allProcesses().get(identifier); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h -index 56789958133037207df23dffd42a5144132e3219..06c9a3d31cf2a08c187087b07f4141d7571b6809 100644 +index 55097acfc4fd5a3de91284e5825a60282e3aedaf..c8dbfe0f831642b15bbae36fee7ed133d4664f80 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.h +++ b/Source/WebKit/UIProcess/WebProcessProxy.h @@ -146,6 +146,7 @@ public: @@ -17258,10 +17146,10 @@ index 56789958133037207df23dffd42a5144132e3219..06c9a3d31cf2a08c187087b07f4141d7 WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index 291e189aed4cfe06524ff549a57b50556df20fb8..e8b38d35e03f6f7a3c1cc8f102b797c9213dc4f8 100644 +index e08988ab685895adcbbe581fe49ef2c751253d2c..303025f95770382059b18cb7f36ed1199bb18b91 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -2005,6 +2005,12 @@ void WebsiteDataStore::originDirectoryForTesting(URL&& origin, URL&& topOrigin, +@@ -2002,6 +2002,12 @@ void WebsiteDataStore::originDirectoryForTesting(URL&& origin, URL&& topOrigin, networkProcess().websiteDataOriginDirectoryForTesting(m_sessionID, WTFMove(origin), WTFMove(topOrigin), type, WTFMove(completionHandler)); } @@ -19311,7 +19199,7 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d0b8efe3a 100644 +index 677604db18a7dd42fe4a5bca9fa67d7e5de70de6..cdba9a581f81d32d6d44791503f1a42c734e8d40 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj @@ -1242,6 +1242,7 @@ @@ -19322,7 +19210,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d 5CAF7AA726F93AB00003F19E /* adattributiond.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CAF7AA526F93A950003F19E /* adattributiond.cpp */; }; 5CAFDE452130846300B1F7E1 /* _WKInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE422130843500B1F7E1 /* _WKInspector.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5CAFDE472130846A00B1F7E1 /* _WKInspectorInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE442130843600B1F7E1 /* _WKInspectorInternal.h */; }; -@@ -2222,6 +2223,18 @@ +@@ -2219,6 +2220,18 @@ DF0C5F28252ECB8E00D921DB /* WKDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F24252ECB8D00D921DB /* WKDownload.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2A252ECB8E00D921DB /* WKDownloadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2B252ED44000D921DB /* WKDownloadInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */; }; @@ -19341,7 +19229,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d 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 */; }; -@@ -2284,6 +2297,8 @@ +@@ -2281,6 +2294,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 */; }; @@ -19350,7 +19238,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d 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 */; }; -@@ -2300,6 +2315,9 @@ +@@ -2297,6 +2312,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, ); }; }; @@ -19360,7 +19248,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d 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 */; }; -@@ -5261,6 +5279,7 @@ +@@ -5260,6 +5278,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; }; @@ -19368,7 +19256,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d 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 = ""; }; -@@ -6975,6 +6994,19 @@ +@@ -6971,6 +6990,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 = ""; }; @@ -19388,7 +19276,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d 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 = ""; }; -@@ -7104,6 +7136,8 @@ +@@ -7100,6 +7132,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; }; @@ -19397,7 +19285,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d 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; }; -@@ -7125,6 +7159,14 @@ +@@ -7121,6 +7155,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 = ""; }; @@ -19412,7 +19300,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d 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 = ""; }; -@@ -7258,6 +7300,7 @@ +@@ -7254,6 +7296,7 @@ files = ( 3766F9EE189A1241003CF19B /* JavaScriptCore.framework in Frameworks */, 3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */, @@ -19420,7 +19308,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, -@@ -9401,6 +9444,7 @@ +@@ -9398,6 +9441,7 @@ 99788ACA1F421DCA00C08000 /* _WKAutomationSessionConfiguration.mm */, 990D28A81C6404B000986977 /* _WKAutomationSessionDelegate.h */, 990D28AF1C65203900986977 /* _WKAutomationSessionInternal.h */, @@ -19428,7 +19316,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d 5C4609E222430E4C009943C2 /* _WKContentRuleListAction.h */, 5C4609E322430E4D009943C2 /* _WKContentRuleListAction.mm */, 5C4609E422430E4D009943C2 /* _WKContentRuleListActionInternal.h */, -@@ -10490,6 +10534,7 @@ +@@ -10487,6 +10531,7 @@ E34B110C27C46BC6006D2F2E /* libWebCoreTestShim.dylib */, E34B110F27C46D09006D2F2E /* libWebCoreTestSupport.dylib */, DDE992F4278D06D900F60D26 /* libWebKitAdditions.a */, @@ -19436,7 +19324,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d 57A9FF15252C6AEF006A2040 /* libWTF.a */, 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, -@@ -11017,6 +11062,12 @@ +@@ -11014,6 +11059,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -19449,7 +19337,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d ); path = Agents; sourceTree = ""; -@@ -11025,6 +11076,7 @@ +@@ -11022,6 +11073,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -19457,7 +19345,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -11569,6 +11621,7 @@ +@@ -11565,6 +11617,7 @@ E1513C65166EABB200149FCB /* AuxiliaryProcessProxy.h */, 46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */, 46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */, @@ -19465,7 +19353,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d 4659F25E275FF6B200BBB369 /* CaptivePortalModeObserver.h */, 07297F9C1C1711EA003F0735 /* DeviceIdHashSaltStorage.cpp */, 07297F9D1C17BBEA223F0735 /* DeviceIdHashSaltStorage.h */, -@@ -11586,6 +11639,8 @@ +@@ -11582,6 +11635,8 @@ 2DD5A72A1EBF09A7009BA597 /* HiddenPageThrottlingAutoIncreasesCounter.h */, 839A2F2F1E2067390039057E /* HighPerformanceGraphicsUsageSampler.cpp */, 839A2F301E2067390039057E /* HighPerformanceGraphicsUsageSampler.h */, @@ -19474,7 +19362,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d 5CEABA2B2333251400797797 /* LegacyGlobalSettings.cpp */, 5CEABA2A2333247700797797 /* LegacyGlobalSettings.h */, 31607F3819627002009B87DA /* LegacySessionStateCoding.h */, -@@ -11615,6 +11670,7 @@ +@@ -11611,6 +11666,7 @@ 1A0C227D2451130A00ED614D /* QuickLookThumbnailingSoftLink.mm */, 1AEE57232409F142002005D6 /* QuickLookThumbnailLoader.h */, 1AEE57242409F142002005D6 /* QuickLookThumbnailLoader.mm */, @@ -19482,7 +19370,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d BC111B08112F5E3C00337BAB /* ResponsivenessTimer.cpp */, 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */, 5CA98549210BEB5A0057EB6B /* SafeBrowsingWarning.h */, -@@ -11715,6 +11771,8 @@ +@@ -11711,6 +11767,8 @@ BC7B6204129A0A6700D174A4 /* WebPageGroup.h */, 2D9EA3101A96D9EB002D2807 /* WebPageInjectedBundleClient.cpp */, 2D9EA30E1A96CBFF002D2807 /* WebPageInjectedBundleClient.h */, @@ -19491,7 +19379,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d BC111B0B112F5E4F00337BAB /* WebPageProxy.cpp */, BC032DCB10F4389F0058C15A /* WebPageProxy.h */, BCBD38FA125BAB9A00D2C29F /* WebPageProxy.messages.in */, -@@ -11867,6 +11925,7 @@ +@@ -11863,6 +11921,7 @@ BC646C1911DD399F006455B0 /* WKBackForwardListItemRef.h */, BC646C1611DD399F006455B0 /* WKBackForwardListRef.cpp */, BC646C1711DD399F006455B0 /* WKBackForwardListRef.h */, @@ -19499,7 +19387,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d BCB9E24A1120E15C00A137E0 /* WKContext.cpp */, BCB9E2491120E15C00A137E0 /* WKContext.h */, 1AE52F9319201F6B00A1FA37 /* WKContextConfigurationRef.cpp */, -@@ -12451,6 +12510,9 @@ +@@ -12446,6 +12505,9 @@ C18173602058424700DFDA65 /* DisplayLink.h */, 31ABA79C215AF9E000C90E31 /* HighPerformanceGPUManager.h */, 31ABA79D215AF9E000C90E31 /* HighPerformanceGPUManager.mm */, @@ -19509,7 +19397,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d 1AFDE65B1954E8D500C48FFA /* LegacySessionStateCoding.cpp */, 0FCB4E5818BBE3D9000FCFC9 /* PageClientImplMac.h */, 0FCB4E5918BBE3D9000FCFC9 /* PageClientImplMac.mm */, -@@ -12477,6 +12539,8 @@ +@@ -12472,6 +12534,8 @@ E568B92120A3AC6A00E3C856 /* WebDataListSuggestionsDropdownMac.mm */, E55CD20124D09F1F0042DB9C /* WebDateTimePickerMac.h */, E55CD20224D09F1F0042DB9C /* WebDateTimePickerMac.mm */, @@ -19518,7 +19406,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d BC857E8512B71EBB00EDEB2E /* WebPageProxyMac.mm */, BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */, BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */, -@@ -13661,6 +13725,7 @@ +@@ -13656,6 +13720,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -19526,7 +19414,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -13909,6 +13974,7 @@ +@@ -13904,6 +13969,7 @@ E170876C16D6CA6900F99226 /* BlobRegistryProxy.h in Headers */, 4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */, 1A5705111BE410E600874AF1 /* BlockSPI.h in Headers */, @@ -19534,7 +19422,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d BC3065FA1259344E00E71278 /* CacheModel.h in Headers */, 41897ED81F415D8A0016FA42 /* CacheStorageEngine.h in Headers */, 41FABD2A1F4DE001006A6C97 /* CacheStorageEngineCache.h in Headers */, -@@ -14175,7 +14241,11 @@ +@@ -14169,7 +14235,11 @@ 2DD45ADE1E5F8972006C355F /* InputViewUpdateDeferrer.h in Headers */, CE550E152283752200D28791 /* InsertTextOptions.h in Headers */, 9197940523DBC4BB00257892 /* InspectorBrowserAgent.h in Headers */, @@ -19546,7 +19434,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d A5E391FD2183C1F800C8FB31 /* InspectorTargetProxy.h in Headers */, 51E9049C27BCB9D400929E7E /* InstallCoordinationSPI.h in Headers */, C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */, -@@ -14395,6 +14465,7 @@ +@@ -14387,6 +14457,7 @@ CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, @@ -19554,7 +19442,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -14453,6 +14524,7 @@ +@@ -14445,6 +14516,7 @@ E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */, E36FF00327F36FBD004BE21A /* SandboxStateVariables.h in Headers */, 7BAB111025DD02B3008FC479 /* ScopedActiveMessageReceiveQueue.h in Headers */, @@ -19562,7 +19450,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d E4D54D0421F1D72D007E3C36 /* ScrollingTreeFrameScrollingNodeRemoteIOS.h in Headers */, 0F931C1C18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h in Headers */, 0F931C1C18C5711900DBB8D4 /* ScrollingTreeScrollingNodeDelegateIOS.h in Headers */, -@@ -14801,6 +14873,8 @@ +@@ -14793,6 +14865,8 @@ 2D9EA30F1A96CBFF002D2807 /* WebPageInjectedBundleClient.h in Headers */, 9197940823DBC4CB00257892 /* WebPageInspectorAgentBase.h in Headers */, A513F5402154A5D700662841 /* WebPageInspectorController.h in Headers */, @@ -19571,7 +19459,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d A543E30C215C8A8D00279CD9 /* WebPageInspectorTarget.h in Headers */, A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, -@@ -16729,6 +16803,8 @@ +@@ -16721,6 +16795,8 @@ 51E9049727BCB3D900929E7E /* ICAppBundle.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -19580,7 +19468,7 @@ index 29492aed87f3cd6e38141f87f086d82526f67f37..3b17e338c2bdaed31b41ba6d3274970d C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */, C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */, 2984F588164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp in Sources */, -@@ -17063,6 +17139,8 @@ +@@ -17055,6 +17131,8 @@ E3816B3D27E2463A005EAFC0 /* WebMockContentFilterManager.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -19778,7 +19666,7 @@ index e00c722c2be5d505243d45f46001839d4eb8a977..33c0832cde6c292230397a13e70d90fb auto permissionHandlers = m_requestsPerOrigin.take(securityOrigin); diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -index 62fb577af7fef5dd25e896d0f2677f24098805b8..c2cea276fab97695642f3beb25a4885f6bf988b5 100644 +index ceb0deefec78e10d4ea64aff2b0c5cdadf313d61..f8b71b76a52e8d970fd3a7600df157e90f18d049 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp @@ -415,6 +415,8 @@ void WebChromeClient::setResizable(bool resizable) @@ -20212,7 +20100,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 052623be7310bde73b3669cfb2a22dcb2d24ffdc..39cabdfacfa39eb2363085c5a30b6b4894db91ef 100644 +index c97a7244803ca3d9fc67902edfce494452ae6c5c..fd48658116cc784c126098fbef09c4c31585b62f 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) @@ -20455,7 +20343,7 @@ index 052623be7310bde73b3669cfb2a22dcb2d24ffdc..39cabdfacfa39eb2363085c5a30b6b48 } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4584,7 +4697,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4587,7 +4700,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -20464,7 +20352,7 @@ index 052623be7310bde73b3669cfb2a22dcb2d24ffdc..39cabdfacfa39eb2363085c5a30b6b48 void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6995,6 +7108,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6999,6 +7112,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -20475,7 +20363,7 @@ index 052623be7310bde73b3669cfb2a22dcb2d24ffdc..39cabdfacfa39eb2363085c5a30b6b48 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index f65a66f67b3e3d5a3b87d3a2c2e3e84aa1850989..018449e1ee0015a71c7e160e4f201a18e799e40c 100644 +index dc3655f5fa7eacb12ef54c798a38e323c660602d..d8b004cc350e21ef2c16e728de6085240e12989c 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -117,6 +117,10 @@ @@ -20521,7 +20409,7 @@ index f65a66f67b3e3d5a3b87d3a2c2e3e84aa1850989..018449e1ee0015a71c7e160e4f201a18 void insertNewlineInQuotedContent(); -@@ -1655,6 +1663,7 @@ private: +@@ -1656,6 +1664,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -20529,7 +20417,7 @@ index f65a66f67b3e3d5a3b87d3a2c2e3e84aa1850989..018449e1ee0015a71c7e160e4f201a18 void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1692,6 +1701,7 @@ private: +@@ -1693,6 +1702,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -20537,7 +20425,7 @@ index f65a66f67b3e3d5a3b87d3a2c2e3e84aa1850989..018449e1ee0015a71c7e160e4f201a18 #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1835,9 +1845,7 @@ private: +@@ -1836,9 +1846,7 @@ private: void requestRectForFoundTextRange(const WebFoundTextRange&, CompletionHandler&&); @@ -20547,7 +20435,7 @@ index f65a66f67b3e3d5a3b87d3a2c2e3e84aa1850989..018449e1ee0015a71c7e160e4f201a18 void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2380,6 +2388,7 @@ private: +@@ -2381,6 +2389,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -21642,7 +21530,7 @@ index ef4407cfc114e602d98ed81724da504f453e258f..448dd483715162baba484f756fbcc1d7 + add_subdirectory(Playwright/win) endif () diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit -index 3401b5cf9c25d4b7932cf2fba29f038e4bed2345..7d005e1671b79f1e1fc73e69eea243c0d010afd3 100755 +index b4e8c0496caa9912bf9b7e0d9a8db03161b70e7c..12954131704cb3a3b8ccfe15c60c3919067d72a9 100755 --- a/Tools/Scripts/build-webkit +++ b/Tools/Scripts/build-webkit @@ -256,7 +256,7 @@ if (isAppleCocoaWebKit()) {