diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index b712826218..6db69eea01 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1551 -Changed: dpino@igalia.com Wed Sep 29 03:45:05 UTC 2021 +1552 +Changed: dpino@igalia.com Mon Oct 4 18:29:29 HKT 2021 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 5d1b182e88..c7352f4c0c 100644 --- a/browser_patches/webkit/UPSTREAM_CONFIG.sh +++ b/browser_patches/webkit/UPSTREAM_CONFIG.sh @@ -1,3 +1,3 @@ REMOTE_URL="https://github.com/WebKit/WebKit.git" BASE_BRANCH="main" -BASE_REVISION="6bfc8637e750c252fdfb9388954e34b18e7b9803" +BASE_REVISION="5f99dfc43d30d3af1cabbf24d111acbff994808b" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index b931532da1..fddb65c70d 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 2fd20d7def92b64d194a754aed1f1acbb8be9a8c..60638e0b8ef2c744cd2144502ce4fb3992695cd3 100644 +index 8802dc2c7f78651f916e5af40490044991019c70..6da7fbc9108f75bae7147691eb33b3c8f60e8f04 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1323,22 +1323,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1326,22 +1326,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json @@ -1900,7 +1900,7 @@ index fabd776e617d07a6c30b9f2df30f884491259359..d9c39df7db565545108c765407ce1cda - WEBKIT_DECLARE_DIST_TARGETS(WPE wpewebkit ${TOOLS_DIR}/wpe/manifest.txt.in) -endif () diff --git a/Source/ThirdParty/libwebrtc/CMakeLists.txt b/Source/ThirdParty/libwebrtc/CMakeLists.txt -index 4345be38811965680c7c8e80d64234e130b16548..d8ea7866e3df2d8dcc6adc7a0dd021c4b96d4249 100644 +index 8d8dbaa43a9cc67635b6128a43e47c74ff73b490..6133f66447a717b6c6e2de9606143d2320576dc2 100644 --- a/Source/ThirdParty/libwebrtc/CMakeLists.txt +++ b/Source/ThirdParty/libwebrtc/CMakeLists.txt @@ -292,6 +292,11 @@ set(webrtc_SOURCES @@ -1915,7 +1915,7 @@ index 4345be38811965680c7c8e80d64234e130b16548..d8ea7866e3df2d8dcc6adc7a0dd021c4 Source/third_party/libyuv/source/compare_common.cc Source/third_party/libyuv/source/compare_gcc.cc Source/third_party/libyuv/source/convert.cc -@@ -1732,6 +1737,10 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE +@@ -1744,6 +1749,10 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE Source/third_party/libsrtp/config Source/third_party/libsrtp/crypto/include Source/third_party/libsrtp/include @@ -1927,13 +1927,13 @@ index 4345be38811965680c7c8e80d64234e130b16548..d8ea7866e3df2d8dcc6adc7a0dd021c4 Source/third_party/opus/src/celt Source/third_party/opus/src/include diff --git a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp -index 7327457360d7393e60c6886e5786542208594c63..a26f4944ed40d7abe7315a4b4f3dad0842e38a43 100644 +index aa40af8d25ed5a3c64450866ddeb2f054d47cf6a..a4cedfcb05c1bf305a596ee34348b231b82bbc10 100644 --- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp +++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp -@@ -327,3 +327,23 @@ __ZNK3rtc9IPAddress5IsNilEv - __ZN3rtc12SSLCertChainD1Ev +@@ -328,3 +328,23 @@ __ZN3rtc12SSLCertChainD1Ev __ZN6webrtc24SctpTransportInformationD1Ev __ZNK3rtc9IPAddressneERKS0_ + __ZN6webrtc13CryptoOptionsC1Ev +__ZN8mkvmuxer11SegmentInfo15set_writing_appEPKc +__ZN8mkvmuxer11SegmentInfo4InitEv +__ZN8mkvmuxer7Segment10OutputCuesEb @@ -2081,9 +2081,18 @@ index 2ceac4200afdd11986a88499252288dc5ad63003..b30792cda8ae3d4c5fecf5d0c544b92b type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index d773ebc5a19d8a64d1f2eec957f3a464c63b58e4..e707a89df82d7b36902dc0a6f8c9f0aab6b04d51 100644 +index f0bcb2fd4733a6c42cd424e35736e0a702dfd8d0..b5d19df6c20f30a2a85d9eb90dcafcd66fdfec97 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +@@ -365,7 +365,7 @@ CrossOriginOpenerPolicyEnabled: + WebKitLegacy: + default: false + WebKit: +- default: true ++ default: false + WebCore: + default: false + @@ -742,9 +742,9 @@ MaskWebGLStringsEnabled: WebKitLegacy: default: true @@ -2262,10 +2271,10 @@ index 8738d25d1bcc709589b26b2f928f4f8cee60c6f9..414d6a6fc88ebc54f738b0a650ed521e #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index 68ca2ca711427f0db0858de6f798056efa74127d..5b22bad41214f783e951582f790334cd378c53e6 100644 +index 87b2b1ccecb95e6ea2267cb35bf6a12e2e6a759a..eb6657708263a697fd52f0c859d3469d81d62330 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h -@@ -208,7 +208,7 @@ +@@ -216,7 +216,7 @@ #define ENABLE_DATA_DETECTION 1 #endif @@ -2287,7 +2296,7 @@ index 4a12b5a4393fe2bbe39673e3fa547c9d6976abd7..678b777736019debbd25fcd72fd34f3d if (Systemd_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 18e4d511061080e2ffa721589a9bfb9b915d1caa..6ba7bfd782cf63750f7ba9c6bc9e1bf58b07b955 100644 +index 197f1ba75f4e0c2c9fd640589e559c3c225e34cd..c8411c9f4cf04f634ffeae9d0354baff4f4b25fe 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -391,7 +391,7 @@ @@ -2312,10 +2321,10 @@ index 643ef0fcdf4f3ce4a1f27bc0cc6e179b7143bbd4..f6ee05b80ebc200d0db74fc7e975d96c if (Systemd_FOUND) diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index d20243ef8577be3855285157d9a6f754e9757f15..95c91cccf7b5c3cd1a5eb6fac8efb46ba1afb8f8 100644 +index a35229361a0da54b3e12b72b459fc6230c7a6c95..f04a3316bb3328d76be984f5decc039b84631616 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make -@@ -765,6 +765,10 @@ JS_BINDING_IDLS := \ +@@ -766,6 +766,10 @@ JS_BINDING_IDLS := \ $(WebCore)/dom/Slotable.idl \ $(WebCore)/dom/StaticRange.idl \ $(WebCore)/dom/StringCallback.idl \ @@ -2326,7 +2335,7 @@ index d20243ef8577be3855285157d9a6f754e9757f15..95c91cccf7b5c3cd1a5eb6fac8efb46b $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1302,9 +1306,6 @@ JS_BINDING_IDLS := \ +@@ -1303,9 +1307,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -2434,10 +2443,10 @@ index 9f4daefcd385d534149f0a5a6ce0e8016e25638f..37f64495ec9b316bbf0a5e3212917d43 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index ca3fa6413d2b1c93f08acf0b1387b8ee3e8b8884..38782cb8de962bff675325e6d3f90d262c70f0c4 100644 +index 3a1b902851d2c14adb93e8f6ce4778650ffd8fe6..2c114489d5806aad1d604eb7205969c124e9f427 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt -@@ -599,3 +599,9 @@ platform/graphics/angle/ExtensionsGLANGLE.cpp @no-unify +@@ -600,3 +600,9 @@ platform/graphics/angle/ExtensionsGLANGLE.cpp @no-unify platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify platform/graphics/angle/GraphicsContextGLANGLEEGLUtilities.cpp @no-unify platform/graphics/angle/TemporaryANGLESetting.cpp @no-unify @@ -2448,10 +2457,10 @@ index ca3fa6413d2b1c93f08acf0b1387b8ee3e8b8884..38782cb8de962bff675325e6d3f90d26 +JSTouchList.cpp +// Playwright end diff --git a/Source/WebCore/SourcesGTK.txt b/Source/WebCore/SourcesGTK.txt -index 8973012330948d6ee0835fe4f862927d26430429..c5236b250475f33a21106cf80c5f22ee975043cb 100644 +index b01c0018af05cd7faa0b1df5bb23b01daf947269..de2f1ee4b6a0d3d01d82688b0a7fd9d029e10923 100644 --- a/Source/WebCore/SourcesGTK.txt +++ b/Source/WebCore/SourcesGTK.txt -@@ -91,7 +91,7 @@ platform/graphics/egl/GLContextEGLLibWPE.cpp @no-unify +@@ -93,7 +93,7 @@ platform/graphics/egl/GLContextEGLLibWPE.cpp @no-unify platform/graphics/egl/GLContextEGLWayland.cpp @no-unify platform/graphics/egl/GLContextEGLX11.cpp @no-unify @@ -2499,10 +2508,10 @@ index 9f85e4986c53a1cc8d63b3394d3f7295832af387..1228fda7c688c5b24cecaf07e21437d3 __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 7a81e09dbf9004cf2f2dbeb5eef7888d340e00a7..d41bb333e57c415d7e804cf4fd0a78590132edee 100644 +index 486dd464fad93ada3d236746d77d5d0f33dea333..d8eb48dd247e7b6ae29c3c1fa1e4466bff886a7f 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5385,6 +5385,14 @@ +@@ -5369,6 +5369,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, ); }; }; @@ -2517,7 +2526,7 @@ index 7a81e09dbf9004cf2f2dbeb5eef7888d340e00a7..d41bb333e57c415d7e804cf4fd0a7859 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, ); }; }; -@@ -16708,6 +16716,14 @@ +@@ -16727,6 +16735,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 = ""; }; @@ -2532,7 +2541,7 @@ index 7a81e09dbf9004cf2f2dbeb5eef7888d340e00a7..d41bb333e57c415d7e804cf4fd0a7859 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 = ""; }; -@@ -22310,7 +22326,12 @@ +@@ -22328,7 +22344,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2545,7 +2554,7 @@ index 7a81e09dbf9004cf2f2dbeb5eef7888d340e00a7..d41bb333e57c415d7e804cf4fd0a7859 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -28100,6 +28121,8 @@ +@@ -28144,6 +28165,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2554,7 +2563,7 @@ index 7a81e09dbf9004cf2f2dbeb5eef7888d340e00a7..d41bb333e57c415d7e804cf4fd0a7859 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -30307,6 +30330,7 @@ +@@ -30361,6 +30384,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2562,7 +2571,7 @@ index 7a81e09dbf9004cf2f2dbeb5eef7888d340e00a7..d41bb333e57c415d7e804cf4fd0a7859 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -31318,6 +31342,7 @@ +@@ -31372,6 +31396,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2570,7 +2579,7 @@ index 7a81e09dbf9004cf2f2dbeb5eef7888d340e00a7..d41bb333e57c415d7e804cf4fd0a7859 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -33391,6 +33416,7 @@ +@@ -33452,6 +33477,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2578,7 +2587,7 @@ index 7a81e09dbf9004cf2f2dbeb5eef7888d340e00a7..d41bb333e57c415d7e804cf4fd0a7859 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -35490,9 +35516,11 @@ +@@ -35552,9 +35578,11 @@ B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */, @@ -2590,7 +2599,7 @@ index 7a81e09dbf9004cf2f2dbeb5eef7888d340e00a7..d41bb333e57c415d7e804cf4fd0a7859 B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -36444,6 +36472,7 @@ +@@ -36500,6 +36528,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2598,7 +2607,7 @@ index 7a81e09dbf9004cf2f2dbeb5eef7888d340e00a7..d41bb333e57c415d7e804cf4fd0a7859 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -36527,6 +36556,7 @@ +@@ -36570,6 +36599,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2606,7 +2615,7 @@ index 7a81e09dbf9004cf2f2dbeb5eef7888d340e00a7..d41bb333e57c415d7e804cf4fd0a7859 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -36575,6 +36605,7 @@ +@@ -36618,6 +36648,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2614,7 +2623,7 @@ index 7a81e09dbf9004cf2f2dbeb5eef7888d340e00a7..d41bb333e57c415d7e804cf4fd0a7859 DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -37107,6 +37138,7 @@ +@@ -37150,6 +37181,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2623,7 +2632,7 @@ index 7a81e09dbf9004cf2f2dbeb5eef7888d340e00a7..d41bb333e57c415d7e804cf4fd0a7859 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 2e163d33462224857fad29fa0c671996a31419e2..f85304d7d68b555e9e15497d26bae90217ebb757 100644 +index 0f016c45326508df9ce44489c51563a5eb33dece..2fbee465287920fcc04111618b3506b56b7b73d0 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -59,6 +59,7 @@ @@ -2634,7 +2643,7 @@ index 2e163d33462224857fad29fa0c671996a31419e2..f85304d7d68b555e9e15497d26bae902 #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3276,10 +3277,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -3297,10 +3298,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (useParentData ? m_isIgnoredFromParentData.isPresentationalChildOfAriaRole : isPresentationalChildOfAriaRole()) return AccessibilityObjectInclusion::IgnoreObject; @@ -3559,7 +3568,7 @@ index f76114ce98f42a7ff906a48d0420b96305d36914..e3be41d7e9e5d2ae5872424df2ed6cbf + } diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp -index dadfa3012201c0eb036a142bafa9eb528efb1c56..a6502edece9b79b070d8d611ed9572187d97c463 100644 +index 9e8df2ecb01048361b244f850f9bcec99a519e19..ddb1a86815b9089ad88bc5d16cea6f1a09052940 100644 --- a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp @@ -62,12 +62,16 @@ @@ -5766,10 +5775,10 @@ index 16edb3bc689b8e2dde17597b642b706c1343e1f5..f363b2ca2410f22cff8d6ad908a88527 private: diff --git a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp -index 10c5e1501c202d9dba64f2af20daf42390fcd27a..e7fc5bfdc8e269c7547290936649570f50b47664 100644 +index 39687ec4ab3baf905bfac669502cf486bb166972..e1aa931580c46f8ede8de5fb036449cdb594c602 100644 --- a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp +++ b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp -@@ -258,7 +258,7 @@ void LineLayout::updateFormattingRootGeometryAndInvalidate() +@@ -268,7 +268,7 @@ void LineLayout::updateFormattingRootGeometryAndInvalidate() auto updateGeometry = [&](auto& root) { root.setContentBoxWidth(flow.contentLogicalWidth()); @@ -5801,10 +5810,10 @@ 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 f09e0edabee0ce0ad83d1227cde45761d5dbfca4..b5dc27544621223ff04691a99060ac1659f7ccac 100644 +index b69d9c1f6a3007eedef3004e06cd7b2fd6c9d35a..1febde358d5f88e14d5e8e2eb57bb6c86b9de202 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp -@@ -1584,8 +1584,6 @@ void DocumentLoader::detachFromFrame() +@@ -1467,8 +1467,6 @@ void DocumentLoader::detachFromFrame() if (!m_frame) return; @@ -5814,7 +5823,7 @@ index f09e0edabee0ce0ad83d1227cde45761d5dbfca4..b5dc27544621223ff04691a99060ac16 } diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h -index 8ee14a24d57b34cc7cbea4cdc773102726d2e5d6..80084e2a3551584a101d74869b4eb21d66ebf055 100644 +index 9fc4137a6900e24a1a82cec7cc75793d347e9812..341dec55a51249a34952887f8a4685f5a999b1d7 100644 --- a/Source/WebCore/loader/DocumentLoader.h +++ b/Source/WebCore/loader/DocumentLoader.h @@ -168,9 +168,13 @@ public: @@ -5832,7 +5841,7 @@ index 8ee14a24d57b34cc7cbea4cdc773102726d2e5d6..80084e2a3551584a101d74869b4eb21d DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index 37e511379245f9f58d41809483146715b4f60bd8..6c0d11ed2a205cf236d2c13f3cc2cae0f57c3fb5 100644 +index 4b9515f370fb22c259e29767d968c49236e97423..a43336929d2ff4b4281d746372c0254ed92404d0 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp @@ -1168,6 +1168,7 @@ void FrameLoader::loadInSameDocument(const URL& url, SerializedScriptValue* stat @@ -6013,10 +6022,10 @@ index 4cfcb1681f17309ac4a7fc0b219acef95957b79d..93bb87fb16d3c9e43fc84fa47e8a8aba #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 0b8e835bec88a7c88bbdf74d18745b79a19eba92..8f8f6bf077d67732274564e51f8de6a373a3bfbc 100644 +index 0365a758efaa136336a5d8c35dffa679526f8663..ff5e29ce08390ec557df02bec5e382b779ec56e9 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp -@@ -133,6 +133,7 @@ +@@ -134,6 +134,7 @@ #if ENABLE(TOUCH_EVENTS) && !ENABLE(IOS_TOUCH_EVENTS) #include "PlatformTouchEvent.h" @@ -6024,7 +6033,7 @@ index 0b8e835bec88a7c88bbdf74d18745b79a19eba92..8f8f6bf077d67732274564e51f8de6a3 #endif #if ENABLE(MAC_GESTURE_EVENTS) -@@ -792,9 +793,7 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve +@@ -793,9 +794,7 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve m_mousePressNode = event.targetNode(); m_frame.document()->setFocusNavigationStartingNode(event.targetNode()); @@ -6034,7 +6043,7 @@ index 0b8e835bec88a7c88bbdf74d18745b79a19eba92..8f8f6bf077d67732274564e51f8de6a3 m_mousePressed = true; m_selectionInitiationState = HaveNotStartedSelection; -@@ -834,8 +833,6 @@ VisiblePosition EventHandler::selectionExtentRespectingEditingBoundary(const Vis +@@ -835,8 +834,6 @@ VisiblePosition EventHandler::selectionExtentRespectingEditingBoundary(const Vis return adjustedTarget->renderer()->positionForPoint(LayoutPoint(selectionEndPoint), nullptr); } @@ -6043,7 +6052,7 @@ index 0b8e835bec88a7c88bbdf74d18745b79a19eba92..8f8f6bf077d67732274564e51f8de6a3 #if !PLATFORM(IOS_FAMILY) bool EventHandler::supportsSelectionUpdatesOnMouseDrag() const -@@ -857,8 +854,10 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -858,8 +855,10 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e Ref protectedFrame(m_frame); @@ -6054,7 +6063,7 @@ index 0b8e835bec88a7c88bbdf74d18745b79a19eba92..8f8f6bf077d67732274564e51f8de6a3 RefPtr targetNode = event.targetNode(); if (event.event().button() != LeftButton || !targetNode) -@@ -879,7 +878,9 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -880,7 +879,9 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e ASSERT(mouseDownMayStartSelect() || m_mouseDownMayStartAutoscroll); #endif @@ -6064,7 +6073,7 @@ index 0b8e835bec88a7c88bbdf74d18745b79a19eba92..8f8f6bf077d67732274564e51f8de6a3 if (m_mouseDownMayStartAutoscroll && !panScrollInProgress()) { m_autoscrollController->startAutoscrollForSelection(renderer); -@@ -896,6 +897,8 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -897,6 +898,8 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e return true; } @@ -6073,7 +6082,7 @@ index 0b8e835bec88a7c88bbdf74d18745b79a19eba92..8f8f6bf077d67732274564e51f8de6a3 bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const { // This is a pre-flight check of whether the event might lead to a drag being started. Be careful -@@ -927,6 +930,8 @@ bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const +@@ -928,6 +931,8 @@ bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const return targetElement && page->dragController().draggableElement(&m_frame, targetElement.get(), result.roundedPointInInnerNodeFrame(), state); } @@ -6082,7 +6091,7 @@ index 0b8e835bec88a7c88bbdf74d18745b79a19eba92..8f8f6bf077d67732274564e51f8de6a3 void EventHandler::updateSelectionForMouseDrag() { if (!supportsSelectionUpdatesOnMouseDrag()) -@@ -1021,7 +1026,6 @@ void EventHandler::updateSelectionForMouseDrag(const HitTestResult& hitTestResul +@@ -1022,7 +1027,6 @@ void EventHandler::updateSelectionForMouseDrag(const HitTestResult& hitTestResul if (oldSelection != newSelection && HTMLElement::isImageOverlayText(newSelection.start().containerNode()) && HTMLElement::isImageOverlayText(newSelection.end().containerNode())) invalidateClick(); } @@ -6090,7 +6099,7 @@ index 0b8e835bec88a7c88bbdf74d18745b79a19eba92..8f8f6bf077d67732274564e51f8de6a3 void EventHandler::lostMouseCapture() { -@@ -1069,9 +1073,7 @@ bool EventHandler::handleMouseReleaseEvent(const MouseEventWithHitTestResults& e +@@ -1070,9 +1074,7 @@ bool EventHandler::handleMouseReleaseEvent(const MouseEventWithHitTestResults& e // on the selection, the selection goes away. However, if we are // editing, place the caret. if (m_mouseDownWasSingleClickInSelection && m_selectionInitiationState != ExtendedSelection @@ -6100,7 +6109,7 @@ index 0b8e835bec88a7c88bbdf74d18745b79a19eba92..8f8f6bf077d67732274564e51f8de6a3 && m_frame.selection().isRange() && event.event().button() != RightButton) { VisibleSelection newSelection; -@@ -2038,10 +2040,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE +@@ -2039,10 +2041,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE swallowEvent = !dispatchMouseEvent(eventNames().mousemoveEvent, mouseEvent.targetNode(), 0, platformMouseEvent, FireMouseOverOut::Yes); @@ -6111,7 +6120,7 @@ index 0b8e835bec88a7c88bbdf74d18745b79a19eba92..8f8f6bf077d67732274564e51f8de6a3 return swallowEvent; } -@@ -4097,7 +4097,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr +@@ -4100,7 +4100,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr if (!m_frame.document()) return false; @@ -6127,7 +6136,7 @@ index 0b8e835bec88a7c88bbdf74d18745b79a19eba92..8f8f6bf077d67732274564e51f8de6a3 auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; if (dragState().shouldDispatchEvents) { -@@ -4505,7 +4512,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4508,7 +4515,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) allTouchReleased = false; } @@ -6137,7 +6146,7 @@ index 0b8e835bec88a7c88bbdf74d18745b79a19eba92..8f8f6bf077d67732274564e51f8de6a3 PlatformTouchPoint::State pointState = point.state(); LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); -@@ -4632,6 +4640,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4635,6 +4643,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) changedTouches[pointState].m_touches->append(WTFMove(touch)); changedTouches[pointState].m_targets.add(touchTarget); } @@ -6756,7 +6765,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 39612b81b85bbf269549cda3e0330833f0d1152d..c1fd65f9bd42e1c73b6bbf7832b94caf236fe36d 100644 +index f335c9ad4b8ed0d4755eddda32b55c04fc5e10dd..cd5494c27a2edae6bc7381c80f9ea52c453b54f3 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp @@ -462,6 +462,37 @@ void Page::setOverrideViewportArguments(const std::optional& @@ -6808,7 +6817,7 @@ index 39612b81b85bbf269549cda3e0330833f0d1152d..c1fd65f9bd42e1c73b6bbf7832b94caf resetSeenPlugins(); resetSeenMediaEngines(); -@@ -3270,6 +3297,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3267,6 +3294,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -6826,7 +6835,7 @@ index 39612b81b85bbf269549cda3e0330833f0d1152d..c1fd65f9bd42e1c73b6bbf7832b94caf { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index a301b7844cc855fe7d99f4d736fcd85f96690006..c14611328c47690c3845e0c5ce80a359066eb42f 100644 +index df59dd12e0f7a49ab75ad72836d80741e08fab45..ff8f439d89329f8e7ce55eaca238d808dd2bbc31 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h @@ -256,6 +256,9 @@ public: @@ -7028,7 +7037,7 @@ index 3bec0aef174336939838fb1069fffbcb9f3d5604..566ef3806be3c5ccf1bb951251c2a90d RefPtr SocketProvider::createWebSocketChannel(Document&, WebSocketChannelClient&) diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp -index 7abf8aca6022e547ca155a73370d43d2606858e5..1da53d6d90c879d9f5382bd5f69ec378b43291a8 100644 +index 34e747377eb31c29f596efa893d6048f3067c9ee..43c4982a6126be8d738f0e791059597e8f251a92 100644 --- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp @@ -292,6 +292,8 @@ bool ContentSecurityPolicy::protocolMatchesSelf(const URL& url) const @@ -7345,7 +7354,7 @@ index d47d193e8bee85c2d2a35e218decdd84b7212dc1..a1cd2f3b8f025436b596d1b1081357d9 #endif diff --git a/Source/WebCore/platform/ScrollableArea.h b/Source/WebCore/platform/ScrollableArea.h -index 319bba8327381457567261a64cc9d9a3dd117661..6e746fc92b5871228f825e2211d394aed3467c4f 100644 +index 2b375f5bd4427c8371e505f60748a23fbc49b6b2..431d6ad799ed61a09a6889cf90a0ee624e60f9c2 100644 --- a/Source/WebCore/platform/ScrollableArea.h +++ b/Source/WebCore/platform/ScrollableArea.h @@ -102,7 +102,7 @@ public: @@ -7553,7 +7562,7 @@ index 4db603a94f3af1b1bce94ab0f1ae36054c004fcc..c1820f48eb86348f8ca678fde636244e if (!image || !encodeImage(image, mimeType, &encodedImage)) return { }; diff --git a/Source/WebCore/platform/graphics/cg/ImageBufferUtilitiesCG.h b/Source/WebCore/platform/graphics/cg/ImageBufferUtilitiesCG.h -index eac8346d3e177f87792fb0a8fc9dd0fb3b2f6efc..2ddd1dc810033a7f60f17ba555813f1b529d71f7 100644 +index 8677d106bf2d0f53044b47fba0e6736efcd3aeb6..9b28f9d917536d2c2699f613adf296bbdd965969 100644 --- a/Source/WebCore/platform/graphics/cg/ImageBufferUtilitiesCG.h +++ b/Source/WebCore/platform/graphics/cg/ImageBufferUtilitiesCG.h @@ -36,10 +36,10 @@ class PixelBuffer; @@ -7562,13 +7571,13 @@ index eac8346d3e177f87792fb0a8fc9dd0fb3b2f6efc..2ddd1dc810033a7f60f17ba555813f1b -CFStringRef jpegUTI(); +WEBCORE_EXPORT CFStringRef jpegUTI(); - RetainPtr utiFromImageBufferMIMEType(const String&); + WEBCORE_EXPORT RetainPtr utiFromImageBufferMIMEType(const String&); -Vector data(CGImageRef, CFStringRef destinationUTI, std::optional quality); +WEBCORE_EXPORT Vector data(CGImageRef, CFStringRef destinationUTI, std::optional quality); Vector data(const PixelBuffer&, const String& mimeType, std::optional quality); - String dataURL(CGImageRef, CFStringRef destinationUTI, const String& mimeType, std::optional quality); + WEBCORE_EXPORT String dataURL(CGImageRef, CFStringRef destinationUTI, const String& mimeType, std::optional quality); diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp index 2e46b61536c835dfcacf9f79e10e6d59ae7a3836..fa0c72d80d83c58a8407e78988de010fe97d7c38 100644 --- a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp @@ -9109,10 +9118,10 @@ index 0000000000000000000000000000000000000000..cf2b51f6f02837a1106f4d999f2f130e + +} // namespace WebCore diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp -index 10a2bd15de36d49565e1d0370e8b027f50684903..391826daa7b5dcad967caead2bcdb3361e86fc32 100644 +index 3d5745517b456afd5722cffdd554e6ab05dbb76c..707cde070b64ff85d1384717b19d84d2556bc583 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp -@@ -2575,7 +2575,7 @@ LayoutRect RenderLayer::getRectToExpose(const LayoutRect& visibleRect, const Lay +@@ -2590,7 +2590,7 @@ LayoutRect RenderLayer::getRectToExpose(const LayoutRect& visibleRect, const Lay ScrollAlignment::Behavior scrollX; LayoutRect exposeRectX(exposeRect.x(), visibleRect.y(), exposeRect.width(), visibleRect.height()); LayoutUnit intersectWidth = intersection(visibleRect, exposeRectX).width(); @@ -9200,7 +9209,7 @@ index aaa8731f9ecaa6a81f521dc0e7f84923faa81f06..9f0502c4058ce24e86b2c9e25775e78f void NetworkConnectionToWebProcess::removeStorageAccessForFrame(FrameIdentifier frameID, PageIdentifier pageID) { diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -index d161cf96c4c5d9ad13094962e1991a5f4efd80b4..2444744e6c1b743a024b80496d180d0b17b31f44 100644 +index cae54a6e3bba00a613e5d8d338789caa32034eb7..0e70824198f408f85de33b5c137248dab5d9aed6 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h @@ -288,6 +288,8 @@ private: @@ -9226,7 +9235,7 @@ index 7682ba9bb29ff6f08ebebb943fc894546734c2e7..bdf77c32dfb8eeceb9ac355256b894d2 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 7cd6890cfc55129c8dda5648311f38c78adf48a0..664a1c3dd2fa0d346e4e1a6998cc2d3ec0c011cd 100644 +index 3b68c7379419711b9c08321e90c339fbdd9e0aff..0b3a13007c9294a08211f54ec440e8346b998cad 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -26,7 +26,6 @@ @@ -9237,7 +9246,7 @@ index 7cd6890cfc55129c8dda5648311f38c78adf48a0..664a1c3dd2fa0d346e4e1a6998cc2d3e #include "ArgumentCoders.h" #include "Attachment.h" #include "AuthenticationManager.h" -@@ -578,6 +577,59 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) +@@ -580,6 +579,59 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) removeStorageManagerForSession(sessionID); } @@ -9298,7 +9307,7 @@ index 7cd6890cfc55129c8dda5648311f38c78adf48a0..664a1c3dd2fa0d346e4e1a6998cc2d3e void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index e7585b86e60a7a045d8548511865a9923fba2d23..16d1fefed3e18485681a31c4810947bec2e5f398 100644 +index 7ee791ad98ecf47bc983dc6b743d3fcd57ffa6cf..2abe091024d94a253a367c7e870936430ea78bd3 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h @@ -35,6 +35,7 @@ @@ -9333,7 +9342,7 @@ index e7585b86e60a7a045d8548511865a9923fba2d23..16d1fefed3e18485681a31c4810947be 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 9aa9eaa9f131b01f669b5388500226e4352a1d0a..46a061225808caf14d86a85d2ec9a073bdf62d1b 100644 +index 82cdc3f5aa71a20a9cd170e7ee63a280f0573e9c..27fe32ada4b96da9eb3a424f10c49fd406e1b3e2 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in @@ -77,6 +77,14 @@ messages -> NetworkProcess LegacyReceiver { @@ -9352,10 +9361,10 @@ index 9aa9eaa9f131b01f669b5388500226e4352a1d0a..46a061225808caf14d86a85d2ec9a073 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 97f7d07f586b2b97cd65497826a77e3a033c9b86..78638ee8e618340273035e141c2fdf95f577e89c 100644 +index a4f75f24a68d4994bcd0b85f4f0f2d87da8e5cb2..fc67218f9f2c1aba85c5d8a49f1c181e05c13597 100644 --- a/Source/WebKit/NetworkProcess/NetworkSession.h +++ b/Source/WebKit/NetworkProcess/NetworkSession.h -@@ -165,6 +165,9 @@ public: +@@ -168,6 +168,9 @@ public: bool isStaleWhileRevalidateEnabled() const { return m_isStaleWhileRevalidateEnabled; } @@ -9365,7 +9374,7 @@ index 97f7d07f586b2b97cd65497826a77e3a033c9b86..78638ee8e618340273035e141c2fdf95 #if ENABLE(SERVICE_WORKER) void addSoftUpdateLoader(std::unique_ptr&& loader) { m_softUpdateLoaders.add(WTFMove(loader)); } void removeSoftUpdateLoader(ServiceWorkerSoftUpdateLoader* loader) { m_softUpdateLoaders.remove(loader); } -@@ -212,6 +215,7 @@ protected: +@@ -215,6 +218,7 @@ protected: #endif bool m_isStaleWhileRevalidateEnabled { false }; UniqueRef m_privateClickMeasurement; @@ -9665,10 +9674,10 @@ index 5c1251af416c36a21a71bc84f18d04c951a6799f..116e28a69e306dc26e0480f4471d15ea + } diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 00d911afa63f58a2d969b4c4530d1cec9e5cd046..33bda4410cb2f016e186102151e9d81eef34942b 100644 +index 040d8ccf41b57b602d0ff9906772ccc0a41659cb..c616220427b3ec6f087eef38a33d354b5c02a2b1 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -@@ -724,7 +724,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se +@@ -722,7 +722,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se NegotiatedLegacyTLS negotiatedLegacyTLS = NegotiatedLegacyTLS::No; if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { @@ -9677,7 +9686,7 @@ index 00d911afa63f58a2d969b4c4530d1cec9e5cd046..33bda4410cb2f016e186102151e9d81e return completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]); #if HAVE(TLS_PROTOCOL_VERSION_T) -@@ -989,6 +989,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END +@@ -987,6 +987,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData(taskMetrics, networkDataTask->networkLoadMetrics())); @@ -10239,7 +10248,7 @@ index 001558dd58f4d85f360d5711caa03db33889011e..1e0898f985f1d13036d31e3e284258a3 NSEvent* nativeEvent() const { return m_nativeEvent.get(); } #elif PLATFORM(GTK) diff --git a/Source/WebKit/Shared/NativeWebWheelEvent.h b/Source/WebKit/Shared/NativeWebWheelEvent.h -index f48dc00755b6847f2c13e5f7dac652c2a91f66ea..eb9c890c52f47913a8dc7950d6d3fa1e037e5aca 100644 +index f2f3979fcac9dfd97d0e0ead600fe35eb8defd40..ac91412e1a96bdf521b1890a66e465dc54293d31 100644 --- a/Source/WebKit/Shared/NativeWebWheelEvent.h +++ b/Source/WebKit/Shared/NativeWebWheelEvent.h @@ -67,7 +67,8 @@ public: @@ -10823,10 +10832,10 @@ index 85d6f74114f4e7f82d9502d1b99d69098d6a49b6..6896c9756edb233dda46c7031e1af699 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index 93dba6cd960b0891b2bdf49fe5fe0057584ba462..f55f84b46673af314a43c4b9d828da46763a0f79 100644 +index c4a84e1fb6f466b8fbd54e6ca46c472422b3b0c8..93aa2bcd610d6583551bba17027d17e02e04b6eb 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -307,11 +307,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -310,11 +310,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -10841,7 +10850,7 @@ index 93dba6cd960b0891b2bdf49fe5fe0057584ba462..f55f84b46673af314a43c4b9d828da46 UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -320,6 +323,7 @@ UIProcess/PageLoadState.cpp +@@ -323,6 +326,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -10849,7 +10858,7 @@ index 93dba6cd960b0891b2bdf49fe5fe0057584ba462..f55f84b46673af314a43c4b9d828da46 UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -360,6 +364,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -363,6 +367,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -10858,7 +10867,7 @@ index 93dba6cd960b0891b2bdf49fe5fe0057584ba462..f55f84b46673af314a43c4b9d828da46 UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPreferences.cpp -@@ -481,7 +487,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -484,7 +490,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -10871,7 +10880,7 @@ index 93dba6cd960b0891b2bdf49fe5fe0057584ba462..f55f84b46673af314a43c4b9d828da46 UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 11e729684e4a2adf0b5cb893ad6791d900582605..e724f7e6e1a5905425113eb0f97f580bf11ee9c5 100644 +index 5e6b52c121146c6d53ace665d65c256fde5e9593..666f1fae9471e16e073d4ee244843a33065e22f4 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt @@ -274,6 +274,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm @@ -10882,7 +10891,7 @@ index 11e729684e4a2adf0b5cb893ad6791d900582605..e724f7e6e1a5905425113eb0f97f580b UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -446,6 +447,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -447,6 +448,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -11088,7 +11097,7 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0 } #endif diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp -index 349f900e0c7432a21ac06bc4d2eb3899b5cbe46f..ff1d615457d9efe03f584b9e4c34f0de2a720500 100644 +index ab2291e341b5308b8e55e45dad9afb9e44c96648..27b1ba57c003b6d6102bf30a37017043923a1451 100644 --- a/Source/WebKit/UIProcess/API/C/WKPage.cpp +++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp @@ -1778,6 +1778,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient @@ -11412,7 +11421,7 @@ index e23314a2904c781ca23a9f8d906299740677759e..941d0b483bba4647a9b4b160e9c3c9a7 { _processPoolConfiguration->setIsAutomaticProcessWarmingEnabled(prewarms); diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm -index c130399cf9f3063f5a2dcc392e19eefd763c153a..3c10bb7e9dc8d9834b90a8d8faaac361f1268504 100644 +index 114f749d46624393fc21d198c2a29c4999dd7e30..ae13397f1fd5ff786639328547ee84a437a8109b 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm @@ -24,6 +24,7 @@ @@ -12004,10 +12013,10 @@ index 0000000000000000000000000000000000000000..9f1a0173a5641d6f158d815b8f7b9ea6 + +#endif diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp -index c4a9833e28bb50d1f875aa1c5ad057cee01d281a..77592ad35ea7065dfbf276588ad3a87acb3c0ac0 100644 +index 3a96753c9cf9e6d3a3d277ad82ec6f4a98635cbd..530927447170960bec796908174efff308fd5912 100644 --- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp +++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp -@@ -2471,6 +2471,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase) +@@ -2472,6 +2472,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase) #endif } @@ -12779,10 +12788,10 @@ index 2ab50dd76fd3ae3cf31f6f82ebdf5b7a271bedc5..e8c71025da8b09564801847feb76ca9c #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index 1a390b08c7585753b43a3170d10d30cb26b9de70..7f31e7261974bf68a78f382f97e287a9a1a84da2 100644 +index 472dc459c56f13c6c21d4b67fd4309185d061023..2157df01e3f2914d939e9f9bdde3d7f7c3bc1f34 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -@@ -453,7 +453,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process +@@ -455,7 +455,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process auto screenProperties = WebCore::collectScreenProperties(); parameters.screenProperties = WTFMove(screenProperties); #if PLATFORM(MAC) @@ -12791,7 +12800,7 @@ index 1a390b08c7585753b43a3170d10d30cb26b9de70..7f31e7261974bf68a78f382f97e287a9 #endif #if PLATFORM(IOS) -@@ -771,8 +771,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -773,8 +773,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -16462,7 +16471,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 5998c94340cd5936dc0ec22a7103e8036e7f7a8f..028aa3c14e887889363be4884dfa1e541c518d2b 100644 +index 7a1a3876f1b77081f1bd228195d698fa0ffcd804..495b48ff8ec12bb68c629e29fff8a98a1b2c0a33 100644 --- a/Source/WebKit/UIProcess/PageClient.h +++ b/Source/WebKit/UIProcess/PageClient.h @@ -323,6 +323,11 @@ public: @@ -16478,10 +16487,10 @@ index 5998c94340cd5936dc0ec22a7103e8036e7f7a8f..028aa3c14e887889363be4884dfa1e54 virtual RefPtr takeViewSnapshot(std::optional&&) = 0; #endif diff --git a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp -index b0919b8cb4a5a4332ef882db5a44a2c340924bea..b498c15220238a66661f2fc0862ce3213956dafd 100644 +index b88a07846d78d600de7c023a0bd04096f0857a6c..127bc7b856c89c87310679cd1e89c08caa380821 100644 --- a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp +++ b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp -@@ -622,3 +622,5 @@ bool ProvisionalPageProxy::sendMessage(UniqueRef&& encoder, Option +@@ -628,3 +628,5 @@ bool ProvisionalPageProxy::sendMessage(UniqueRef&& encoder, Option } } // namespace WebKit @@ -17509,7 +17518,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d65bc555ed 100644 +index b5a4b6988be04f26b847a33b4d21252adcc86062..900345b353474fb215625ac273cce93425e6580b 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -246,6 +246,9 @@ @@ -17533,7 +17542,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 } // FIXME: Should return a const PageClient& and add a separate non-const -@@ -1005,6 +1012,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) +@@ -1004,6 +1011,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) m_pageLoadState.didSwapWebProcesses(); if (reason != ProcessLaunchReason::InitialProcess) m_drawingArea->waitForBackingStoreUpdateOnNextPaint(); @@ -17541,7 +17550,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 } void WebPageProxy::didAttachToRunningProcess() -@@ -1358,6 +1366,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1357,6 +1365,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -17563,7 +17572,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1906,6 +1929,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1905,6 +1928,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -17595,7 +17604,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2096,6 +2144,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2095,6 +2143,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -17621,7 +17630,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2668,6 +2735,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2667,6 +2734,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -17630,7 +17639,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2678,6 +2747,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2677,6 +2746,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -17639,7 +17648,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2693,18 +2764,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2713,6 +2807,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2712,6 +2806,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -17709,7 +17718,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2725,8 +2837,18 @@ void WebPageProxy::didStartDrag() +@@ -2724,8 +2836,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17729,7 +17738,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2831,16 +2953,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2830,16 +2952,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17775,7 +17784,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3060,7 +3204,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3059,7 +3203,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17784,7 +17793,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -3093,7 +3237,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3092,7 +3236,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -17793,7 +17802,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3482,6 +3626,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3481,6 +3625,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -17802,7 +17811,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 receivedPolicyDecision(policyAction, navigation, WTFMove(policies), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3548,6 +3694,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3547,6 +3693,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) { @@ -17810,7 +17819,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4290,6 +4437,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4289,6 +4436,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17822,7 +17831,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4623,6 +4775,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4622,6 +4774,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17830,7 +17839,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4845,6 +4998,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4844,6 +4997,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17839,7 +17848,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 // 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; -@@ -5298,7 +5453,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5297,7 +5452,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) { @@ -17855,7 +17864,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5835,6 +5997,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5834,6 +5996,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(); @@ -18029,7 +18038,7 @@ index 5a7db04e822e52611b9e22a322aaee4e892b7d77..87bd8c7703e7454221b4f1f6af5278d6 // 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 be10105f1613bcc49e7725e818551e3b5e40cef3..96cdfce3143cf9068441b71e0f1c9025206c22d4 100644 +index 12c2089287e724538d1aa705b1ef42d172ca6488..b4732d5d7b1fd96ea844d61ff1d07274d2680e04 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -18112,7 +18121,7 @@ index be10105f1613bcc49e7725e818551e3b5e40cef3..96cdfce3143cf9068441b71e0f1c9025 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); -@@ -1158,6 +1178,7 @@ public: +@@ -1165,6 +1185,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -18120,7 +18129,7 @@ index be10105f1613bcc49e7725e818551e3b5e40cef3..96cdfce3143cf9068441b71e0f1c9025 void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1232,14 +1253,20 @@ public: +@@ -1239,14 +1260,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -18142,7 +18151,7 @@ index be10105f1613bcc49e7725e818551e3b5e40cef3..96cdfce3143cf9068441b71e0f1c9025 #endif void processDidBecomeUnresponsive(); -@@ -1483,6 +1510,8 @@ public: +@@ -1490,6 +1517,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -18151,7 +18160,7 @@ index be10105f1613bcc49e7725e818551e3b5e40cef3..96cdfce3143cf9068441b71e0f1c9025 #endif #if ENABLE(WEB_CRYPTO) -@@ -2591,6 +2620,7 @@ private: +@@ -2602,6 +2631,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -18159,7 +18168,7 @@ index be10105f1613bcc49e7725e818551e3b5e40cef3..96cdfce3143cf9068441b71e0f1c9025 #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2845,6 +2875,20 @@ private: +@@ -2856,6 +2886,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -18180,7 +18189,7 @@ index be10105f1613bcc49e7725e818551e3b5e40cef3..96cdfce3143cf9068441b71e0f1c9025 #endif PageLoadState m_pageLoadState; -@@ -3058,6 +3102,9 @@ private: +@@ -3069,6 +3113,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -18191,7 +18200,7 @@ index be10105f1613bcc49e7725e818551e3b5e40cef3..96cdfce3143cf9068441b71e0f1c9025 #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 32e2e4a5c449e91875604fab0278db5808f0818e..7c8c017778116e9bffe4a951a8c0071b4c58aba8 100644 +index 436e9c94ffed3d6ca61b229c4e8798122c851b19..56d28dc1aa2ccd20aa726b550d3a6f5263f31f4e 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -18288,10 +18297,10 @@ index 6dce42e82ad23813206dc7fe250985afe818a455..fda6ea5376d688855e6e325f42c84023 WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index 210cd0af72831050c91eaef8ccd90a935436db2a..e8b46b17ebbcb6f115d669f5ae64fb432a5fb43d 100644 +index 7b6a58e792be5a63be759548722a43fb8b113469..594adc301611fce4e5aa89530b8326232721f768 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -2209,6 +2209,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O +@@ -2210,6 +2210,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O networkProcess().renameOriginInWebsiteData(m_sessionID, oldName, newName, dataTypes, WTFMove(completionHandler)); } @@ -19021,7 +19030,7 @@ index 0000000000000000000000000000000000000000..d0f9827544994e450e24e3f7a427c35e + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm -index 6f38c39581822d1067b1af5b742a883dff91b8d0..ecaa92ce81da7f2d1c6d38804007070cee158029 100644 +index 9c32434b8013b9fc3fba8b9469d66862319fa3cc..8e50a03d77929d83c35ccd97e01c98dd619edd1d 100644 --- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm +++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm @@ -437,6 +437,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect) @@ -20346,10 +20355,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f0f47280f 100644 +index d1c69515bb182dfa5a540774864f73ec298c41d9..ccf2a021027d5bbee75c4629eea3a0f4691cccd9 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1969,6 +1969,18 @@ +@@ -1978,6 +1978,18 @@ DF0C5F28252ECB8E00D921DB /* WKDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F24252ECB8D00D921DB /* WKDownload.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2A252ECB8E00D921DB /* WKDownloadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2B252ED44000D921DB /* WKDownloadInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */; }; @@ -20368,7 +20377,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f DF462E0F23F22F5500EFF35F /* WKHTTPCookieStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF462E1223F338BE00EFF35F /* WKContentWorldPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF84CEE4249AA24D009096F6 /* WKPDFHUDView.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF84CEE2249AA21F009096F6 /* WKPDFHUDView.mm */; }; -@@ -2025,6 +2037,9 @@ +@@ -2034,6 +2046,9 @@ E5BEF6822130C48000F31111 /* WebDataListSuggestionsDropdownIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = E5BEF6802130C47F00F31111 /* WebDataListSuggestionsDropdownIOS.h */; }; E5CB07DC20E1678F0022C183 /* WKFormColorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */; }; ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -20378,7 +20387,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f F4094CBD2553053D003D73E3 /* DisplayListReaderHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = F4094CBB255304AF003D73E3 /* DisplayListReaderHandle.h */; }; F4094CBE25530540003D73E3 /* DisplayListWriterHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = F4094CB92553047E003D73E3 /* DisplayListWriterHandle.h */; }; F409BA181E6E64BC009DA28E /* WKDragDestinationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */; settings = {ATTRIBUTES = (Private, ); }; }; -@@ -5952,6 +5967,19 @@ +@@ -5974,6 +5989,19 @@ DF0C5F24252ECB8D00D921DB /* WKDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownload.h; sourceTree = ""; }; DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadInternal.h; sourceTree = ""; }; DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadDelegate.h; sourceTree = ""; }; @@ -20398,7 +20407,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHTTPCookieStorePrivate.h; sourceTree = ""; }; DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentWorldPrivate.h; sourceTree = ""; }; DF58C6311371AC5800F9A37C /* NativeWebWheelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebWheelEvent.h; sourceTree = ""; }; -@@ -6070,6 +6098,14 @@ +@@ -6093,6 +6121,14 @@ ECA680D31E6904B500731D20 /* ExtraPrivateSymbolsForTAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtraPrivateSymbolsForTAPI.h; sourceTree = ""; }; ECBFC1DB1E6A4D66000300C7 /* ExtraPublicSymbolsForTAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExtraPublicSymbolsForTAPI.h; sourceTree = ""; }; F036978715F4BF0500C3A80E /* WebColorPicker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebColorPicker.cpp; sourceTree = ""; }; @@ -20413,7 +20422,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f F4094CB92553047E003D73E3 /* DisplayListWriterHandle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DisplayListWriterHandle.h; sourceTree = ""; }; F4094CBA2553047E003D73E3 /* DisplayListWriterHandle.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DisplayListWriterHandle.cpp; sourceTree = ""; }; F4094CBB255304AF003D73E3 /* DisplayListReaderHandle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DisplayListReaderHandle.h; sourceTree = ""; }; -@@ -6193,6 +6229,7 @@ +@@ -6216,6 +6252,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -20421,7 +20430,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -8106,6 +8143,7 @@ +@@ -8131,6 +8168,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -20429,7 +20438,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -9172,6 +9210,7 @@ +@@ -9200,6 +9238,7 @@ isa = PBXGroup; children = ( 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -20437,7 +20446,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, ); -@@ -9657,6 +9696,12 @@ +@@ -9685,6 +9724,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -20450,7 +20459,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f ); path = Agents; sourceTree = ""; -@@ -9665,6 +9710,7 @@ +@@ -9693,6 +9738,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -20458,7 +20467,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -10176,6 +10222,12 @@ +@@ -10213,6 +10259,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -20471,7 +20480,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -10478,6 +10530,7 @@ +@@ -10515,6 +10567,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -20479,7 +20488,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -11073,6 +11126,11 @@ +@@ -11110,6 +11163,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -20491,7 +20500,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, C1817362205844A900DFDA65 /* DisplayLink.cpp */, -@@ -11933,6 +11991,7 @@ +@@ -11970,6 +12028,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -20499,7 +20508,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -12231,6 +12290,7 @@ +@@ -12274,6 +12333,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -20507,7 +20516,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -12246,6 +12306,7 @@ +@@ -12290,6 +12350,7 @@ 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, F40BBB41257FF46E0067463A /* GPUProcessWakeupMessageArguments.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -20515,7 +20524,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -12393,6 +12454,7 @@ +@@ -12437,6 +12498,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -20523,7 +20532,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, 93085DE026E5BCFD000EC6A7 /* NetworkStorageManager.h in Headers */, -@@ -12484,6 +12546,7 @@ +@@ -12528,6 +12590,7 @@ BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -20531,7 +20540,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */, -@@ -12505,6 +12568,7 @@ +@@ -12549,6 +12612,7 @@ CDAC20B423FB58F20021DEE3 /* RemoteCDMInstanceProxy.h in Headers */, CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, @@ -20539,7 +20548,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -12822,6 +12886,7 @@ +@@ -12867,6 +12931,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -20547,7 +20556,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -12954,6 +13019,7 @@ +@@ -12999,6 +13064,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -20555,7 +20564,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -13007,6 +13073,7 @@ +@@ -13052,6 +13118,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -20563,7 +20572,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -13163,6 +13230,7 @@ +@@ -13208,6 +13275,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -20571,7 +20580,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -14405,6 +14473,7 @@ +@@ -14451,6 +14519,7 @@ C1A152D724E5A29A00978C8B /* HandleXPCEndpointMessages.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -20579,7 +20588,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f 9BF5EC642541145600984E77 /* JSIPCBinding.cpp in Sources */, 2D913441212CF9F000128AFD /* JSNPMethod.cpp in Sources */, 2D913442212CF9F000128AFD /* JSNPObject.cpp in Sources */, -@@ -14424,6 +14493,7 @@ +@@ -14470,6 +14539,7 @@ 2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */, 2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */, 2D92A77A212B6A6100F493FD /* Module.cpp in Sources */, @@ -20587,7 +20596,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f 57B826452304F14000B72EB0 /* NearFieldSoftLink.mm in Sources */, 2D913443212CF9F000128AFD /* NetscapeBrowserFuncs.cpp in Sources */, 2D913444212CF9F000128AFD /* NetscapePlugin.cpp in Sources */, -@@ -14450,6 +14520,7 @@ +@@ -14496,6 +14566,7 @@ 1A2D8439127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp in Sources */, 2D92A792212B6AD400F493FD /* NPObjectProxy.cpp in Sources */, 2D92A793212B6AD400F493FD /* NPRemoteObjectMap.cpp in Sources */, @@ -20595,7 +20604,7 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f 2D913447212CF9F000128AFD /* NPRuntimeObjectMap.cpp in Sources */, 2D913448212CF9F000128AFD /* NPRuntimeUtilities.cpp in Sources */, 2D92A794212B6AD400F493FD /* NPVariantData.cpp in Sources */, -@@ -14755,6 +14826,7 @@ +@@ -14801,6 +14872,7 @@ 2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -20604,10 +20613,10 @@ index 4c3298e6e0a96747cef0a2ba1135343cc33d21ba..06458d99ac343879118b8aff5389675f BCBD3914125BB1A800D2C29F /* WebPageProxyMessageReceiver.cpp in Sources */, 7CE9CE101FA0767A000177DE /* WebPageUpdatePreferences.cpp in Sources */, diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp -index 0d1829b398c36051b84e215db3d16ea347791965..39ef8d2b88cbdbeb9faa3a68d46c64656da75db5 100644 +index ad35e2bf11eb192d9806d617df33232e3b07e864..dc9b5833ab9cf6deb543d349d7a95364c4e2f4bb 100644 --- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp +++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp -@@ -231,6 +231,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou +@@ -232,6 +232,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou } #endif @@ -20619,7 +20628,7 @@ index 0d1829b398c36051b84e215db3d16ea347791965..39ef8d2b88cbdbeb9faa3a68d46c6465 if (!tryLoadingUsingURLSchemeHandler(resourceLoader, trackingParameters)) { WEBLOADERSTRATEGY_RELEASE_LOG("scheduleLoad: URL will be scheduled with the NetworkProcess"); -@@ -293,7 +298,8 @@ static void addParametersShared(const Frame* frame, NetworkResourceLoadParameter +@@ -294,7 +299,8 @@ static void addParametersShared(const Frame* frame, NetworkResourceLoadParameter } } @@ -20629,7 +20638,7 @@ index 0d1829b398c36051b84e215db3d16ea347791965..39ef8d2b88cbdbeb9faa3a68d46c6465 { auto identifier = resourceLoader.identifier(); ASSERT(identifier); -@@ -306,7 +312,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -307,7 +313,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL auto* frame = resourceLoader.frame(); @@ -20637,7 +20646,7 @@ index 0d1829b398c36051b84e215db3d16ea347791965..39ef8d2b88cbdbeb9faa3a68d46c6465 loadParameters.identifier = identifier; loadParameters.webPageProxyID = trackingParameters.webPageProxyID; loadParameters.webPageID = trackingParameters.pageID; -@@ -388,14 +393,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -389,14 +394,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL if (loadParameters.options.mode != FetchOptions::Mode::Navigate) { ASSERT(loadParameters.sourceOrigin); @@ -20654,8 +20663,8 @@ index 0d1829b398c36051b84e215db3d16ea347791965..39ef8d2b88cbdbeb9faa3a68d46c6465 + loadParameters.shouldRestrictHTTPResponseAccess = RuntimeEnabledFeatures::sharedFeatures().restrictedHTTPResponseAccess(); loadParameters.isMainFrameNavigation = resourceLoader.frame() && resourceLoader.frame()->isMainFrame() && resourceLoader.options().mode == FetchOptions::Mode::Navigate; - -@@ -411,6 +413,17 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL + if (loadParameters.isMainFrameNavigation && document) +@@ -428,6 +430,17 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL } ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == ClientCredentialPolicy::CannotAskClientForCredentials); @@ -20673,7 +20682,7 @@ index 0d1829b398c36051b84e215db3d16ea347791965..39ef8d2b88cbdbeb9faa3a68d46c6465 std::optional existingNetworkResourceLoadIdentifierToResume; if (loadParameters.isMainFrameNavigation) -@@ -425,7 +438,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -442,7 +455,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL } auto loader = WebResourceLoader::create(resourceLoader, trackingParameters); @@ -20682,7 +20691,7 @@ index 0d1829b398c36051b84e215db3d16ea347791965..39ef8d2b88cbdbeb9faa3a68d46c6465 } void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader) -@@ -827,7 +840,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier +@@ -844,7 +857,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier bool WebLoaderStrategy::isOnLine() const { @@ -20691,7 +20700,7 @@ index 0d1829b398c36051b84e215db3d16ea347791965..39ef8d2b88cbdbeb9faa3a68d46c6465 } void WebLoaderStrategy::addOnlineStateChangeListener(Function&& listener) -@@ -847,6 +860,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet +@@ -864,6 +877,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet void WebLoaderStrategy::setOnLineState(bool isOnLine) { @@ -20703,7 +20712,7 @@ index 0d1829b398c36051b84e215db3d16ea347791965..39ef8d2b88cbdbeb9faa3a68d46c6465 if (m_isOnLine == isOnLine) return; -@@ -855,6 +873,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) +@@ -872,6 +890,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) listener(isOnLine); } @@ -20862,10 +20871,10 @@ index 2eb0886f13ed035a53b8eaa60605de4dfe53fbe3..c46393209cb4f80704bbc9268fad4371 { } diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -index 58f0c44fac09f0ebc2dd219503364d66ce8a5033..7729d42bfc3503b724789a11d9dacec47e6d00a4 100644 +index fec680a06558609cb44109cdae338e514ea50837..5581c8ec78471ba09215c763903e6131e1a559a0 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -@@ -1576,13 +1576,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() +@@ -1572,13 +1572,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() if (webPage->scrollPinningBehavior() != DoNotPin) view->setScrollPinningBehavior(webPage->scrollPinningBehavior()); @@ -21266,10 +21275,10 @@ index f127d64d005ab7b93875591b94a5899205e91579..df0de26e4dc449a0fbf93e7037444df4 uint64_t m_navigationID; }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -index 2460a43d2e64b7ea9113a98562bd3b5926c2ab99..f1983899806b85ea683ee4e883000eefc1189fd8 100644 +index 22d0921e9b1ddc3f2df6897f5c872a9cba5c5891..a862b027123c26f2f7999c8cf749a1b4687dae7d 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -@@ -896,6 +896,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) +@@ -897,6 +897,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) m_page->setCanUseCredentialStorage(parameters.canUseCredentialStorage); @@ -21279,7 +21288,7 @@ index 2460a43d2e64b7ea9113a98562bd3b5926c2ab99..f1983899806b85ea683ee4e883000eef updateThrottleState(); } -@@ -1697,6 +1700,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet +@@ -1698,6 +1701,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet } #endif @@ -21302,7 +21311,7 @@ index 2460a43d2e64b7ea9113a98562bd3b5926c2ab99..f1983899806b85ea683ee4e883000eef void WebPage::loadRequest(LoadParameters&& loadParameters) { setLastNavigationWasAppInitiated(loadParameters.request.isAppInitiated()); -@@ -1942,17 +1961,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1943,17 +1962,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -21321,7 +21330,7 @@ index 2460a43d2e64b7ea9113a98562bd3b5926c2ab99..f1983899806b85ea683ee4e883000eef // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -1969,20 +1984,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1970,20 +1985,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -21349,7 +21358,7 @@ index 2460a43d2e64b7ea9113a98562bd3b5926c2ab99..f1983899806b85ea683ee4e883000eef #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -1990,7 +2003,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1991,7 +2004,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -21357,7 +21366,7 @@ index 2460a43d2e64b7ea9113a98562bd3b5926c2ab99..f1983899806b85ea683ee4e883000eef void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2285,6 +2297,7 @@ void WebPage::scaleView(double scale) +@@ -2286,6 +2298,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -21365,7 +21374,7 @@ index 2460a43d2e64b7ea9113a98562bd3b5926c2ab99..f1983899806b85ea683ee4e883000eef scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2389,17 +2402,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2390,17 +2403,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -21384,7 +21393,7 @@ index 2460a43d2e64b7ea9113a98562bd3b5926c2ab99..f1983899806b85ea683ee4e883000eef } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3281,6 +3290,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3282,6 +3291,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -21489,7 +21498,7 @@ index 2460a43d2e64b7ea9113a98562bd3b5926c2ab99..f1983899806b85ea683ee4e883000eef #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3357,6 +3464,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3358,6 +3465,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -21501,7 +21510,7 @@ index 2460a43d2e64b7ea9113a98562bd3b5926c2ab99..f1983899806b85ea683ee4e883000eef void WebPage::insertNewlineInQuotedContent() { Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame(); -@@ -3595,6 +3707,7 @@ void WebPage::didCompletePageTransition() +@@ -3596,6 +3708,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -21509,7 +21518,7 @@ index 2460a43d2e64b7ea9113a98562bd3b5926c2ab99..f1983899806b85ea683ee4e883000eef } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4371,7 +4484,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4395,7 +4508,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -21518,7 +21527,7 @@ index 2460a43d2e64b7ea9113a98562bd3b5926c2ab99..f1983899806b85ea683ee4e883000eef void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6697,6 +6810,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6721,6 +6834,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -21529,10 +21538,10 @@ index 2460a43d2e64b7ea9113a98562bd3b5926c2ab99..f1983899806b85ea683ee4e883000eef return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index 9bc4107786993b5cd002542bc8909cbad058c437..53c3f02726699999c2d8f35d0bcc0f36086a64e7 100644 +index 045561eebf72d0a56bba7bdabbb26a4c1cf1b3a9..ef5fb882456c77fe1f44992146a5403b0a9058d6 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h -@@ -116,6 +116,10 @@ typedef struct _AtkObject AtkObject; +@@ -120,6 +120,10 @@ typedef struct _AtkObject AtkObject; #include "WebPrintOperationGtk.h" #endif @@ -21543,7 +21552,7 @@ index 9bc4107786993b5cd002542bc8909cbad058c437..53c3f02726699999c2d8f35d0bcc0f36 #if PLATFORM(GTK) || PLATFORM(WPE) #include "InputMethodState.h" #endif -@@ -974,11 +978,11 @@ public: +@@ -980,11 +984,11 @@ public: void clearSelection(); void restoreSelectionInFocusedEditableElement(); @@ -21557,7 +21566,7 @@ index 9bc4107786993b5cd002542bc8909cbad058c437..53c3f02726699999c2d8f35d0bcc0f36 void performDragControllerAction(DragControllerAction, const WebCore::DragData&, SandboxExtension::Handle&&, Vector&&); #endif -@@ -992,6 +996,9 @@ public: +@@ -998,6 +1002,9 @@ public: void didStartDrag(); void dragCancelled(); OptionSet allowedDragSourceActions() const { return m_allowedDragSourceActions; } @@ -21567,7 +21576,7 @@ index 9bc4107786993b5cd002542bc8909cbad058c437..53c3f02726699999c2d8f35d0bcc0f36 #endif void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&); -@@ -1226,6 +1233,7 @@ public: +@@ -1232,6 +1239,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -21575,7 +21584,7 @@ index 9bc4107786993b5cd002542bc8909cbad058c437..53c3f02726699999c2d8f35d0bcc0f36 void insertNewlineInQuotedContent(); -@@ -1583,6 +1591,7 @@ private: +@@ -1593,6 +1601,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -21583,7 +21592,7 @@ index 9bc4107786993b5cd002542bc8909cbad058c437..53c3f02726699999c2d8f35d0bcc0f36 void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1620,6 +1629,7 @@ private: +@@ -1630,6 +1639,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -21591,7 +21600,7 @@ index 9bc4107786993b5cd002542bc8909cbad058c437..53c3f02726699999c2d8f35d0bcc0f36 #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1743,9 +1753,7 @@ private: +@@ -1753,9 +1763,7 @@ private: void countStringMatches(const String&, OptionSet, uint32_t maxMatchCount); void replaceMatches(const Vector& matchIndices, const String& replacementText, bool selectionOnly, CompletionHandler&&); @@ -21601,7 +21610,7 @@ index 9bc4107786993b5cd002542bc8909cbad058c437..53c3f02726699999c2d8f35d0bcc0f36 void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2278,6 +2286,7 @@ private: +@@ -2292,6 +2300,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -21610,10 +21619,10 @@ index 9bc4107786993b5cd002542bc8909cbad058c437..53c3f02726699999c2d8f35d0bcc0f36 bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index d24f7aff0892d012240cbefab29992540a1fabb0..a5680b96589c470e412cd984900220c869cddba2 100644 +index 8afc4ea5e3cd01c2ac3a4a341f316a9a211332e1..684cba31d57e4480ea1deca446251285d90318d0 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -@@ -134,6 +134,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -136,6 +136,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType ConnectInspector(String targetId, Inspector::FrontendChannel::ConnectionType connectionType) DisconnectInspector(String targetId) SendMessageToTargetBackend(String targetId, String message) @@ -21621,7 +21630,7 @@ index d24f7aff0892d012240cbefab29992540a1fabb0..a5680b96589c470e412cd984900220c8 #if ENABLE(REMOTE_INSPECTOR) SetIndicating(bool indicating); -@@ -145,6 +146,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -147,6 +148,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType #endif #if !ENABLE(IOS_TOUCH_EVENTS) && ENABLE(TOUCH_EVENTS) TouchEvent(WebKit::WebTouchEvent event) @@ -21629,7 +21638,7 @@ index d24f7aff0892d012240cbefab29992540a1fabb0..a5680b96589c470e412cd984900220c8 #endif CancelPointer(WebCore::PointerID pointerId, WebCore::IntPoint documentPoint) -@@ -174,6 +176,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -176,6 +178,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType LoadURLInFrame(URL url, String referrer, WebCore::FrameIdentifier frameID) LoadDataInFrame(IPC::DataReference data, String MIMEType, String encodingName, URL baseURL, WebCore::FrameIdentifier frameID) LoadRequest(struct WebKit::LoadParameters loadParameters) @@ -21637,7 +21646,7 @@ index d24f7aff0892d012240cbefab29992540a1fabb0..a5680b96589c470e412cd984900220c8 LoadRequestWaitingForProcessLaunch(struct WebKit::LoadParameters loadParameters, URL resourceDirectoryURL, WebKit::WebPageProxyIdentifier pageID, bool checkAssumedReadAccessToResourceURL) LoadData(struct WebKit::LoadParameters loadParameters) LoadSimulatedRequestAndResponse(struct WebKit::LoadParameters loadParameters, WebCore::ResourceResponse simulatedResponse) -@@ -313,10 +316,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -315,10 +318,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType AddMIMETypeWithCustomContentProvider(String mimeType) # Drag and drop. @@ -21650,7 +21659,7 @@ index d24f7aff0892d012240cbefab29992540a1fabb0..a5680b96589c470e412cd984900220c8 PerformDragControllerAction(enum:uint8_t WebKit::DragControllerAction action, WebCore::DragData dragData, WebKit::SandboxExtension::Handle sandboxExtensionHandle, Vector sandboxExtensionsForUpload) #endif #if ENABLE(DRAG_SUPPORT) -@@ -325,6 +328,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -327,6 +330,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType DragCancelled() #endif @@ -21754,10 +21763,10 @@ index 0cf4707d44fb20a2cb125aaf9465d1282bf84651..59a6c108a4be8ef05ae01cb594898357 } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index 198ae3d0272e2217de469f037e5376b4dab363fb..aecda54648a307d186adb41ed97253ee532a2b15 100644 +index f2ea19e8206ed3892f2f829f7bc9c8502470f961..35cc0c90b399e6078851ab75ce2ce85d92f4fb40 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp -@@ -88,6 +88,7 @@ +@@ -89,6 +89,7 @@ #include "WebsiteData.h" #include "WebsiteDataStoreParameters.h" #include "WebsiteDataType.h" @@ -21765,7 +21774,7 @@ index 198ae3d0272e2217de469f037e5376b4dab363fb..aecda54648a307d186adb41ed97253ee #include #include #include -@@ -348,6 +349,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter +@@ -349,6 +350,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter platformInitializeProcess(parameters); updateCPULimit(); @@ -21856,7 +21865,7 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 04fa71ad80a721f8db6656ecf1904b13aa11677a..e08610e659baefd7ce20a40bcf3618a7fa612906 100644 +index f9edc918e469fffa87330931e47ff9e637926056..5443bfd64d3b72bd639cba26dae7e265371c74b5 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -5,6 +5,7 @@ WEBKIT_OPTION_BEGIN() @@ -21932,7 +21941,7 @@ index 04fa71ad80a721f8db6656ecf1904b13aa11677a..e08610e659baefd7ce20a40bcf3618a7 # 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 0e23732209de52a342e8dc19eea5efbb7b85b97a..2a7712cc155635d29a3bbfcedb8289bf597630a1 100644 +index 610415e5224570bee4ca8af25c37ea5c5fa9aae8..64fc4ade5f4cf0b14f1dc420c8abb2ca37e2bb52 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -3,6 +3,7 @@ include(VersioningUtils) @@ -22601,7 +22610,7 @@ index 775b41868718ea6734efc9082f8161eee2e0015e..68a720c0cb01d534653a259536c48168 list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp -index 88515afddeb0fa2dcf76d57f4e381849b6aaa546..30ff6cd0a112a877a09a10fb14c89d4cf81481aa 100644 +index feb2a397e42a368c4179ecb31d6d192063f19a07..867ccf2c09a1be59872f77fd83eff5302be1b037 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp @@ -796,6 +796,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)