From 4c708562520efc78c6629f101260130a80a93040 Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Tue, 8 Jun 2021 11:48:38 -0700 Subject: [PATCH] browser(webkit): roll to 06/08/21 (#6958) --- browser_patches/webkit/BUILD_NUMBER | 4 +- browser_patches/webkit/UPSTREAM_CONFIG.sh | 2 +- browser_patches/webkit/patches/bootstrap.diff | 454 +++++++++--------- 3 files changed, 230 insertions(+), 230 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 9ca8be6705..ee849536b4 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1496 -Changed: yurys@chromium.org Mon 07 Jun 2021 04:32:06 PM PDT +1497 +Changed: yurys@chromium.org Tue 08 Jun 2021 09:25:32 AM PDT diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 47f9739ff0..ce519c2c7c 100644 --- a/browser_patches/webkit/UPSTREAM_CONFIG.sh +++ b/browser_patches/webkit/UPSTREAM_CONFIG.sh @@ -1,3 +1,3 @@ REMOTE_URL="https://git.webkit.org/git/WebKit.git" BASE_BRANCH="master" -BASE_REVISION="bb7adf2388696725912768e008939800b8dffe1d" +BASE_REVISION="05a7c4e065b6bc9bb79a8a1b49d5cb41de4c3401" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 13eba913d9..168abbe37a 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -1,8 +1,8 @@ diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt -index 62caf61217087b6534a1a7bef2d7b329ad30f109..ca84452d35a5c8fa7982b84804198c82c9ede43e 100644 +index 653c5f33811ae5eda7e680df85be7250dde1c950..a2cd767df2d3d25d491447baa120f451eab23895 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1240,22 +1240,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1241,22 +1241,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json @@ -890,10 +890,10 @@ index 0000000000000000000000000000000000000000..587287d52fde2735cbae34a27a0f673b + ] +} diff --git a/Source/JavaScriptCore/inspector/protocol/Network.json b/Source/JavaScriptCore/inspector/protocol/Network.json -index 65ab2092b0ffd0ead3da1ddccd398d4f4179f51a..2d9ef40a20df819193c9a5867fbf6f8f8bf46b48 100644 +index 882a2d56befef0aba460cc8ff041969e0d2c1ed3..9aecd6067741af596e5ec7fdf9c832ea1267715a 100644 --- a/Source/JavaScriptCore/inspector/protocol/Network.json +++ b/Source/JavaScriptCore/inspector/protocol/Network.json -@@ -321,6 +321,13 @@ +@@ -324,6 +324,13 @@ { "name": "requestId", "$ref": "RequestId", "description": "Identifier for the intercepted Network request to fail." }, { "name": "errorType", "$ref": "ResourceErrorType", "description": "Deliver error reason for the request failure." } ] @@ -1752,7 +1752,7 @@ index ea0bfb0d7a5a64c1570da5333199f99b552a5ff6..2ebe8c6c5ac4343e0b373ccc271e86a4 m_timeZoneCache = std::unique_ptr(bitwise_cast(icu::TimeZone::detectHostTimeZone())); #endif diff --git a/Source/ThirdParty/libwebrtc/CMakeLists.txt b/Source/ThirdParty/libwebrtc/CMakeLists.txt -index a6f1c25626c79ea0f98226ba92a54d11bcb264fb..66d4d7e3256e64a76523925feb4f1fb675284662 100644 +index 8704a1e42febf05286927078af70805ab7af4445..10ceace3974e6b4aa0205f5703ecddcab026e5fa 100644 --- a/Source/ThirdParty/libwebrtc/CMakeLists.txt +++ b/Source/ThirdParty/libwebrtc/CMakeLists.txt @@ -292,6 +292,11 @@ set(webrtc_SOURCES @@ -1767,7 +1767,7 @@ index a6f1c25626c79ea0f98226ba92a54d11bcb264fb..66d4d7e3256e64a76523925feb4f1fb6 Source/third_party/libyuv/source/compare_common.cc Source/third_party/libyuv/source/compare_gcc.cc Source/third_party/libyuv/source/convert.cc -@@ -1699,6 +1704,10 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE +@@ -1700,6 +1705,10 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE Source/third_party/libsrtp/config Source/third_party/libsrtp/crypto/include Source/third_party/libsrtp/include @@ -1820,10 +1820,10 @@ index 5dfabd5717a8297192f06c046c7cd7fdee3d468d..6437ad739fbffaf92bf04b202a3f40af PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/libwebrtc; USE_HEADERMAP = NO; diff --git a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj -index 5a80ee0dc9ddad9eb467fadffd7f0dffc6b70160..4245287a2c0adec02af5553ecfb6610953da7a45 100644 +index a3f118101eac4da24425a067227b4e33c2f68b5a..aad07e9615a2c56e4bd7ce5cc17459a8b732f1d0 100644 --- a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj +++ b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj -@@ -3793,6 +3793,9 @@ +@@ -3799,6 +3799,9 @@ CDFD2FCC24C4DAF70048DAC3 /* reader.h in Copy webm headers */ = {isa = PBXBuildFile; fileRef = CDEBB40524C0191A00ADBD44 /* reader.h */; }; CDFD2FCD24C4DAF70048DAC3 /* status.h in Copy webm headers */ = {isa = PBXBuildFile; fileRef = CDEBB40624C0191A00ADBD44 /* status.h */; }; CDFD2FCE24C4DAF70048DAC3 /* webm_parser.h in Copy webm headers */ = {isa = PBXBuildFile; fileRef = CDEBB40824C0191A00ADBD44 /* webm_parser.h */; }; @@ -1833,7 +1833,7 @@ index 5a80ee0dc9ddad9eb467fadffd7f0dffc6b70160..4245287a2c0adec02af5553ecfb66109 /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ -@@ -8226,6 +8229,9 @@ +@@ -8237,6 +8240,9 @@ CDEBB49D24C0191A00ADBD44 /* master_parser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = master_parser.h; sourceTree = ""; }; CDFD2F9624C4B2F90048DAC3 /* vp9_header_parser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = vp9_header_parser.h; sourceTree = ""; }; CDFD2F9A24C4B2F90048DAC3 /* vp9_header_parser.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = vp9_header_parser.cc; sourceTree = ""; }; @@ -1843,7 +1843,7 @@ index 5a80ee0dc9ddad9eb467fadffd7f0dffc6b70160..4245287a2c0adec02af5553ecfb66109 FB39D0D11200F0E300088E69 /* libwebrtc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libwebrtc.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ -@@ -15110,6 +15116,7 @@ +@@ -15126,6 +15132,7 @@ isa = PBXGroup; children = ( CDFD2F9224C4B2F90048DAC3 /* common */, @@ -1851,7 +1851,7 @@ index 5a80ee0dc9ddad9eb467fadffd7f0dffc6b70160..4245287a2c0adec02af5553ecfb66109 CDEBB19224C0191800ADBD44 /* webm_parser */, ); path = libwebm; -@@ -15244,6 +15251,16 @@ +@@ -15260,6 +15267,16 @@ path = common; sourceTree = ""; }; @@ -1868,7 +1868,7 @@ index 5a80ee0dc9ddad9eb467fadffd7f0dffc6b70160..4245287a2c0adec02af5553ecfb66109 FB39D06E1200ED9200088E69 = { isa = PBXGroup; children = ( -@@ -17301,7 +17318,7 @@ +@@ -17321,7 +17338,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -1877,7 +1877,7 @@ index 5a80ee0dc9ddad9eb467fadffd7f0dffc6b70160..4245287a2c0adec02af5553ecfb66109 }; 5CD286461E6E154E0094FDC8 /* Check for Weak VTables and Externals */ = { isa = PBXShellScriptBuildPhase; -@@ -18448,6 +18465,7 @@ +@@ -18470,6 +18487,7 @@ 419C82F51FE20EB50040C30F /* audio_encoder_opus.cc in Sources */, 419C82F31FE20EB50040C30F /* audio_encoder_opus_config.cc in Sources */, 4140B8201E4E3383007409E6 /* audio_encoder_pcm.cc in Sources */, @@ -1885,7 +1885,7 @@ index 5a80ee0dc9ddad9eb467fadffd7f0dffc6b70160..4245287a2c0adec02af5553ecfb66109 5CDD8FFE1E43CE3A00621E92 /* audio_encoder_pcm16b.cc in Sources */, 5CD285461E6A61D20094FDC8 /* audio_format.cc in Sources */, 41DDB26F212679D200296D47 /* audio_format_to_string.cc in Sources */, -@@ -18866,6 +18884,7 @@ +@@ -18888,6 +18906,7 @@ 417953DB216983910028266B /* metrics.cc in Sources */, 5CDD865E1E43B8B500621E92 /* min_max_operations.c in Sources */, 4189395B242A71F5007FDC41 /* min_video_bitrate_experiment.cc in Sources */, @@ -1893,7 +1893,7 @@ index 5a80ee0dc9ddad9eb467fadffd7f0dffc6b70160..4245287a2c0adec02af5553ecfb66109 4131C387234B957D0028A615 /* moving_average.cc in Sources */, 41FCBB1521B1F7AA00A5DF27 /* moving_average.cc in Sources */, 5CD286101E6A64C90094FDC8 /* moving_max.cc in Sources */, -@@ -19091,6 +19110,7 @@ +@@ -19113,6 +19132,7 @@ 4131C53B234C8B190028A615 /* rtc_event_rtp_packet_outgoing.cc in Sources */, 4131C552234C8B190028A615 /* rtc_event_video_receive_stream_config.cc in Sources */, 4131C554234C8B190028A615 /* rtc_event_video_send_stream_config.cc in Sources */, @@ -1915,7 +1915,7 @@ index e7331574bbfe695080432c506a393ed218d0e651..8333ecf890ba03175aa5fa9afe89217f InspectorWindowFrame: type: String diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index 6b349693f1119c4b7f9f239ad4f0a546446253f0..b9e4f1e4bb794db6003f7f46ca47aab2b6acb03b 100644 +index d42b23b6abbe757643faf137e3bb954642ac587f..a5e8526cd3b341038ec0dabb5da7920d3453cae6 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -622,9 +622,9 @@ MaskWebGLStringsEnabled: @@ -2099,7 +2099,7 @@ index fa6958fbd30fabfd1d237aaf1a89f6eb5fa3b366..c0d6541242d79dc6d615a43710343b89 if (Systemd_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 6e20d6f8f122262b2dc48098c48ed065366abb2d..f52a3ec05cf9b11691237abce84e5e1289827a2b 100644 +index 27dc96a632b239db66d7e033cd3376f182485d61..15447e2e9c4fa414c3a75327da086f5640dec89b 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -384,7 +384,7 @@ @@ -2286,10 +2286,10 @@ index ef168b76819216d984b7a2d0f760005fb9d24de8..2d6cf51f3b45191ad84106429d4f108f __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 6f80031f076a7416d3de130ac40c34d0b370b1e5..06f9b338b628af77d6bd820419cdd3ce9c649d93 100644 +index d77b8fe9f72c6ab500cf56713b6c2419b4a4bd9d..3de37e5bd51b3be0190d72e13987a125d2d8605c 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5341,6 +5341,14 @@ +@@ -5340,6 +5340,14 @@ 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, ); }; }; @@ -2304,7 +2304,7 @@ index 6f80031f076a7416d3de130ac40c34d0b370b1e5..06f9b338b628af77d6bd820419cdd3ce 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, ); }; }; -@@ -16830,6 +16838,14 @@ +@@ -16827,6 +16835,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 = ""; }; @@ -2319,7 +2319,7 @@ index 6f80031f076a7416d3de130ac40c34d0b370b1e5..06f9b338b628af77d6bd820419cdd3ce 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 = ""; }; -@@ -22430,7 +22446,12 @@ +@@ -22427,7 +22443,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2332,7 +2332,7 @@ index 6f80031f076a7416d3de130ac40c34d0b370b1e5..06f9b338b628af77d6bd820419cdd3ce E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -28141,6 +28162,8 @@ +@@ -28135,6 +28156,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2341,7 +2341,7 @@ index 6f80031f076a7416d3de130ac40c34d0b370b1e5..06f9b338b628af77d6bd820419cdd3ce 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -30577,6 +30600,7 @@ +@@ -30573,6 +30596,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2349,7 +2349,7 @@ index 6f80031f076a7416d3de130ac40c34d0b370b1e5..06f9b338b628af77d6bd820419cdd3ce 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -31590,6 +31614,7 @@ +@@ -31585,6 +31609,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2357,7 +2357,7 @@ index 6f80031f076a7416d3de130ac40c34d0b370b1e5..06f9b338b628af77d6bd820419cdd3ce 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -33625,6 +33650,7 @@ +@@ -33613,6 +33638,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2365,7 +2365,7 @@ index 6f80031f076a7416d3de130ac40c34d0b370b1e5..06f9b338b628af77d6bd820419cdd3ce 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -35684,9 +35710,11 @@ +@@ -35677,9 +35703,11 @@ B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */, @@ -2377,7 +2377,7 @@ index 6f80031f076a7416d3de130ac40c34d0b370b1e5..06f9b338b628af77d6bd820419cdd3ce B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -36647,6 +36675,7 @@ +@@ -36641,6 +36669,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2385,7 +2385,7 @@ index 6f80031f076a7416d3de130ac40c34d0b370b1e5..06f9b338b628af77d6bd820419cdd3ce 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -36733,6 +36762,7 @@ +@@ -36727,6 +36756,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2393,7 +2393,7 @@ index 6f80031f076a7416d3de130ac40c34d0b370b1e5..06f9b338b628af77d6bd820419cdd3ce 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -36781,6 +36811,7 @@ +@@ -36775,6 +36805,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2401,7 +2401,7 @@ index 6f80031f076a7416d3de130ac40c34d0b370b1e5..06f9b338b628af77d6bd820419cdd3ce DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -37313,6 +37344,7 @@ +@@ -37307,6 +37338,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2410,7 +2410,7 @@ index 6f80031f076a7416d3de130ac40c34d0b370b1e5..06f9b338b628af77d6bd820419cdd3ce 2D8B92F5203D13E1009C868F /* UnifiedSource520.cpp in Sources */, 2D8B92F6203D13E1009C868F /* UnifiedSource521.cpp in Sources */, diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp -index 6e6e76404ee138b3cb0623a5aeaad54a7c1e4ba6..fc95d90a4100845e79b5781439e6d8665e3e4572 100644 +index 34ea8f48c903860c1df3f3fe86b44c7cb57270d3..d3dc7852c192675f6d185ce59d1fabe10a2ffbc9 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -59,6 +59,7 @@ @@ -2710,7 +2710,7 @@ index 784bf482fd68da68e1f38fd5cd6bcedc8971dfda..6cdf012453ff31120adbe5946ce23f07 } // namespace WebCore diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp -index 218ce4b947c42547ec4f9cf9e8517a5dc352c4c4..0b9716df54fd3ddfd2f4ab9de96198cb0e14e8c3 100644 +index a8f2a657e3ab7f8d318e2065cc5e5d45b59deeb5..c1e12e3033135db23ef11e408639c2ca0ce211a9 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.cpp +++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp @@ -633,6 +633,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen @@ -2828,7 +2828,7 @@ index 218ce4b947c42547ec4f9cf9e8517a5dc352c4c4..0b9716df54fd3ddfd2f4ab9de96198cb { if (is(context)) diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h -index 8f040444bb183d162c60f6fd4752becd9ce6ab99..c4b2e73c7344f94634d8ab40f626fa0dde123bca 100644 +index bc63ef8c1f43c8adce7d17bea9004717ad841695..fa01cec093a4e5e69aed21cb6eb102c5f0de1445 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.h +++ b/Source/WebCore/inspector/InspectorInstrumentation.h @@ -31,6 +31,7 @@ @@ -2848,7 +2848,7 @@ index 8f040444bb183d162c60f6fd4752becd9ce6ab99..c4b2e73c7344f94634d8ab40f626fa0d class InspectorTimelineAgent; class InstrumentingAgents; @@ -200,6 +202,7 @@ public: - static void didReceiveData(Frame*, unsigned long identifier, const char* data, int dataLength, int encodedDataLength); + static void didReceiveData(Frame*, unsigned long identifier, const uint8_t* data, int dataLength, int encodedDataLength); static void didFinishLoading(Frame*, DocumentLoader*, unsigned long identifier, const NetworkLoadMetrics&, ResourceLoader*); static void didFailLoading(Frame*, DocumentLoader*, unsigned long identifier, const ResourceError&); + static void didReceiveMainResourceError(Frame&, const ResourceError&); @@ -2891,7 +2891,7 @@ index 8f040444bb183d162c60f6fd4752becd9ce6ab99..c4b2e73c7344f94634d8ab40f626fa0d static void didClearWindowObjectInWorldImpl(InstrumentingAgents&, Frame&, DOMWrapperWorld&); static bool isDebuggerPausedImpl(InstrumentingAgents&); @@ -427,6 +438,7 @@ private: - static void didReceiveDataImpl(InstrumentingAgents&, unsigned long identifier, const char* data, int dataLength, int encodedDataLength); + static void didReceiveDataImpl(InstrumentingAgents&, unsigned long identifier, const uint8_t* data, int dataLength, int encodedDataLength); static void didFinishLoadingImpl(InstrumentingAgents&, unsigned long identifier, DocumentLoader*, const NetworkLoadMetrics&, ResourceLoader*); static void didFailLoadingImpl(InstrumentingAgents&, unsigned long identifier, DocumentLoader*, const ResourceError&); + static void didReceiveMainResourceErrorImpl(InstrumentingAgents&, Frame&, const ResourceError&); @@ -3402,7 +3402,7 @@ index 3386cb879f1178c1b9635775c9a0e864f5b94c52..d2350182f5f061855e8ca172779ad60e class Page; class SecurityOrigin; diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp -index cc90fe9d100dc2017de9af67fdc3d97bf5f9c29e..7d67644d3559524673121510f63b97c735268324 100644 +index d4f7873e85f91316012b944084f92097601e066d..05ce7e70327dfea3bd09523e55cdb1fb6183d1a4 100644 --- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp @@ -45,6 +45,7 @@ @@ -3427,7 +3427,7 @@ index cc90fe9d100dc2017de9af67fdc3d97bf5f9c29e..7d67644d3559524673121510f63b97c7 if (request.httpBody() && !request.httpBody()->isEmpty()) { - auto bytes = request.httpBody()->flatten(); - requestObject->setPostData(String::fromUTF8WithLatin1Fallback(bytes.data(), bytes.size())); -+ Vector bytes = request.httpBody()->flatten(); ++ Vector bytes = request.httpBody()->flatten(); + requestObject->setPostData(base64EncodeToString(bytes)); } return requestObject; @@ -3478,7 +3478,7 @@ index cc90fe9d100dc2017de9af67fdc3d97bf5f9c29e..7d67644d3559524673121510f63b97c7 ResourceRequest request = loader.request(); if (!!url) request.setURL(URL({ }, url)); -@@ -1280,14 +1292,24 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptRequestWithRespons +@@ -1284,14 +1296,24 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptRequestWithRespons response.setHTTPStatusCode(status); response.setHTTPStatusText(statusText); HTTPHeaderMap explicitHeaders; @@ -3503,7 +3503,7 @@ index cc90fe9d100dc2017de9af67fdc3d97bf5f9c29e..7d67644d3559524673121510f63b97c7 if (buffer->size()) loader->didReceiveBuffer(WTFMove(buffer), buffer->size(), DataPayloadWholeResource); loader->didFinishLoading(NetworkLoadMetrics()); -@@ -1328,6 +1350,12 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptRequestWithError(c +@@ -1332,6 +1354,12 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptRequestWithError(c return { }; } @@ -3516,7 +3516,7 @@ index cc90fe9d100dc2017de9af67fdc3d97bf5f9c29e..7d67644d3559524673121510f63b97c7 bool InspectorNetworkAgent::shouldTreatAsText(const String& mimeType) { return startsWithLettersIgnoringASCIICase(mimeType, "text/") -@@ -1369,6 +1397,12 @@ std::optional InspectorNetworkAgent::textContentForCachedResource(Cached +@@ -1373,6 +1401,12 @@ std::optional InspectorNetworkAgent::textContentForCachedResource(Cached return std::nullopt; } @@ -3530,7 +3530,7 @@ index cc90fe9d100dc2017de9af67fdc3d97bf5f9c29e..7d67644d3559524673121510f63b97c7 { ASSERT(result); diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.h b/Source/WebCore/inspector/agents/InspectorNetworkAgent.h -index d1ba2755317fcc5fde70f5257270105f2a4b5c4f..ceeb2ff6dfe05ed6f6204db99878add5e20f18cd 100644 +index 66ae7a46fe7991b392bb06531d36506ba31e2414..74fd279a05329e9d0c49bfa9f883e4a797eefc7a 100644 --- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.h +++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.h @@ -72,6 +72,7 @@ public: @@ -3550,7 +3550,7 @@ index d1ba2755317fcc5fde70f5257270105f2a4b5c4f..ceeb2ff6dfe05ed6f6204db99878add5 // InspectorInstrumentation void willRecalculateStyle(); diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp -index f55cbef37e294ea7abe9389a6b0a44b1cb71adbb..9ff6d44ceedd51cbc7eaa2a2cd7122c09c0007db 100644 +index f0806ed36dc6b72fb9a97c4a4fb22bc8a0956e1a..4820c81a7ff0a79fdc740a6d0d8dfeb91ec26c51 100644 --- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp @@ -32,19 +32,25 @@ @@ -3622,7 +3622,7 @@ index f55cbef37e294ea7abe9389a6b0a44b1cb71adbb..9ff6d44ceedd51cbc7eaa2a2cd7122c0 + return nameToWorld; +} + - static bool decodeBuffer(const char* buffer, unsigned size, const String& textEncodingName, String* result) + static bool decodeBuffer(const uint8_t* buffer, unsigned size, const String& textEncodingName, String* result) { if (buffer) { @@ -234,6 +253,8 @@ Protocol::Page::ResourceType InspectorPageAgent::resourceTypeJSON(InspectorPageA @@ -3889,14 +3889,14 @@ index f55cbef37e294ea7abe9389a6b0a44b1cb71adbb..9ff6d44ceedd51cbc7eaa2a2cd7122c0 -Protocol::ErrorStringOr InspectorPageAgent::snapshotRect(int x, int y, int width, int height, Protocol::Page::CoordinateSystem coordinateSystem) +Protocol::ErrorStringOr InspectorPageAgent::snapshotRect(int x, int y, int width, int height, Protocol::Page::CoordinateSystem coordinateSystem, std::optional&& omitDeviceScaleFactor) { - SnapshotOptions options = SnapshotOptionsNone; + SnapshotOptions options; if (coordinateSystem == Protocol::Page::CoordinateSystem::Viewport) - options |= SnapshotOptionsInViewCoordinates; + options.flags.add(SnapshotFlags::InViewCoordinates); + if (omitDeviceScaleFactor.has_value() && *omitDeviceScaleFactor) -+ options |= SnapshotOptionsOmitDeviceScaleFactor; ++ options.flags.add(SnapshotFlags::OmitDeviceScaleFactor); IntRect rectangle(x, y, width, height); - auto snapshot = snapshotFrameRect(m_inspectedPage.mainFrame(), rectangle, options); + auto snapshot = snapshotFrameRect(m_inspectedPage.mainFrame(), rectangle, WTFMove(options)); @@ -1094,6 +1211,47 @@ Protocol::ErrorStringOr InspectorPageAgent::snapshotRect(int x, int y, i return snapshot->toDataURL("image/png"_s, std::nullopt, PreserveResolution::Yes); } @@ -4550,7 +4550,7 @@ index f55cbef37e294ea7abe9389a6b0a44b1cb71adbb..9ff6d44ceedd51cbc7eaa2a2cd7122c0 } // namespace WebCore diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.h b/Source/WebCore/inspector/agents/InspectorPageAgent.h -index dec3d001b1d41d4f3f245caf50adf788a1965007..b7547fd8024bff5f1da695f72d70d02305c4137e 100644 +index b51addb1bd8f2cce69560799cd1d952d2de42838..2ad11ef1993ed5a223f63073c4b4464bfde93a34 100644 --- a/Source/WebCore/inspector/agents/InspectorPageAgent.h +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.h @@ -34,17 +34,23 @@ @@ -4673,7 +4673,7 @@ index dec3d001b1d41d4f3f245caf50adf788a1965007..b7547fd8024bff5f1da695f72d70d023 + void ensureUserWorldsExistInAllFrames(const Vector&); static bool mainResourceContent(Frame*, bool withBase64Encode, String* result); - static bool dataContent(const char* data, unsigned size, const String& textEncodingName, bool withBase64Encode, String* result); + static bool dataContent(const uint8_t* data, unsigned size, const String& textEncodingName, bool withBase64Encode, String* result); @@ -162,18 +190,19 @@ private: RefPtr m_backendDispatcher; @@ -4924,7 +4924,7 @@ index 982691dd2dfe2f65201370a12302b5086703c126..4af72beb3b1405ffac78e89e7fbb2b14 protected: static SameSiteInfo sameSiteInfo(const Document&, IsForDOMCookieAccess = IsForDOMCookieAccess::No); diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp -index b9dc5b06a88ad19ede9da8a00579da1aa87b3b18..719f7c3661406645b422e8896658048c673c78ce 100644 +index df67c1544844827739ad3e27c0c369723ae79391..7b5d137d72420100204797ae16e454ba6247140f 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp @@ -1405,8 +1405,6 @@ void DocumentLoader::detachFromFrame() @@ -4937,7 +4937,7 @@ index b9dc5b06a88ad19ede9da8a00579da1aa87b3b18..719f7c3661406645b422e8896658048c } diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h -index 45b202bcdf4b44a68de05fe827697948e8ce245b..0172d4a408c9c1198c07eb5e2ab0227babf31fd8 100644 +index d537947e02fadff26bfab0e83d895ca873ce0852..428f46a69f22af3a7ff498495189c6cf26a69a19 100644 --- a/Source/WebCore/loader/DocumentLoader.h +++ b/Source/WebCore/loader/DocumentLoader.h @@ -166,9 +166,13 @@ public: @@ -5103,7 +5103,7 @@ index e24fded2225f1c1918f454017566717e20484eab..30e4b7a986418c4b4f6c799b858b6082 void ProgressTracker::incrementProgress(unsigned long identifier, const ResourceResponse& response) diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h -index ec72e95492a6a75791b870506cbbde8eb9e7d285..9b9ca88a8091eb2f60b04462ca51eea6a2a833e0 100644 +index 6d84f6944df6177405c1faf3babde10d9bbf5993..a404540c03300e1e76888a8a0360ee6aaec2e0d9 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h @@ -297,7 +297,7 @@ public: @@ -5116,7 +5116,7 @@ index ec72e95492a6a75791b870506cbbde8eb9e7d285..9b9ca88a8091eb2f60b04462ca51eea6 #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 6356825b2e678c034f6e0f8089b2200a83926f98..521cd7403ff2e64fa49d7b54588e8de4db7147ed 100644 +index 96986b53091bc690e6fcd4cb067aba021a356072..0d3cc97860c059fe103e6eeac9cbff713d2bc930 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -125,6 +125,7 @@ @@ -5251,7 +5251,7 @@ index 6356825b2e678c034f6e0f8089b2200a83926f98..521cd7403ff2e64fa49d7b54588e8de4 m_touchPressed = touches->length() > 0; if (allTouchReleased) diff --git a/Source/WebCore/page/EventHandler.h b/Source/WebCore/page/EventHandler.h -index d426a0c2ef94ebb4a58d66ff527d6eb52d3668a8..e97f903e5bc097e84d4b61aa612fb694c4b551e3 100644 +index 9fb52b2e9fbd85731534a6b28a91a369c37877d2..393f7720588cb4801b46828940ab90b6ea547ff2 100644 --- a/Source/WebCore/page/EventHandler.h +++ b/Source/WebCore/page/EventHandler.h @@ -135,9 +135,7 @@ public: @@ -5309,7 +5309,7 @@ index d426a0c2ef94ebb4a58d66ff527d6eb52d3668a8..e97f903e5bc097e84d4b61aa612fb694 bool m_mouseDownMayStartDrag { false }; bool m_dragMayStartSelectionInstead { false }; diff --git a/Source/WebCore/page/EventSource.cpp b/Source/WebCore/page/EventSource.cpp -index 0dac7ff03cc846d1896a088f6263028616bdfa69..f4f702bf97428a4991d6254900e3ffcb0ce2a8a1 100644 +index b6e68f3c729fb41c929a6d178da60399fdc91f2b..64286a09d57c800257e25f78345394d8d4e1bdd4 100644 --- a/Source/WebCore/page/EventSource.cpp +++ b/Source/WebCore/page/EventSource.cpp @@ -36,6 +36,7 @@ @@ -5785,20 +5785,20 @@ index 37b1af211e340974e0c527bee8b173b6668eee0c..57d07c9196c714846177d529e2c66370 ViewportArguments m_viewportArguments; diff --git a/Source/WebCore/page/FrameSnapshotting.cpp b/Source/WebCore/page/FrameSnapshotting.cpp -index 2831421114137ec1eb7032c5bb89991750824bb0..484f4c59226f155ddd92769cc291eca98e9b3089 100644 +index 1a8eb236f326a9f8fb45c7d988b8796b2b237223..a546f6b38f7bc513212b3bb50c35a15af3c690b7 100644 --- a/Source/WebCore/page/FrameSnapshotting.cpp +++ b/Source/WebCore/page/FrameSnapshotting.cpp -@@ -103,7 +103,7 @@ RefPtr snapshotFrameRectWithClip(Frame& frame, const IntRect& image +@@ -106,7 +106,7 @@ RefPtr snapshotFrameRectWithClip(Frame& frame, const IntRect& image // Other paint behaviors are set by paintContentsForSnapshot. frame.view()->setPaintBehavior(paintBehavior); - float scaleFactor = frame.page()->deviceScaleFactor(); -+ float scaleFactor = options & SnapshotOptionsOmitDeviceScaleFactor ? 1 : frame.page()->deviceScaleFactor(); ++ float scaleFactor = options.flags.contains(SnapshotFlags::OmitDeviceScaleFactor) ? 1 : frame.page()->deviceScaleFactor(); if (frame.page()->delegatesScaling()) scaleFactor *= frame.page()->pageScaleFactor(); -@@ -114,7 +114,12 @@ RefPtr snapshotFrameRectWithClip(Frame& frame, const IntRect& image - auto buffer = ImageBuffer::create(imageRect.size(), RenderingMode::Unaccelerated, scaleFactor, DestinationColorSpace::SRGB(), PixelFormat::BGRA8); +@@ -117,7 +117,12 @@ RefPtr snapshotFrameRectWithClip(Frame& frame, const IntRect& image + auto buffer = ImageBuffer::create(imageRect.size(), RenderingMode::Unaccelerated, scaleFactor, options.colorSpace.value_or(DestinationColorSpace::SRGB()), options.pixelFormat.value_or(PixelFormat::BGRA8)); if (!buffer) return nullptr; +#if !PLATFORM(MAC) @@ -5810,7 +5810,7 @@ index 2831421114137ec1eb7032c5bb89991750824bb0..484f4c59226f155ddd92769cc291eca9 if (!clipRects.isEmpty()) { Path clipPath; -@@ -123,7 +128,10 @@ RefPtr snapshotFrameRectWithClip(Frame& frame, const IntRect& image +@@ -126,7 +131,10 @@ RefPtr snapshotFrameRectWithClip(Frame& frame, const IntRect& image buffer->context().clipPath(clipPath); } @@ -5823,19 +5823,19 @@ index 2831421114137ec1eb7032c5bb89991750824bb0..484f4c59226f155ddd92769cc291eca9 } diff --git a/Source/WebCore/page/FrameSnapshotting.h b/Source/WebCore/page/FrameSnapshotting.h -index 1023738af87f73d4313ab17f793e67e9663a36f9..0ed28b16672709db2933391dd2ea12e43eb0bf6a 100644 +index 0886a71486768c843166936887d8a38aff6a86c9..71f2d5b0578173342d9b3d353266785f1f9bb676 100644 --- a/Source/WebCore/page/FrameSnapshotting.h +++ b/Source/WebCore/page/FrameSnapshotting.h -@@ -49,6 +49,7 @@ enum { - SnapshotOptionsPaintSelectionAndBackgroundsOnly = 1 << 4, - SnapshotOptionsPaintEverythingExcludingSelection = 1 << 5, - SnapshotOptionsPaintWithIntegralScaleFactor = 1 << 6, -+ SnapshotOptionsOmitDeviceScaleFactor = 1 << 7, +@@ -51,6 +51,7 @@ enum class SnapshotFlags : uint8_t { + PaintSelectionAndBackgroundsOnly = 1 << 4, + PaintEverythingExcludingSelection = 1 << 5, + PaintWithIntegralScaleFactor = 1 << 6, ++ OmitDeviceScaleFactor = 1 << 7, }; - typedef unsigned SnapshotOptions; + struct SnapshotOptions { diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp -index ae519c8d74f7afe40447b4a581b633c7df86ebb5..6fdc50573d7874801cff97105ea1c5f89e36c11d 100644 +index 4f670736b7841a93e00e54a9889e7e823b07b844..5190228608e4ec877158e9fb5f2f709ed6980921 100644 --- a/Source/WebCore/page/FrameView.cpp +++ b/Source/WebCore/page/FrameView.cpp @@ -3028,7 +3028,7 @@ void FrameView::setBaseBackgroundColor(const Color& backgroundColor) @@ -5868,7 +5868,7 @@ index 28d1fc3242174a680711027877d4153923790220..058b5309eed081fcc1e4158f66e80642 if (stateObjectType == StateObjectType::Push) { frame->loader().history().pushState(WTFMove(data), title, fullURL.string()); diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp -index 94a54bb6f0dc5e16f8b173168f04cec562eeaaea..710537e98d21bb5eb550057bdcca658c8fa80b92 100644 +index 318ab13712bf685271812250cb2d46545c29c175..21b994189f01e3d8fafad8baaa9d7cb91fcbc763 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp @@ -446,6 +446,37 @@ void Page::setOverrideViewportArguments(const std::optional& @@ -5921,7 +5921,7 @@ index 94a54bb6f0dc5e16f8b173168f04cec562eeaaea..710537e98d21bb5eb550057bdcca658c resetSeenPlugins(); resetSeenMediaEngines(); } -@@ -3244,6 +3270,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3246,6 +3272,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -5939,7 +5939,7 @@ index 94a54bb6f0dc5e16f8b173168f04cec562eeaaea..710537e98d21bb5eb550057bdcca658c { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index 16167ce081c4ca8c701a09b910c81cb19a06aebb..9c42ef5422f0bcda3a60ce314c0c9d21c7a9d996 100644 +index b432645259476352c65245850f35ee9c6e758d1d..014e4c20bab319f1919774f52e2924f0ef8e7b7f 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h @@ -253,6 +253,9 @@ public: @@ -6641,10 +6641,10 @@ index 6600dfa7b189e15fab7fb796f66ef1a79dcd22f3..4c0bc485ca92614efca23a5a2da871b7 class SelectionData; } diff --git a/Source/WebCore/platform/DragImage.cpp b/Source/WebCore/platform/DragImage.cpp -index 903428f3ea6433a70dc1b8d55801e37746596c0f..19dc1ca1b09d472d180ce8d6576fd57d7a1ac461 100644 +index 7bc536cf5db50e71a0495b28eb9373ec1199e583..c164ae567e4a4a9d6f192757dce69a43abb52264 100644 --- a/Source/WebCore/platform/DragImage.cpp +++ b/Source/WebCore/platform/DragImage.cpp -@@ -274,7 +274,7 @@ DragImage::~DragImage() +@@ -280,7 +280,7 @@ DragImage::~DragImage() deleteDragImage(m_dragImageRef); } @@ -6817,10 +6817,10 @@ index bb5411ad58c4ea427837dc7ffeb8687d51e79061..0bc31619d5f8ce268cfbe8b4ee54f8c5 #endif diff --git a/Source/WebCore/platform/ScrollableArea.h b/Source/WebCore/platform/ScrollableArea.h -index 0195a1554379a9c3e1695f7c44ecdd3defd077fe..d7d42a204bd91a06c9dab1a820feb90293a8d761 100644 +index e27e01cc803431a185f6d1b45538a5c4e5f73383..9fe6ac53e7aec2d2a882ee91a9b80834c586e065 100644 --- a/Source/WebCore/platform/ScrollableArea.h +++ b/Source/WebCore/platform/ScrollableArea.h -@@ -106,7 +106,7 @@ public: +@@ -103,7 +103,7 @@ public: void doPostThumbMoveSnapping(ScrollbarOrientation); #if ENABLE(TOUCH_EVENTS) @@ -7772,7 +7772,7 @@ index 7330aa933924791f1292c0847921e3b367493d96..a5238a748d1fb4bfa5b3e0882fe62f40 StreamBuffer m_buffer; static const unsigned maxBufferSize = 100 * 1024 * 1024; diff --git a/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp b/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp -index 625485bf1c0e8e5819bf654055bd386437183a48..90028b00190238722f5edf53ce5142d7e8a6b08a 100644 +index d1379498aab81ee2ca7aa089b1b50f995c282947..7ad34577cf2dfb36e4eb369fd5060c53eebae71d 100644 --- a/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp +++ b/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp @@ -96,7 +96,7 @@ static inline auto callbacksRunLoopMode() @@ -7815,7 +7815,7 @@ index c4eb67d6f7c334076b32b798dcea40b570681e6f..ce86ab28225aa466350671441294f2ac bool m_detectedDatabaseCorruption { false }; diff --git a/Source/WebCore/platform/network/curl/CurlStream.cpp b/Source/WebCore/platform/network/curl/CurlStream.cpp -index 1b15af01bcc0eab910fc3b9e8a8d463b7c668519..c11f0b310810fad74eacbd2c41ff16c2507111f1 100644 +index ff55d352342786fcdeaefc64f6ccbe015f4c5b5f..37a657851d84c3693c1e31239a19d9edd935d039 100644 --- a/Source/WebCore/platform/network/curl/CurlStream.cpp +++ b/Source/WebCore/platform/network/curl/CurlStream.cpp @@ -33,7 +33,7 @@ @@ -7838,7 +7838,7 @@ index 1b15af01bcc0eab910fc3b9e8a8d463b7c668519..c11f0b310810fad74eacbd2c41ff16c2 auto errorCode = m_curlHandle->perform(); if (errorCode != CURLE_OK) { diff --git a/Source/WebCore/platform/network/curl/CurlStream.h b/Source/WebCore/platform/network/curl/CurlStream.h -index 313b0173da5cd404a1e3fcad9573b8ff7c3abd4f..020980a0f61d47e8c7929bfaab2f8394d014766d 100644 +index e64629fc22a2097a2af0b0c0139b23d7908cf3dc..920a8c12c6c69afc5aec6de12e9f5fba312237a0 100644 --- a/Source/WebCore/platform/network/curl/CurlStream.h +++ b/Source/WebCore/platform/network/curl/CurlStream.h @@ -50,12 +50,12 @@ public: @@ -7895,7 +7895,7 @@ index 7d881206c9689f433227969c9b7f9ff268bdaaed..2e8118f11f87fa5f32adcedc165aec82 void send(CurlStreamID, UniqueArray&&, size_t); diff --git a/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h b/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h -index 2d0584dab5cff6d1490629642baea652faea0033..bc0f81f4f5161ff2f046ecb4b429641c921a8707 100644 +index b804fde0973bbfb28331cf7c3a1f20b043e74fe8..af3005261593b5fa91484c98c43d021227716231 100644 --- a/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h +++ b/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h @@ -44,7 +44,7 @@ class StorageSessionProvider; @@ -7917,7 +7917,7 @@ index 2d0584dab5cff6d1490629642baea652faea0033..bc0f81f4f5161ff2f046ecb4b429641c size_t bufferedAmount() final; std::optional platformSendInternal(const uint8_t*, size_t); diff --git a/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp b/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp -index 2fece028effdbe88518ec7b8be259b0a09086ccf..9eeffdceaa546488f31db0207d19d97efd9cc7ea 100644 +index 4b9491c11543f2b60f12d36e9e6a0cbaae34a72e..e907fc00a2a426384ce1e471847911c9ba1739af 100644 --- a/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp +++ b/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp @@ -43,7 +43,7 @@ @@ -8607,7 +8607,7 @@ index 063ee6a461bb68ebde70c6f9ee4e83961d03354b..d7db79273b77296864150d1bc0036329 RemoveStorageAccessForFrame(WebCore::FrameIdentifier frameID, WebCore::PageIdentifier pageID); LogUserInteraction(WebCore::RegistrableDomain domain) diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp -index b0f0c5011bd4385536c90f47c71fe75020da19be..304b5b271be8af1dc7165cab664e7afcc30fc6ca 100644 +index b9819db9d18967bed0c488b46380618447beb680..705312588f364aca63fffac2b8f1c4fa1cdb2495 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -26,7 +26,6 @@ @@ -8618,8 +8618,8 @@ index b0f0c5011bd4385536c90f47c71fe75020da19be..304b5b271be8af1dc7165cab664e7afc #include "ArgumentCoders.h" #include "Attachment.h" #include "AuthenticationManager.h" -@@ -555,6 +554,59 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) - m_storageManagerSet->remove(sessionID); +@@ -557,6 +556,59 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) + server->close(); } +void NetworkProcess::getAllCookies(PAL::SessionID sessionID, CompletionHandler&&)>&& completionHandler) @@ -8679,7 +8679,7 @@ index b0f0c5011bd4385536c90f47c71fe75020da19be..304b5b271be8af1dc7165cab664e7afc void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index b8a7ad49ca10ed0f33e6017cd4d36b02febd9966..775254fe51b4c46b585daa5cd45f1285504654cc 100644 +index e9a21b0831c73b3ea4994c6b9880ad543edfff75..464f532911f04fe96bf91c7058f16d6e131bd5a2 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h @@ -34,6 +34,7 @@ @@ -8698,7 +8698,7 @@ index b8a7ad49ca10ed0f33e6017cd4d36b02febd9966..775254fe51b4c46b585daa5cd45f1285 class CurlProxySettings; class ProtectionSpace; class StorageQuotaManager; -@@ -207,6 +209,14 @@ public: +@@ -208,6 +210,14 @@ public: void addWebsiteDataStore(WebsiteDataStoreParameters&&); @@ -8714,7 +8714,7 @@ index b8a7ad49ca10ed0f33e6017cd4d36b02febd9966..775254fe51b4c46b585daa5cd45f1285 void clearPrevalentResource(PAL::SessionID, const RegistrableDomain&, CompletionHandler&&); void clearUserInteraction(PAL::SessionID, const RegistrableDomain&, CompletionHandler&&); diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in -index 90463d25bd6a4894a2e6e9c15f15e2c82884f19e..cbed75133a0d6a1c91da02e029350ed304548de2 100644 +index ae15ff0e12ca545178907d972a09ce6d2321a2d4..4ee782cbb1e4ce8228785f63fa1ca868276a2be9 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in @@ -79,6 +79,14 @@ messages -> NetworkProcess LegacyReceiver { @@ -8733,10 +8733,10 @@ index 90463d25bd6a4894a2e6e9c15f15e2c82884f19e..cbed75133a0d6a1c91da02e029350ed3 ClearPrevalentResource(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () Async ClearUserInteraction(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () Async diff --git a/Source/WebKit/NetworkProcess/NetworkSession.h b/Source/WebKit/NetworkProcess/NetworkSession.h -index 7af3f36f1e61c4c2b2358e7d6f8f7e37b9e731a8..ba41409688495af299995baa68388c8aa9a59b36 100644 +index 7fa92744f2152dc363015b8ac2d82650435dcb24..4208e0e69d15886843517d795a366d798b666d5a 100644 --- a/Source/WebKit/NetworkProcess/NetworkSession.h +++ b/Source/WebKit/NetworkProcess/NetworkSession.h -@@ -151,6 +151,9 @@ public: +@@ -152,6 +152,9 @@ public: bool isStaleWhileRevalidateEnabled() const { return m_isStaleWhileRevalidateEnabled; } @@ -8746,7 +8746,7 @@ index 7af3f36f1e61c4c2b2358e7d6f8f7e37b9e731a8..ba41409688495af299995baa68388c8a #if ENABLE(SERVICE_WORKER) void addSoftUpdateLoader(std::unique_ptr&& loader) { m_softUpdateLoaders.add(WTFMove(loader)); } void removeSoftUpdateLoader(ServiceWorkerSoftUpdateLoader* loader) { m_softUpdateLoaders.remove(loader); } -@@ -195,6 +198,7 @@ protected: +@@ -200,6 +203,7 @@ protected: #endif bool m_isStaleWhileRevalidateEnabled { false }; std::unique_ptr m_privateClickMeasurement; @@ -8755,7 +8755,7 @@ index 7af3f36f1e61c4c2b2358e7d6f8f7e37b9e731a8..ba41409688495af299995baa68388c8a HashSet> m_keptAliveLoads; diff --git a/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp b/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp -index 15a99ece34ac16034d6bbc8e47c289e38b6c92b5..32f3c34b41e49494a7fcf51563f616ff82eda5a4 100644 +index 52eb5b08f16cba232149028cdaa8150ad04e4a9f..1f541ccfbe183ee152cea69108b80ffd3b1ff34f 100644 --- a/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp +++ b/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp @@ -43,7 +43,7 @@ Ref NetworkSocketStream::create(NetworkProcess& networkProc @@ -8961,7 +8961,7 @@ index 4243f32573bdad1452107f55c82328961cd5b0d4..023416d6e453431167441504ea38b3b2 void didReceiveMessage(IPC::Connection&, IPC::Decoder&); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h -index 869284c36e115a5e554f452dfba58dee72501364..ebb414bf256a3c8c13b4c8e6afbedfcb8c477ed0 100644 +index fad248e93946873c269bd98ad434ca74218004a3..04113bce857b400c24f80ba6366511b94f8a10f1 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h @@ -84,6 +84,8 @@ public: @@ -8971,10 +8971,10 @@ index 869284c36e115a5e554f452dfba58dee72501364..ebb414bf256a3c8c13b4c8e6afbedfcb + static void setCookieFromResponse(NetworkSessionCocoa& session, const NetworkLoadParameters&, const URL& mainDocumentURL, const String& setCookieValue); + private: - NetworkDataTaskCocoa(NetworkSession&, NetworkDataTaskClient&, const WebCore::ResourceRequest&, WebCore::FrameIdentifier, WebCore::PageIdentifier, WebPageProxyIdentifier, WebCore::StoredCredentialsPolicy, WebCore::ContentSniffingPolicy, WebCore::ContentEncodingSniffingPolicy, bool shouldClearReferrerOnHTTPSToHTTPRedirect, PreconnectOnly, bool dataTaskIsForMainFrameNavigation, bool dataTaskIsForMainResourceNavigationForAnyFrame, std::optional, std::optional isNavigatingToAppBoundDomain, WebCore::ShouldRelaxThirdPartyCookieBlocking, std::optional); + NetworkDataTaskCocoa(NetworkSession&, NetworkDataTaskClient&, const NetworkLoadParameters&); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm -index 1bf41e555f06701dce772a417dc86f1e3d85463f..ad79c5499adf49565bc31cd8de056b1d76052aa3 100644 +index cfdfe1369ce6a8e5fbe3f6fa41157730294f7323..43a131b2e3617a6421a73a9db38cad3292a9d72a 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm @@ -41,6 +41,7 @@ @@ -8985,7 +8985,7 @@ index 1bf41e555f06701dce772a417dc86f1e3d85463f..ad79c5499adf49565bc31cd8de056b1d #import #import #import -@@ -718,4 +719,59 @@ void NetworkDataTaskCocoa::setPriority(WebCore::ResourceLoadPriority priority) +@@ -719,4 +720,59 @@ void NetworkDataTaskCocoa::setPriority(WebCore::ResourceLoadPriority priority) m_task.get().priority = toNSURLSessionTaskPriority(priority); } @@ -9046,10 +9046,10 @@ index 1bf41e555f06701dce772a417dc86f1e3d85463f..ad79c5499adf49565bc31cd8de056b1d + } diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 06cebafbedfc75a7c82cb821139c4789e1f56392..ad5924870e46069e31bd1efdbe87faeb9b9f4f46 100644 +index 355867c2060d68bc933dae07f8a607f1dcec4d03..4eb9f77257ada6d9af38516733fa690cd2ddb740 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -@@ -661,7 +661,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se +@@ -662,7 +662,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se NegotiatedLegacyTLS negotiatedLegacyTLS = NegotiatedLegacyTLS::No; if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { @@ -9058,7 +9058,7 @@ index 06cebafbedfc75a7c82cb821139c4789e1f56392..ad5924870e46069e31bd1efdbe87faeb return completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]); #if HAVE(TLS_PROTOCOL_VERSION_T) -@@ -911,6 +911,13 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se +@@ -917,6 +917,13 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData(taskMetrics, networkDataTask->networkLoadMetrics().hasCrossOriginRedirect)); @@ -9246,18 +9246,18 @@ index 1c427ddb78d6953fe8960c5692afde4f4f0eee85..cf33ff6076dd95ffe564f1dde89c177a WebCore::ShouldRelaxThirdPartyCookieBlocking m_shouldRelaxThirdPartyCookieBlocking { WebCore::ShouldRelaxThirdPartyCookieBlocking::No }; diff --git a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp -index 457807605d781be334897357849f00f4c0f5ab5a..2775faada0730308ce2ef95d67a56fc143c2a80b 100644 +index 0f37bb4cfbdf348958aa178343b5d7e8d369c44a..274b26410539bddedd3c03fee903e7db89a8c63c 100644 --- a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp +++ b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp @@ -483,6 +483,7 @@ void NetworkDataTaskSoup::didSendRequest(GRefPtr&& inputStream) + m_networkLoadMetrics.responseStart = MonotonicTime::now(); + #endif - // FIXME: This cannot be eliminated until other code no longer relies on ResourceResponse's NetworkLoadMetrics. - m_response.setDeprecatedNetworkLoadMetrics(Box::create(m_networkLoadMetrics)); + m_response.m_httpRequestHeaderFields = m_networkLoadMetrics.requestHeaders; dispatchDidReceiveResponse(); } -@@ -577,6 +578,8 @@ bool NetworkDataTaskSoup::acceptCertificate(GTlsCertificate* certificate, GTlsCe +@@ -580,6 +581,8 @@ bool NetworkDataTaskSoup::acceptCertificate(GTlsCertificate* certificate, GTlsCe { ASSERT(m_soupMessage); URL url = soupURIToURL(soup_message_get_uri(m_soupMessage.get())); @@ -9568,11 +9568,11 @@ index 001558dd58f4d85f360d5711caa03db33889011e..1e0898f985f1d13036d31e3e284258a3 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 f0c8eef53d3597e0ea8a11db101ea94601419e17..3c7888732f3bbc59fb47e8c8575260a99a8a8c3c 100644 +index 91d21d8f236bd18832b50d2cad311cc6f2488cee..6c4caa100f785aa896569f24539467693295746c 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp @@ -120,6 +120,10 @@ - #include + #include #endif +#if PLATFORM(WPE) @@ -10126,10 +10126,10 @@ index 85d6f74114f4e7f82d9502d1b99d69098d6a49b6..6896c9756edb233dda46c7031e1af699 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index 02225453c31a5ba91858fe705c65e954c14d7066..ee195869db2496a536871fa80a6a1208bed63007 100644 +index 3b86cf5d9b54cae7390bd13a6507b36729ebd626..98a6b7fb057e9fe8816c0ecd9058ba763e973eb8 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -289,11 +289,14 @@ Shared/WebsiteData/WebsiteData.cpp +@@ -290,11 +290,14 @@ Shared/WebsiteData/WebsiteData.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -10144,7 +10144,7 @@ index 02225453c31a5ba91858fe705c65e954c14d7066..ee195869db2496a536871fa80a6a1208 UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -301,6 +304,7 @@ UIProcess/PageLoadState.cpp +@@ -302,6 +305,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -10152,7 +10152,7 @@ index 02225453c31a5ba91858fe705c65e954c14d7066..ee195869db2496a536871fa80a6a1208 UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -342,6 +346,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -343,6 +347,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -10161,7 +10161,7 @@ index 02225453c31a5ba91858fe705c65e954c14d7066..ee195869db2496a536871fa80a6a1208 UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPreferences.cpp -@@ -463,7 +469,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -464,7 +470,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -10174,10 +10174,10 @@ index 02225453c31a5ba91858fe705c65e954c14d7066..ee195869db2496a536871fa80a6a1208 UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index b148013c90465f932fc6ad94b1e7af94941238c9..921ac50b71e6baeb3a08f62bac0d4d63e398537c 100644 +index 8cfc6074d0562aa582c5c0d23488ee636b2c9a9c..628c0559d2061158a7a35bfc2b30b7a55b51c542 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -265,6 +265,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm +@@ -267,6 +267,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -10185,7 +10185,7 @@ index b148013c90465f932fc6ad94b1e7af94941238c9..921ac50b71e6baeb3a08f62bac0d4d63 UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -432,6 +433,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -434,6 +435,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -10487,7 +10487,7 @@ index afa925f36c29db9c23921298dead9cce737500d6..42d396342acdb6d39830f611df0ee40e NS_ASSUME_NONNULL_END diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm -index 6147d4034219ac32a9c8f86cbfd587fcaf918d93..2097e6ac73909e8576855877d6debb387fb690c1 100644 +index 672b2053442e7e834aa453c40d32c9d90701e103..3d49ea06d6cda6c274ef9c59c003a1275e916810 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm @@ -42,6 +42,7 @@ @@ -11087,7 +11087,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 d46e0338f6335fa4e581ae3fe832c445eb00bd18..50deaa16224f20c32418f5ea05eaccc8ae16ea0c 100644 +index f2a886fffc36608c632b0349b4fe517dacfb1514..86d3491f48f785a18a424d128a413b91ff09acdc 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp @@ -32,6 +32,7 @@ @@ -11490,10 +11490,10 @@ index e4b92ace1531090ae38a7aec3d3d4febf19aee84..43690f9ef4969a39084501613bfc00a7 + +cairo_surface_t* webkitWebViewBackendTakeScreenshot(WebKitWebViewBackend*); diff --git a/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt b/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt -index ac3a815df9c15eb3170495d0b1291cbdf67f717c..7a00d1b21d36890037d21668b1780a5da06b5aee 100644 +index 8cf9d4ff38382b3d348a732d69d00e7720576777..052e75a649f49ca8704d013a03299fd4aca68fa1 100644 --- a/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt +++ b/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt -@@ -319,6 +319,8 @@ WEBKIT_TYPE_WEB_VIEW_BACKEND +@@ -320,6 +320,8 @@ WEBKIT_TYPE_WEB_VIEW_BACKEND WebKitWebViewBackend webkit_web_view_backend_get_wpe_backend webkit_web_view_backend_new @@ -11732,7 +11732,7 @@ index 7a18a6184a04aa37bb6d328a817b0a0a3e03cb50..92bb58f42cf5ff592b6d465f16ffcf28 @class WKWebView; diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -index 7f5390365030fbf2b45d21066fe98c8aa38a9fe7..dff5f731e75335b47f114cb4513065126804d222 100644 +index 5167bdb8a50af3d33e9971efe288fb2c6840eff3..f38d7872046347ff5a8c5b2f4376bf8cfc883752 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm @@ -34,6 +34,7 @@ @@ -11743,7 +11743,7 @@ index 7f5390365030fbf2b45d21066fe98c8aa38a9fe7..dff5f731e75335b47f114cb451306512 #import "QuickLookThumbnailLoader.h" #import "SafeBrowsingSPI.h" #import "SafeBrowsingWarning.h" -@@ -226,9 +227,66 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting() +@@ -223,9 +224,66 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting() void WebPageProxy::startDrag(const DragItem& dragItem, const ShareableBitmap::Handle& dragImageHandle) { @@ -11835,10 +11835,10 @@ index 6cd0c0136e1f8d9bb24679af22551aa7d66e930b..71058bba5e0e1b24605d89289da3119b m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSApp queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h -index 7eb7b23f4442556db85fd05773e246da8b99ba8d..a10191e13f2f172e60798a3d7447076bb4fc85f3 100644 +index bbc683ac0715138a601f8d85796b901fdc170b2e..4b74373d67807eba427c91e66e3b8607654ff0c0 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h -@@ -518,6 +518,9 @@ public: +@@ -512,6 +512,9 @@ public: void provideDataForPasteboard(NSPasteboard *, NSString *type); NSArray *namesOfPromisedFilesDroppedAtDestination(NSURL *dropDestination); @@ -11849,10 +11849,10 @@ index 7eb7b23f4442556db85fd05773e246da8b99ba8d..a10191e13f2f172e60798a3d7447076b void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -index 5f5076affa21c72b46e66668ded1aa15e74d7fc8..ec351fa3fb5bf7831c77f2c5ccffc9a5bff981f1 100644 +index e32221c3524a8c662cc0ac84847b188b9cc463b8..58df7fff1719223c62fcac1cc734c01d48964a50 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -@@ -2525,6 +2525,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() +@@ -2608,6 +2608,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() if (!m_colorSpace) m_colorSpace = [NSColorSpace sRGBColorSpace]; } @@ -11864,7 +11864,7 @@ index 5f5076affa21c72b46e66668ded1aa15e74d7fc8..ec351fa3fb5bf7831c77f2c5ccffc9a5 ASSERT(m_colorSpace); return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] }; -@@ -4603,6 +4608,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu +@@ -4686,6 +4691,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu return adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions)); } @@ -15458,7 +15458,7 @@ index 7a14cfba15c103a2d4fe263fa49d25af3c396ec2..3ee0e154349661632799057c71f1d1f1 BOOL result = ::CreateProcess(0, commandLine.data(), 0, 0, true, 0, 0, 0, &startupInfo, &processInformation); diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h -index e722b403a77d3fafd836c28ddfce6ae8b34b5d78..c437eaeb8b2295a9cffba88a1dadaf5c5fcb9ac0 100644 +index 8770ad463816bfef4c4a993746539e02d21cd572..e16f20b54132e19b34b74ae85271d3fa44f76af2 100644 --- a/Source/WebKit/UIProcess/PageClient.h +++ b/Source/WebKit/UIProcess/PageClient.h @@ -314,6 +314,11 @@ public: @@ -15785,7 +15785,7 @@ index 0000000000000000000000000000000000000000..6d04f9290135069359ce6bf872654648 + +#endif // ENABLE(REMOTE_INSPECTOR) diff --git a/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp b/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp -index 04c984f65fdee5a87c8e27d960b16abefa13aace..b91356c12dcb35a69cf4bb2def4fcd61223dff3a 100644 +index e42dbf1281d36fef2e303e707d5b5baf166ee152..80fab5d4ac007f0d2da9f58bee03a5ab3c845b83 100644 --- a/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp +++ b/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp @@ -37,6 +37,8 @@ @@ -16463,10 +16463,10 @@ index 0000000000000000000000000000000000000000..94e9f24353337169992724e2fcdf7086 + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab841b903d1 100644 +index 35fc94bfd4e14ba33cd67ba4c6e787f361709af0..ab4430494958320408f0481d59dc21a03a795f7c 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp -@@ -239,7 +239,7 @@ +@@ -240,7 +240,7 @@ #include "ViewSnapshotStore.h" #endif @@ -16475,7 +16475,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 #include #endif -@@ -608,6 +608,10 @@ WebPageProxy::~WebPageProxy() +@@ -611,6 +611,10 @@ WebPageProxy::~WebPageProxy() #if ENABLE(MEDIA_SESSION_COORDINATOR) WEBPAGEPROXY_DESTRUCTOR_WKCOORDINATOR_ADDITIONS #endif @@ -16486,7 +16486,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 } // FIXME: Should return a const PageClient& and add a separate non-const -@@ -990,6 +994,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) +@@ -993,6 +997,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) m_pageLoadState.didSwapWebProcesses(); if (reason != ProcessLaunchReason::InitialProcess) m_drawingArea->waitForBackingStoreUpdateOnNextPaint(); @@ -16494,7 +16494,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 } void WebPageProxy::didAttachToRunningProcess() -@@ -1307,6 +1312,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1315,6 +1320,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -16516,7 +16516,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1824,6 +1844,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1832,6 +1852,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -16548,7 +16548,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2014,6 +2059,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2022,6 +2067,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -16574,7 +16574,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2581,6 +2645,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2594,6 +2658,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -16583,7 +16583,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2591,6 +2657,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2604,6 +2670,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -16592,7 +16592,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2606,18 +2674,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2626,6 +2717,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2639,6 +2730,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -16662,7 +16662,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2638,8 +2747,18 @@ void WebPageProxy::didStartDrag() +@@ -2651,8 +2760,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -16682,7 +16682,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2744,16 +2863,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2757,16 +2876,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -16728,7 +16728,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -2973,7 +3114,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -2986,7 +3127,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -16737,7 +16737,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -3006,7 +3147,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3019,7 +3160,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -16746,7 +16746,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3389,6 +3530,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3402,6 +3543,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -16755,7 +16755,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 receivedPolicyDecision(policyAction, navigation, WTFMove(policies), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3455,6 +3598,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3468,6 +3611,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, RefPtr&& websitePolicies, Variant, Ref>&& navigationActionOrResponse, Ref&& sender, std::optional sandboxExtensionHandle, WillContinueLoadInNewProcess willContinueLoadInNewProcess) { @@ -16763,7 +16763,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4193,6 +4337,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4206,6 +4350,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -16775,7 +16775,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4525,6 +4674,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4538,6 +4687,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -16783,7 +16783,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4747,6 +4897,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4760,6 +4910,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -16792,7 +16792,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 // 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; -@@ -5188,7 +5340,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5201,7 +5353,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) { @@ -16808,7 +16808,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5705,6 +5864,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5718,6 +5877,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa auto* originatingPage = m_process->webPage(originatingPageID); auto originatingFrameInfo = API::FrameInfo::create(WTFMove(originatingFrameInfoData), originatingPage); auto mainFrameURL = m_mainFrame ? m_mainFrame->url() : URL(); @@ -16816,7 +16816,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 auto completionHandler = [this, protectedThis = makeRef(*this), mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -5745,6 +5905,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5758,6 +5918,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -16824,7 +16824,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 } void WebPageProxy::exitFullscreenImmediately() -@@ -5780,6 +5941,10 @@ void WebPageProxy::closePage() +@@ -5793,6 +5954,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -16835,7 +16835,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -5816,6 +5981,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -5829,6 +5994,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 { @@ -16844,7 +16844,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -5837,6 +6004,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -5850,6 +6017,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -16853,7 +16853,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 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 { -@@ -5860,6 +6029,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -5873,6 +6042,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -16862,7 +16862,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 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 { -@@ -6020,6 +6191,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6033,6 +6204,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -16871,7 +16871,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7226,6 +7399,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7239,6 +7412,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -16880,7 +16880,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 } break; } -@@ -7252,7 +7427,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7265,7 +7440,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()); @@ -16888,7 +16888,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7271,7 +7445,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7284,7 +7458,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); @@ -16896,7 +16896,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7280,6 +7453,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7293,6 +7466,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -16904,7 +16904,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 } break; } -@@ -7610,7 +7784,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7623,7 +7797,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%d", reason); @@ -16916,7 +16916,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -7980,6 +8157,7 @@ static const Vector& mediaRelatedIOKitClasses() +@@ -7993,6 +8170,7 @@ static const Vector& mediaRelatedIOKitClasses() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -16924,7 +16924,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8172,6 +8350,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8185,6 +8363,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.shouldRelaxThirdPartyCookieBlocking = m_configuration->shouldRelaxThirdPartyCookieBlocking(); parameters.canUseCredentialStorage = m_canUseCredentialStorage; @@ -16933,7 +16933,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 #if PLATFORM(GTK) parameters.themeName = pageClient().themeName(); #endif -@@ -8244,6 +8424,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8257,6 +8437,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -16948,7 +16948,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = makeRef(*this), authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8337,6 +8525,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8350,6 +8538,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -16965,7 +16965,7 @@ index df2ff1d277eee85d825ca499345cd7b47ae63ea4..c9e8ba83df54e99c9ecdfd3efd725ab8 // 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 ba69944c9d30b87ac585e2f0499c3566737685d3..85c63743fe7cef4e5bb262c9eed592d4f49439c6 100644 +index 6d05d6fc7908e4b2db85a6423c4fce6966600c4a..d447eb81730b2a048258f92cf6fb5f1071c7b36e 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -38,6 +38,7 @@ @@ -17003,7 +17003,7 @@ index ba69944c9d30b87ac585e2f0499c3566737685d3..85c63743fe7cef4e5bb262c9eed592d4 #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY) #include #include -@@ -241,6 +253,7 @@ class AuthenticationChallenge; +@@ -242,6 +254,7 @@ class AuthenticationChallenge; class CertificateInfo; class Cursor; class DragData; @@ -17011,7 +17011,7 @@ index ba69944c9d30b87ac585e2f0499c3566737685d3..85c63743fe7cef4e5bb262c9eed592d4 class FloatRect; class FontAttributeChanges; class FontChanges; -@@ -248,7 +261,6 @@ class GraphicsLayer; +@@ -249,7 +262,6 @@ class GraphicsLayer; class IntSize; class ProtectionSpace; class RunLoopObserver; @@ -17019,7 +17019,7 @@ index ba69944c9d30b87ac585e2f0499c3566737685d3..85c63743fe7cef4e5bb262c9eed592d4 class SharedBuffer; class SpeechRecognitionRequest; class TextIndicator; -@@ -527,6 +539,8 @@ public: +@@ -525,6 +537,8 @@ public: void setControlledByAutomation(bool); WebPageInspectorController& inspectorController() { return *m_inspectorController; } @@ -17028,7 +17028,7 @@ index ba69944c9d30b87ac585e2f0499c3566737685d3..85c63743fe7cef4e5bb262c9eed592d4 #if PLATFORM(IOS_FAMILY) void showInspectorIndication(); -@@ -598,6 +612,11 @@ public: +@@ -596,6 +610,11 @@ public: void setPageLoadStateObserver(std::unique_ptr&&); @@ -17040,7 +17040,7 @@ index ba69944c9d30b87ac585e2f0499c3566737685d3..85c63743fe7cef4e5bb262c9eed592d4 void initializeWebPage(); void setDrawingArea(std::unique_ptr&&); -@@ -625,6 +644,7 @@ public: +@@ -623,6 +642,7 @@ public: void closePage(); void addPlatformLoadParameters(WebProcessProxy&, LoadParameters&); @@ -17048,7 +17048,7 @@ index ba69944c9d30b87ac585e2f0499c3566737685d3..85c63743fe7cef4e5bb262c9eed592d4 RefPtr loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemesButNotAppLinks, API::Object* userData = nullptr); RefPtr loadFile(const String& fileURL, const String& resourceDirectoryURL, 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); -@@ -1143,6 +1163,7 @@ public: +@@ -1141,6 +1161,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -17056,7 +17056,7 @@ index ba69944c9d30b87ac585e2f0499c3566737685d3..85c63743fe7cef4e5bb262c9eed592d4 void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1217,14 +1238,20 @@ public: +@@ -1215,14 +1236,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -17078,7 +17078,7 @@ index ba69944c9d30b87ac585e2f0499c3566737685d3..85c63743fe7cef4e5bb262c9eed592d4 #endif void processDidBecomeUnresponsive(); -@@ -1466,6 +1493,8 @@ public: +@@ -1464,6 +1491,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -17087,7 +17087,7 @@ index ba69944c9d30b87ac585e2f0499c3566737685d3..85c63743fe7cef4e5bb262c9eed592d4 #endif #if ENABLE(WEB_CRYPTO) -@@ -2545,6 +2574,7 @@ private: +@@ -2551,6 +2580,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17095,7 +17095,7 @@ index ba69944c9d30b87ac585e2f0499c3566737685d3..85c63743fe7cef4e5bb262c9eed592d4 #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2794,6 +2824,20 @@ private: +@@ -2800,6 +2830,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17116,7 +17116,7 @@ index ba69944c9d30b87ac585e2f0499c3566737685d3..85c63743fe7cef4e5bb262c9eed592d4 #endif PageLoadState m_pageLoadState; -@@ -3006,6 +3050,9 @@ private: +@@ -3013,6 +3057,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17127,7 +17127,7 @@ index ba69944c9d30b87ac585e2f0499c3566737685d3..85c63743fe7cef4e5bb262c9eed592d4 #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 9b04aa331bb07bab628cfb1c52e7890c9408dce5..d0a60f9bac2aad2f901ab3835d1d2191462a2d9e 100644 +index ab324811e16862d4eab1e8c6efd0183f9c64b8dd..57733275e2a3451973a7410ae09d7942da8e04c7 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -17221,7 +17221,7 @@ index 55c58c43ca7a96a7c93681616e3828660b106f7c..2e648b2610e3f7fc415e424687c93749 WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index bd96ab1ecd41a9f4984f1bf6add9f6d7190beef7..6ef22654827006edb495ee85381d2220ad1f2453 100644 +index d4090a9bb77ece44f93a182c74c700aa016ae266..7aea872d4053fab26664dffad8a1313eb05e8461 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp @@ -2123,6 +2123,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O @@ -17243,7 +17243,7 @@ index bd96ab1ecd41a9f4984f1bf6add9f6d7190beef7..6ef22654827006edb495ee85381d2220 void WebsiteDataStore::hasAppBoundSession(CompletionHandler&& completionHandler) const { diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -index 17aad057a3414fb9845e992a3a720512bb8b6080..ae3e4511a99d6dcc7f3363ce37d3207eb878cd90 100644 +index 9957e51ac587b36660bd6b2e20925811136e7a50..d1835053592b21b3d014e90d8a3e0c58dfc2073c 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h @@ -92,6 +92,7 @@ enum class CacheModel : uint8_t; @@ -17301,7 +17301,7 @@ index 17aad057a3414fb9845e992a3a720512bb8b6080..ae3e4511a99d6dcc7f3363ce37d3207e void resetQuota(CompletionHandler&&); #if ENABLE(APP_BOUND_DOMAINS) -@@ -421,9 +442,11 @@ private: +@@ -423,9 +444,11 @@ private: WebCore::CurlProxySettings m_proxySettings; #endif @@ -17314,7 +17314,7 @@ index 17aad057a3414fb9845e992a3a720512bb8b6080..ae3e4511a99d6dcc7f3363ce37d3207e WebCore::SoupNetworkProxySettings m_networkProxySettings; #endif -@@ -448,6 +471,11 @@ private: +@@ -450,6 +473,11 @@ private: RefPtr m_cookieStore; RefPtr m_networkProcess; @@ -17907,7 +17907,7 @@ index 0000000000000000000000000000000000000000..d0f9827544994e450e24e3f7a427c35e + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm -index badbefb6ccb5634afebe8a126b9a789a5b237a7c..e631a26b81cff05799a2d4e24b254db81aae92b3 100644 +index 56b32598708dbac89156336dc12ef2d194d597c8..d6c213d4cfa3159849a09423b85ce0900d27b080 100644 --- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm +++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm @@ -441,6 +441,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect) @@ -18108,7 +18108,7 @@ index 0000000000000000000000000000000000000000..721826c8c98fc85b68a4f45deaee69c1 + +#endif diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.h b/Source/WebKit/UIProcess/mac/PageClientImplMac.h -index 89442cd9233264d09be0e380cc66013f3dd920af..9eec3ca27917d728dbb2b1afb3cf97f075d2f12e 100644 +index dd7b497aa64bf7a23eef18486ebcb443a35871e4..5062b795b591e75df484c6c6c5df90432dffed2d 100644 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.h +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.h @@ -53,6 +53,8 @@ class PageClientImpl final : public PageClientImplCocoa @@ -18142,7 +18142,7 @@ index 89442cd9233264d09be0e380cc66013f3dd920af..9eec3ca27917d728dbb2b1afb3cf97f0 void navigationGestureWillEnd(bool willNavigate, WebBackForwardListItem&) override; void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem&) override; diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm -index c4c054fd5db3f7ac878f98d31ed992f458a01283..415577d3700f614bbfec5680e221cb1c75452399 100644 +index c2de8d6ea7c0bcafa0914c1f52ae4d645df869dc..c019122519adf07c4d9dbb87551325aa9b6b661d 100644 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm @@ -81,6 +81,7 @@ @@ -18216,7 +18216,7 @@ index c4c054fd5db3f7ac878f98d31ed992f458a01283..415577d3700f614bbfec5680e221cb1c m_impl->doneWithKeyEvent(event.nativeEvent(), eventWasHandled); } -@@ -494,6 +514,8 @@ void PageClientImpl::computeCanRevealImage(const URL& imageURL, ShareableBitmap& +@@ -494,6 +514,8 @@ void PageClientImpl::computeHasVisualSearchResults(const URL& imageURL, Shareabl RefPtr PageClientImpl::createPopupMenuProxy(WebPageProxy& page) { @@ -18275,7 +18275,7 @@ index 56061afc3d03eb1d3ed99a39dacd6ccad36109be..7a148e64432926fce48e13fad5e84766 void getContextMenuItem(const WebContextMenuItemData&, CompletionHandler&&); void getContextMenuFromItems(const Vector&, CompletionHandler&&); diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm -index 323bd3597f4946eb71e0462d19722eae5bab0767..91d25338865c54e30a41e23577094799aee6f337 100644 +index f8090ad16dd3d696d0daf3baa41604c868d08684..696c745c42f445482d71e315dd1f159d3db71de7 100644 --- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm +++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm @@ -361,6 +361,12 @@ void WebContextMenuProxyMac::getShareMenuItem(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -20173,7 +20173,7 @@ index f5cd7ee0933c4da618fa580578ed20779afa6887..90139c38cb1e640d65e09dcfc7723ac2 void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1596,6 +1605,7 @@ private: +@@ -1598,6 +1607,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -20181,7 +20181,7 @@ index f5cd7ee0933c4da618fa580578ed20779afa6887..90139c38cb1e640d65e09dcfc7723ac2 #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1718,9 +1728,7 @@ private: +@@ -1720,9 +1730,7 @@ private: void countStringMatches(const String&, OptionSet, uint32_t maxMatchCount); void replaceMatches(const Vector& matchIndices, const String& replacementText, bool selectionOnly, CompletionHandler&&); @@ -20191,7 +20191,7 @@ index f5cd7ee0933c4da618fa580578ed20779afa6887..90139c38cb1e640d65e09dcfc7723ac2 void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2244,6 +2252,7 @@ private: +@@ -2248,6 +2256,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -20200,7 +20200,7 @@ index f5cd7ee0933c4da618fa580578ed20779afa6887..90139c38cb1e640d65e09dcfc7723ac2 bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 83fe55b0c404a09eb6f477838f86f18056ceb8eb..d4bcf211cb501dc6842638ec1bf39df9958a5f3c 100644 +index 5618a343de4a5746b59cbb0f1714af8c752fc34a..ce8bec4b8d1548044df81b4bf9b86424047dfc2a 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in @@ -133,6 +133,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType @@ -20252,7 +20252,7 @@ index 83fe55b0c404a09eb6f477838f86f18056ceb8eb..d4bcf211cb501dc6842638ec1bf39df9 RequestDragStart(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) RequestAdditionalItemsForDragSession(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -index a2b78fbf5ba733f4bdec7ff838bf9ce12fa37cd8..57d62390cb9f270bf0c558a6c662fb08ffe5282a 100644 +index 2ab1084c5cdc4b3fa8e4eb725541b6860502484e..68c300f49fce77b0273a45a0bfc4acbc3b9d6cbd 100644 --- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm +++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm @@ -830,21 +830,37 @@ String WebPage::platformUserAgent(const URL&) const @@ -20380,7 +20380,7 @@ index 8987c3964a9308f2454759de7f8972215a3ae416..bcac0afeb94ed8123d1f9fb0b932c849 SetProcessDPIAware(); return true; diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -index 3889d26709c67da40427525accff4722c20b3746..540db60a88d9199466a334be679ebfdc5815e79b 100644 +index e3c71afc331fae75c1cbae370a944e31b68b8d02..a4ed6d666b5c68ebeeacab52c0bff80f7526b6d5 100644 --- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm @@ -4237,7 +4237,7 @@ static BOOL currentScrollIsBlit(NSView *clipView) @@ -20446,12 +20446,12 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 9e3aa5fb15ba025fcee7d1de37d2798dbbd8d641..698807c5d4ff54d5e031d092b1ea30e95daf19e7 100644 +index ff62987d6ed6e113d600d272b38909287b3aced0..5bd739b752e4b2f5ae4772ff9e70f9a32ee39628 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -5,6 +5,8 @@ WEBKIT_OPTION_BEGIN() - SET_PROJECT_VERSION(2 33 1) + SET_PROJECT_VERSION(2 33 2) +set(ENABLE_WEBKIT_LEGACY OFF) + @@ -20510,7 +20510,7 @@ index 9e3aa5fb15ba025fcee7d1de37d2798dbbd8d641..698807c5d4ff54d5e031d092b1ea30e9 # Finalize the value for all options. Do not attempt to use an option before diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake -index 0f6d48ab443d9c27bdd4c2b199f1f97fb081690b..cdfb28302a9d717000402abb3ca40c5e6b2e0c0b 100644 +index 8156841e97f680838fa1ae8f0bcf1799bf612e56..71dcf356359969e7ec900dde68f79e115df1035f 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -3,6 +3,7 @@ include(VersioningUtils) @@ -20549,7 +20549,7 @@ index 0f6d48ab443d9c27bdd4c2b199f1f97fb081690b..cdfb28302a9d717000402abb3ca40c5e WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON) diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake -index d81a80673e023ca0eb725d260695c7a3f6217e39..0d2c0443df5e0a013901e68bcd7475dc2be24e17 100644 +index 1ecfd21e44703b2d61aff5494414d33878f0cfcd..02791cd57e26c6e07dc759a77e22ea77767f6bc6 100644 --- a/Source/cmake/OptionsWin.cmake +++ b/Source/cmake/OptionsWin.cmake @@ -7,8 +7,9 @@ add_definitions(-D_WINDOWS -DWINVER=0x601 -D_WIN32_WINNT=0x601) @@ -20656,10 +20656,10 @@ index ab75a69f64aadee2b22e0d8d114932db55aaa000..e82450546a7dba66155b26c3d841d0a7 } diff --git a/Tools/MiniBrowser/gtk/BrowserWindow.c b/Tools/MiniBrowser/gtk/BrowserWindow.c -index d1eb89ad99fe7a96f3c21bd75641c80210e7e5d5..f04149ba5f52f671b30ffbf0283f391aa1fc778f 100644 +index 063e94568490cc72193222987b805e7dfff94fea..e08bed7942be0352317ffe6bf92b710aba9d050b 100644 --- a/Tools/MiniBrowser/gtk/BrowserWindow.c +++ b/Tools/MiniBrowser/gtk/BrowserWindow.c -@@ -1355,6 +1355,12 @@ static gboolean browserWindowDeleteEvent(GtkWidget *widget, GdkEventAny* event) +@@ -1373,6 +1373,12 @@ static gboolean browserWindowDeleteEvent(GtkWidget *widget, GdkEventAny* event) } #endif @@ -20672,7 +20672,7 @@ index d1eb89ad99fe7a96f3c21bd75641c80210e7e5d5..f04149ba5f52f671b30ffbf0283f391a static void browser_window_class_init(BrowserWindowClass *klass) { GObjectClass *gobjectClass = G_OBJECT_CLASS(klass); -@@ -1368,6 +1374,14 @@ static void browser_window_class_init(BrowserWindowClass *klass) +@@ -1386,6 +1392,14 @@ static void browser_window_class_init(BrowserWindowClass *klass) GtkWidgetClass *widgetClass = GTK_WIDGET_CLASS(klass); widgetClass->delete_event = browserWindowDeleteEvent; #endif