diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 7db9282384..a6d982380e 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1543 -Changed: dpino@igalia.com Thu Sep 9 09:47:56 UTC 2021 +1544 +Changed: dpino@igalia.com Wed Sep 15 07:00:50 UTC 2021 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 28d0598049..958789d640 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="9e2a5391e30e200b63d522fc6fe849171776cb44" +BASE_REVISION="beeaa88c67c1c2b451e3f7dae32e49825c4a3730" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index f5840edc54..6deaab9366 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -1779,7 +1779,7 @@ index 2decf8a83c80e80ca8677f4c787bf79c6c2995fa..9010384a32f7c2ab69a8fb20eb19cd56 } diff --git a/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp b/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp -index 7de1bd283ef3d29bd28bff32e3eb293c0da33f18..9a66d6ab1178481a391c5aeb086e6525eaad1f8b 100644 +index 83171d9179d18cf606eeb81fce4156086eea9cf3..87ed997bf2d25c6096e3da5dce11d32a4715e05a 100644 --- a/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp +++ b/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp @@ -36,6 +36,7 @@ @@ -1912,13 +1912,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 0d35ce49c37dcf78ade4c27ba9a9eb81260688c4..6be3eeca3a947933c4971adc68815cdb5aeacaa4 100644 +index dbb614f5617bf696427f3f9c4cf843be7693d9b2..e1038d9ee40b1ca0e907883003d32aba7c6dfb21 100644 --- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp +++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp -@@ -325,3 +325,23 @@ __ZNK3rtc13SocketAddress4HashEv - __ZNK3rtc13SocketAddresseqERKS0_ +@@ -326,3 +326,23 @@ __ZNK3rtc13SocketAddresseqERKS0_ __ZNK3rtc9IPAddress5IsNilEv __ZN3rtc12SSLCertChainD1Ev + __ZN6webrtc24SctpTransportInformationD1Ev +__ZN8mkvmuxer11SegmentInfo15set_writing_appEPKc +__ZN8mkvmuxer11SegmentInfo4InitEv +__ZN8mkvmuxer7Segment10OutputCuesEb @@ -2035,7 +2035,7 @@ index d8677555342ee0168223a0bc3ef54603b1a23460..b9ee7198a702cbc0241de3a33b65a694 41323A1D2665288B00B38623 /* packet_sequencer.cc in Sources */, 4131BF2D234B88200028A615 /* rtc_stats_collector.cc in Sources */, diff --git a/Source/WTF/Scripts/Preferences/WebPreferences.yaml b/Source/WTF/Scripts/Preferences/WebPreferences.yaml -index 9d3cce97c0859a98de89cb86b7d62ef86b58c54b..f59d76f2c1dc62967434d46cc1c002b12aeed656 100644 +index 25afb2508e8cd45df55044d61e62a84a16336bea..c2ed115fa695ba072f9913bfc11ca956dfee651c 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferences.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferences.yaml @@ -1020,7 +1020,7 @@ InspectorStartsAttached: @@ -2066,10 +2066,10 @@ index 9d3cce97c0859a98de89cb86b7d62ef86b58c54b..f59d76f2c1dc62967434d46cc1c002b1 type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index 5f544878f59d95f1dd02451c7d74129826eaf79d..c3b118da3ec0c5ad887955025ead20e262659152 100644 +index febcd6ef091269394803f9736bb564933a85580a..2a11ce3e5e00d9174931e7f793a85076e49117bc 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -@@ -717,9 +717,9 @@ MaskWebGLStringsEnabled: +@@ -731,9 +731,9 @@ MaskWebGLStringsEnabled: WebKitLegacy: default: true WebKit: @@ -2081,7 +2081,7 @@ index 5f544878f59d95f1dd02451c7d74129826eaf79d..c3b118da3ec0c5ad887955025ead20e2 # FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well. MediaCapabilitiesExtensionsEnabled: -@@ -1083,7 +1083,7 @@ SpeechRecognitionEnabled: +@@ -1109,7 +1109,7 @@ SpeechRecognitionEnabled: WebKitLegacy: default: false WebKit: @@ -2247,7 +2247,7 @@ index 041a3e28ec958a17127c0b027785caafe2bbe246..f2c31838792de5e4601f1efe53c7ce6a #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index b80c84296f44f03075e9056c409d80b75281f37f..860838a7026d257794d9b78333bbbc736eab426f 100644 +index cdf426918faeff164e06eca1fe4d06d9aac49ccd..398b443afb05c85a763601a1e8181ac401ae82a3 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h @@ -208,7 +208,7 @@ @@ -2272,7 +2272,7 @@ index 4a12b5a4393fe2bbe39673e3fa547c9d6976abd7..678b777736019debbd25fcd72fd34f3d if (Systemd_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 9f63a301411b88654ee2f55d7fa43fd03cd9098d..1bb75d037050eeae914a31e73aa8b15688489b91 100644 +index b066e5fc131fc4e8b7fb956795379989f6a85bcc..2f45ae9c423aeba3c93eb24081ec4091beec57e7 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -387,8 +387,8 @@ @@ -2299,10 +2299,10 @@ index 643ef0fcdf4f3ce4a1f27bc0cc6e179b7143bbd4..f6ee05b80ebc200d0db74fc7e975d96c if (Systemd_FOUND) diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index 338f610e01231887528cf41a3925e218e41377f9..c0b3a16c72d0458d1e14a1a034826a13ef598167 100644 +index cc3301d6ef9062e80a61638e91a52bad1088b116..12ec6cbc6c419932d1b86d583db1894bda2b027c 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make -@@ -732,6 +732,10 @@ JS_BINDING_IDLS := \ +@@ -752,6 +752,10 @@ JS_BINDING_IDLS := \ $(WebCore)/dom/Slotable.idl \ $(WebCore)/dom/StaticRange.idl \ $(WebCore)/dom/StringCallback.idl \ @@ -2313,7 +2313,7 @@ index 338f610e01231887528cf41a3925e218e41377f9..c0b3a16c72d0458d1e14a1a034826a13 $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1263,9 +1267,6 @@ JS_BINDING_IDLS := \ +@@ -1283,9 +1287,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -2409,11 +2409,11 @@ index 66cec91542b74765a9c1ffbc2f28e1a5085c55e0..9a2a89a09279b3b7102282de6bfc4cc7 _hasSentSpeechStart = true; _delegateCallback(SpeechRecognitionUpdate::create(_identifier, SpeechRecognitionUpdateType::SpeechStart)); diff --git a/Source/WebCore/PlatformWPE.cmake b/Source/WebCore/PlatformWPE.cmake -index bc13d564edaaece26c488b4d7a6f68e8568df467..0a49521abb26a98a39db2ec91b81d1d9f09736db 100644 +index 9f4daefcd385d534149f0a5a6ce0e8016e25638f..37f64495ec9b316bbf0a5e3212917d43b30ff396 100644 --- a/Source/WebCore/PlatformWPE.cmake +++ b/Source/WebCore/PlatformWPE.cmake -@@ -38,6 +38,7 @@ list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES - list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS +@@ -42,6 +42,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS + platform/graphics/wayland/PlatformDisplayWayland.h platform/graphics/wayland/WlUniquePtr.h + platform/wpe/SelectionData.h @@ -2486,10 +2486,10 @@ index 9f85e4986c53a1cc8d63b3394d3f7295832af387..1228fda7c688c5b24cecaf07e21437d3 __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 0dfbc0228de5563d9792316f225cfea3e5c1cc1f..6325aa9bd1461f3e9259663d09963a939b001742 100644 +index 6958da796b4e14b44384f07fc9c8dfdc1bcccdd8..6f087f8bc946daf2dc526b38b3c7d2e777469d5f 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5369,6 +5369,14 @@ +@@ -5388,6 +5388,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, ); }; }; @@ -2504,7 +2504,7 @@ index 0dfbc0228de5563d9792316f225cfea3e5c1cc1f..6325aa9bd1461f3e9259663d09963a93 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, ); }; }; -@@ -16563,6 +16571,14 @@ +@@ -16643,6 +16651,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 = ""; }; @@ -2519,7 +2519,7 @@ index 0dfbc0228de5563d9792316f225cfea3e5c1cc1f..6325aa9bd1461f3e9259663d09963a93 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 = ""; }; -@@ -22041,7 +22057,12 @@ +@@ -22186,7 +22202,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2532,7 +2532,7 @@ index 0dfbc0228de5563d9792316f225cfea3e5c1cc1f..6325aa9bd1461f3e9259663d09963a93 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -27805,6 +27826,8 @@ +@@ -27963,6 +27984,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2541,7 +2541,7 @@ index 0dfbc0228de5563d9792316f225cfea3e5c1cc1f..6325aa9bd1461f3e9259663d09963a93 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -29998,6 +30021,7 @@ +@@ -30158,6 +30181,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2549,7 +2549,7 @@ index 0dfbc0228de5563d9792316f225cfea3e5c1cc1f..6325aa9bd1461f3e9259663d09963a93 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -31009,6 +31033,7 @@ +@@ -31169,6 +31193,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2557,7 +2557,7 @@ index 0dfbc0228de5563d9792316f225cfea3e5c1cc1f..6325aa9bd1461f3e9259663d09963a93 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -33052,6 +33077,7 @@ +@@ -33227,6 +33252,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2565,7 +2565,7 @@ index 0dfbc0228de5563d9792316f225cfea3e5c1cc1f..6325aa9bd1461f3e9259663d09963a93 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -35135,9 +35161,11 @@ +@@ -35316,9 +35342,11 @@ B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */, @@ -2577,7 +2577,7 @@ index 0dfbc0228de5563d9792316f225cfea3e5c1cc1f..6325aa9bd1461f3e9259663d09963a93 B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -36092,6 +36120,7 @@ +@@ -36272,6 +36300,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2585,7 +2585,7 @@ index 0dfbc0228de5563d9792316f225cfea3e5c1cc1f..6325aa9bd1461f3e9259663d09963a93 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -36178,6 +36207,7 @@ +@@ -36358,6 +36387,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2593,7 +2593,7 @@ index 0dfbc0228de5563d9792316f225cfea3e5c1cc1f..6325aa9bd1461f3e9259663d09963a93 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -36226,6 +36256,7 @@ +@@ -36406,6 +36436,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2601,7 +2601,7 @@ index 0dfbc0228de5563d9792316f225cfea3e5c1cc1f..6325aa9bd1461f3e9259663d09963a93 DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -36758,6 +36789,7 @@ +@@ -36938,6 +36969,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2641,10 +2641,10 @@ index c6f99faab4a5db170b618ca72c03dc00227eeab2..5d8a30e271d578e7d68efe9b5508ecb2 { AXComputedObjectAttributeCache* attributeCache = nullptr; diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -index d958fe2475d821a7f674e502c0ab4fdca5da2b05..ad702be937ad558f6f4733f67d18a06b3949184c 100644 +index 7ca2ab5af591635db521991e282b76c1ee603f0f..95974f017ff3d79a1134b7c08bb67085198ec523 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -@@ -91,6 +91,8 @@ namespace WebCore { +@@ -99,6 +99,8 @@ namespace WebCore { macro(Database) \ macro(DataTransferItem) \ macro(DataTransferItemList) \ @@ -2653,7 +2653,7 @@ index d958fe2475d821a7f674e502c0ab4fdca5da2b05..ad702be937ad558f6f4733f67d18a06b macro(DocumentTimeline) \ macro(EnterPictureInPictureEvent) \ macro(ExtendableEvent) \ -@@ -158,6 +160,7 @@ namespace WebCore { +@@ -169,6 +171,7 @@ namespace WebCore { macro(NavigatorMediaDevices) \ macro(NavigatorPermissions) \ macro(NavigatorUserMedia) \ @@ -2662,10 +2662,10 @@ index d958fe2475d821a7f674e502c0ab4fdca5da2b05..ad702be937ad558f6f4733f67d18a06b macro(OffscreenCanvas) \ macro(OffscreenCanvasRenderingContext2D) \ diff --git a/Source/WebCore/css/MediaQueryEvaluator.cpp b/Source/WebCore/css/MediaQueryEvaluator.cpp -index a47b2fe549a89414a207864aabe897d07a59727c..53357bc9ce111bcb1241256647c3630ae767213d 100644 +index 958560dfcb0157bac98e952f6e5f3eb13c00f2cb..bfa187355977a6f0fe1163ecd12fc9bfe3f59508 100644 --- a/Source/WebCore/css/MediaQueryEvaluator.cpp +++ b/Source/WebCore/css/MediaQueryEvaluator.cpp -@@ -844,7 +844,11 @@ static bool prefersContrastEvaluate(CSSValue* value, const CSSToLengthConversion +@@ -840,7 +840,11 @@ static bool prefersContrastEvaluate(CSSValue* value, const CSSToLengthConversion static bool prefersReducedMotionEvaluate(CSSValue* value, const CSSToLengthConversionData&, Frame& frame, MediaFeaturePrefix) { bool userPrefersReducedMotion = false; @@ -2678,7 +2678,7 @@ index a47b2fe549a89414a207864aabe897d07a59727c..53357bc9ce111bcb1241256647c3630a switch (frame.settings().forcedPrefersReducedMotionAccessibilityValue()) { case ForcedAccessibilityValue::On: userPrefersReducedMotion = true; -@@ -857,6 +861,7 @@ static bool prefersReducedMotionEvaluate(CSSValue* value, const CSSToLengthConve +@@ -853,6 +857,7 @@ static bool prefersReducedMotionEvaluate(CSSValue* value, const CSSToLengthConve #endif break; } @@ -5666,10 +5666,10 @@ index 16edb3bc689b8e2dde17597b642b706c1343e1f5..f363b2ca2410f22cff8d6ad908a88527 private: diff --git a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp -index 4d047a75d0c6b7c438890448717b3a8c55f74301..f8f34f5d7579b6f798b61f36e8a9466f7d55e91a 100644 +index 39e185d538e7e3970db879ca0d2934478815591e..de5d5b922256d73dc1391c01e11478bcdd92c03a 100644 --- a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp +++ b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp -@@ -252,7 +252,7 @@ void LineLayout::prepareLayoutState() +@@ -250,7 +250,7 @@ void LineLayout::prepareLayoutState() auto& rootGeometry = m_layoutState.ensureGeometryForBox(rootLayoutBox()); rootGeometry.setContentBoxWidth(flow.contentSize().width()); @@ -5701,10 +5701,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 ece35646105480fe07f31d85921c0db27f92dcca..f2f492499d149f195b6f586f9365d73ee0aa04df 100644 +index 0d2d141222de76fdabad6e04df7246674f70a64d..cee006ecdcd61f7e1cb31db8d130ae59521d9bea 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp -@@ -1535,8 +1535,6 @@ void DocumentLoader::detachFromFrame() +@@ -1584,8 +1584,6 @@ void DocumentLoader::detachFromFrame() if (!m_frame) return; @@ -5880,7 +5880,7 @@ index 0dcb47556d04874878656e459c9bac9af64dcfbf..df57e9a47160bfbeb8188d80afd175c7 void ProgressTracker::incrementProgress(unsigned long identifier, const ResourceResponse& response) diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h -index 7916be09b7bf39629f001a564c1fc46994876417..4bfe7f5726195233a75485ff738bf7c971d2772b 100644 +index 06c4e1ea92646e3ce6ac9cfa76757721789b3a51..576353e38b12913549acbeccb60f3ff29456e826 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h @@ -306,7 +306,7 @@ public: @@ -5893,7 +5893,7 @@ index 7916be09b7bf39629f001a564c1fc46994876417..4bfe7f5726195233a75485ff738bf7c9 #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 5bb626930a8207ce04a58268b8ae5445ef80fa0f..97aacad3482d6db57264c4b7142994f8b4d8eafb 100644 +index b6a16774c7ba3e6f25806ba8b64adb19996b9796..c60e83de2814f145fdda35cd3808e1940162c43e 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -131,6 +131,7 @@ @@ -5991,7 +5991,7 @@ index 5bb626930a8207ce04a58268b8ae5445ef80fa0f..97aacad3482d6db57264c4b7142994f8 return swallowEvent; } -@@ -4063,7 +4063,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr +@@ -4064,7 +4064,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr if (!m_frame.document()) return false; @@ -6007,7 +6007,7 @@ index 5bb626930a8207ce04a58268b8ae5445ef80fa0f..97aacad3482d6db57264c4b7142994f8 auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; if (dragState().shouldDispatchEvents) { -@@ -4470,7 +4477,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4472,7 +4479,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) allTouchReleased = false; } @@ -6017,7 +6017,7 @@ index 5bb626930a8207ce04a58268b8ae5445ef80fa0f..97aacad3482d6db57264c4b7142994f8 PlatformTouchPoint::State pointState = point.state(); LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); -@@ -4597,6 +4605,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4599,6 +4607,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) changedTouches[pointState].m_touches->append(WTFMove(touch)); changedTouches[pointState].m_targets.add(touchTarget); } @@ -6106,7 +6106,7 @@ index 7b77e407ee5d08ab3784d0899cfa33f0177f0648..0060ebfb1128cc5eb28baa5ecf4538a2 request.setHTTPHeaderField(HTTPHeaderName::Accept, "text/event-stream"); request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache"); diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp -index d5eb425530475957eab064bc94461908a4b94649..70bf07e9d5ca25be120cfeae2b5310ce8dfbfb4b 100644 +index 6a95f2aa052feeb07e38a7192d02d98468f7e5cb..b36ed11386c28cefc844901a0b57c45e5446bc19 100644 --- a/Source/WebCore/page/Frame.cpp +++ b/Source/WebCore/page/Frame.cpp @@ -39,6 +39,7 @@ @@ -6142,7 +6142,7 @@ index d5eb425530475957eab064bc94461908a4b94649..70bf07e9d5ca25be120cfeae2b5310ce return 0; } #endif // ENABLE(ORIENTATION_EVENTS) -@@ -1145,6 +1148,362 @@ DataDetectionResultsStorage& Frame::dataDetectionResults() +@@ -1149,6 +1152,362 @@ DataDetectionResultsStorage& Frame::dataDetectionResults() #endif @@ -6636,10 +6636,10 @@ 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 2d5c7b7ca08df9406567d95980d0d68e6f9e23b1..2166c0c096c764e3bcceb3c65bdf86dda866a651 100644 +index e7f6f99a2a230b6cca7f03d846bbba92c6e80be1..3eb94eb1b1df5f7eb92a8cfd39749b0030829b40 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp -@@ -460,6 +460,37 @@ void Page::setOverrideViewportArguments(const std::optional& +@@ -462,6 +462,37 @@ void Page::setOverrideViewportArguments(const std::optional& document->updateViewportArguments(); } @@ -6677,7 +6677,7 @@ index 2d5c7b7ca08df9406567d95980d0d68e6f9e23b1..2166c0c096c764e3bcceb3c65bdf86dd ScrollingCoordinator* Page::scrollingCoordinator() { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { -@@ -3268,6 +3299,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3271,6 +3302,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -6695,10 +6695,10 @@ index 2d5c7b7ca08df9406567d95980d0d68e6f9e23b1..2166c0c096c764e3bcceb3c65bdf86dd { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index ec8bf20f66e5a0bac9489b2c9db157723c5da604..4770e326b09e7b450e3137c91e42172a67e21452 100644 +index 4f9cdca1bf9c3966c3a66bf6f52b08504f58c693..d0826abc55bdad1698b39ffd451ecf617e14ef00 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h -@@ -261,6 +261,9 @@ public: +@@ -262,6 +262,9 @@ public: const std::optional& overrideViewportArguments() const { return m_overrideViewportArguments; } WEBCORE_EXPORT void setOverrideViewportArguments(const std::optional&); @@ -6708,7 +6708,7 @@ index ec8bf20f66e5a0bac9489b2c9db157723c5da604..4770e326b09e7b450e3137c91e42172a static void refreshPlugins(bool reload); WEBCORE_EXPORT PluginData& pluginData(); void clearPluginData(); -@@ -311,6 +314,10 @@ public: +@@ -314,6 +317,10 @@ public: DragCaretController& dragCaretController() const { return *m_dragCaretController; } #if ENABLE(DRAG_SUPPORT) DragController& dragController() const { return *m_dragController; } @@ -6719,7 +6719,7 @@ index ec8bf20f66e5a0bac9489b2c9db157723c5da604..4770e326b09e7b450e3137c91e42172a #endif FocusController& focusController() const { return *m_focusController; } #if ENABLE(CONTEXT_MENUS) -@@ -469,6 +476,8 @@ public: +@@ -472,6 +479,8 @@ public: WEBCORE_EXPORT void effectiveAppearanceDidChange(bool useDarkAppearance, bool useElevatedUserInterfaceLevel); bool defaultUseDarkAppearance() const { return m_useDarkAppearance; } void setUseDarkAppearanceOverride(std::optional); @@ -6728,7 +6728,7 @@ index ec8bf20f66e5a0bac9489b2c9db157723c5da604..4770e326b09e7b450e3137c91e42172a #if ENABLE(TEXT_AUTOSIZING) float textAutosizingWidth() const { return m_textAutosizingWidth; } -@@ -844,6 +853,11 @@ public: +@@ -847,6 +856,11 @@ public: WEBCORE_EXPORT Vector> editableElementsInRect(const FloatRect&) const; @@ -6740,7 +6740,7 @@ index ec8bf20f66e5a0bac9489b2c9db157723c5da604..4770e326b09e7b450e3137c91e42172a #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -932,6 +946,9 @@ private: +@@ -935,6 +949,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -6750,7 +6750,7 @@ index ec8bf20f66e5a0bac9489b2c9db157723c5da604..4770e326b09e7b450e3137c91e42172a #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1011,6 +1028,7 @@ private: +@@ -1014,6 +1031,7 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6758,7 +6758,7 @@ index ec8bf20f66e5a0bac9489b2c9db157723c5da604..4770e326b09e7b450e3137c91e42172a #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1172,6 +1190,11 @@ private: +@@ -1175,6 +1193,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -6832,10 +6832,10 @@ index 40c2ebaa2f7acad478c9e5abe2e49b1f4b585202..ba7edc32330d314c0e4ad1c9422a356b #endif diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h -index c97386fe911894361223eea09c612ebb4bce8e95..a60f37840fa9a3bff834278db5ce5dc4b4f62d9c 100644 +index b7d5b02f40cd8f391700b9e2d7d738d94131f183..40e995e2adfa4b15fe64284d616cbcdffff1aa9c 100644 --- a/Source/WebCore/page/RuntimeEnabledFeatures.h +++ b/Source/WebCore/page/RuntimeEnabledFeatures.h -@@ -202,6 +202,7 @@ public: +@@ -200,6 +200,7 @@ public: void setMouseEventsSimulationEnabled(bool isEnabled) { m_mouseEventsSimulationEnabled = isEnabled; } bool touchEventsEnabled() const; void setTouchEventsEnabled(bool isEnabled) { m_touchEventsEnabled = isEnabled; } @@ -7192,10 +7192,10 @@ index ba50b688ab6d0bae5d199fa0bac4b7e2004baf81..0b83a798b00835635a95a0db22173de0 +} // namespace WebCore +#endif diff --git a/Source/WebCore/platform/PlatformScreen.h b/Source/WebCore/platform/PlatformScreen.h -index d3f12a6538b843dfefe1e957c63bc7d32f123db7..f5e303899f6d8398f2f5ae5c759f0a52384f1286 100644 +index d47d193e8bee85c2d2a35e218decdd84b7212dc1..a1cd2f3b8f025436b596d1b1081357d9290763ea 100644 --- a/Source/WebCore/platform/PlatformScreen.h +++ b/Source/WebCore/platform/PlatformScreen.h -@@ -149,12 +149,14 @@ WEBCORE_EXPORT float screenScaleFactor(UIScreen * = nullptr); +@@ -155,12 +155,14 @@ WEBCORE_EXPORT float screenScaleFactor(UIScreen * = nullptr); #endif #if ENABLE(TOUCH_EVENTS) @@ -7227,11 +7227,11 @@ index fd39633380b947a2050a7b8680c57990f6d75cb6..a9e564cee2d4b8e72344f31491a15619 #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebCore/platform/SourcesGLib.txt b/Source/WebCore/platform/SourcesGLib.txt -index df273e58adfa61c6d25332b321f6f7d7775c6167..36befc1a01b6a06f2157d80a00d42ef56eee024f 100644 +index dc95de2b317a5dee0ec78f5bf00b0567a3591853..104dd7df5cb7cc7aac1ae76a27d307e297db6a74 100644 --- a/Source/WebCore/platform/SourcesGLib.txt +++ b/Source/WebCore/platform/SourcesGLib.txt -@@ -29,6 +29,7 @@ platform/glib/KeyedEncoderGlib.cpp - platform/glib/LowPowerModeNotifierGLib.cpp +@@ -32,6 +32,7 @@ platform/glib/LowPowerModeNotifierGLib.cpp + platform/glib/RemoteCommandListenerGLib.cpp platform/glib/SharedBufferGlib.cpp platform/glib/UserAgentGLib.cpp +platform/glib/PlatformSpeechSynthesizerGLib.cpp @@ -7313,7 +7313,7 @@ index 0000000000000000000000000000000000000000..f0c3a183e5bc44bdfa4201e0db2067b4 + +#endif // ENABLE(SPEECH_SYNTHESIS) diff --git a/Source/WebCore/platform/graphics/FontCascade.h b/Source/WebCore/platform/graphics/FontCascade.h -index 6c50657b193df95b8e4d031ea3d89f5eb529b046..50ac94ac6bed1c66fca0f9b9b1a58247938ad805 100644 +index 73993808718b200e082cdae413d357c813c16019..f5605188cbff1e79653f02888525d843fa892254 100644 --- a/Source/WebCore/platform/graphics/FontCascade.h +++ b/Source/WebCore/platform/graphics/FontCascade.h @@ -293,7 +293,8 @@ private: @@ -8978,10 +8978,10 @@ index 0000000000000000000000000000000000000000..cf2b51f6f02837a1106f4d999f2f130e + +} // namespace WebCore diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp -index d1d77014d1c8cf015863688ac7524c7a47c47915..6e02d5d071b00e3ec68d7f332b85b79d95d1c870 100644 +index 10a2bd15de36d49565e1d0370e8b027f50684903..391826daa7b5dcad967caead2bcdb3361e86fc32 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp -@@ -2594,7 +2594,7 @@ LayoutRect RenderLayer::getRectToExpose(const LayoutRect& visibleRect, const Lay +@@ -2575,7 +2575,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(); @@ -9037,7 +9037,7 @@ index 694008e0451edc5770142a0a6d9eed52b04ded80..ec93869f9486bdf7bd3bb56478c62469 WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, ScrollAlignment::Behavior); diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp -index 0e679e088955ace90c0d75a7b70f08a11cd7e9e8..93c00e53f9b717588d6e6e0e8bbae32ff2b22283 100644 +index 5dd8b35683d588f1e7d72cb18123c266765de623..e9006cf4f2b272686fb7f5642dffd82bab5cc8f3 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp @@ -76,6 +76,11 @@ @@ -9052,7 +9052,7 @@ index 0e679e088955ace90c0d75a7b70f08a11cd7e9e8..93c00e53f9b717588d6e6e0e8bbae32f #if ENABLE(APPLE_PAY_REMOTE_UI) #include "WebPaymentCoordinatorProxyMessages.h" #endif -@@ -947,6 +952,15 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) +@@ -948,6 +953,15 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) #endif } @@ -9065,11 +9065,11 @@ index 0e679e088955ace90c0d75a7b70f08a11cd7e9e8..93c00e53f9b717588d6e6e0e8bbae32f + } +} + - #if ENABLE(RESOURCE_LOAD_STATISTICS) + #if ENABLE(INTELLIGENT_TRACKING_PREVENTION) void NetworkConnectionToWebProcess::removeStorageAccessForFrame(FrameIdentifier frameID, PageIdentifier pageID) { diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -index f4a0ab7193efc6cffac60fefcdcd38fbae9f0950..53632b626ce0cde703fb3fc7cb7abf9c4afc733a 100644 +index e98a2e5da15f6b08dd250be98b6f8fab53341a4c..08cb29282a547b4a05928ce9c52ee1cafc8221de 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h @@ -289,6 +289,8 @@ private: @@ -9078,11 +9078,11 @@ index f4a0ab7193efc6cffac60fefcdcd38fbae9f0950..53632b626ce0cde703fb3fc7cb7abf9c + void setCookieFromResponse(NetworkResourceLoadParameters&&, const URL& mainDocumentURL, const String& setCookieValue); + - #if ENABLE(RESOURCE_LOAD_STATISTICS) + #if ENABLE(INTELLIGENT_TRACKING_PREVENTION) void removeStorageAccessForFrame(WebCore::FrameIdentifier, WebCore::PageIdentifier); diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in -index 73f3e891629e223449e47532dd1424735e3d4b0c..6395d6694b47aba393117ac228fac83c45fd28e0 100644 +index 15da6abfc53869fd4386247696fea511b6a9db92..28a7fda804e90860dd513c2c7702cdd050e431ff 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in @@ -66,6 +66,8 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver { @@ -9091,11 +9091,11 @@ index 73f3e891629e223449e47532dd1424735e3d4b0c..6395d6694b47aba393117ac228fac83c + SetCookieFromResponse(WebKit::NetworkResourceLoadParameters parameters, URL mainDocumentURL, String setCookieValue); + - #if ENABLE(RESOURCE_LOAD_STATISTICS) + #if ENABLE(INTELLIGENT_TRACKING_PREVENTION) 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 3610112a0e7e63644abac321508786e5b082fcc5..544455e553a63f98aa7b1b26e37ea08836d7bb8e 100644 +index 4dcb32cdb757564bfb023455f9ffcbaab3df61fc..17025ec50ad5b2481c05ca76546302ffbf45c8ff 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -26,7 +26,6 @@ @@ -9163,11 +9163,11 @@ index 3610112a0e7e63644abac321508786e5b082fcc5..544455e553a63f98aa7b1b26e37ea088 + networkSession->setIgnoreCertificateErrors(ignore); +} + - #if ENABLE(RESOURCE_LOAD_STATISTICS) + #if ENABLE(INTELLIGENT_TRACKING_PREVENTION) void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index caa4a2322a7d8715c1a43452fb3ea706283c6495..eba7baac6f5a34a302c99542cb614b7477d94471 100644 +index 106022ce685197830f265aab653d84e00f851cd9..bb62b3f543bb344d0b9035550a32218fcd54a961 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h @@ -35,6 +35,7 @@ @@ -9198,14 +9198,14 @@ index caa4a2322a7d8715c1a43452fb3ea706283c6495..eba7baac6f5a34a302c99542cb614b74 + void getLocalStorageData(PAL::SessionID sessionID, CompletionHandler>>&&)>&&); + void setLocalStorageData(PAL::SessionID sessionID, WebKit::StorageNamespaceIdentifier storageNamespaceID, Vector>>&& origins, CompletionHandler&&); + - #if ENABLE(RESOURCE_LOAD_STATISTICS) + #if ENABLE(INTELLIGENT_TRACKING_PREVENTION) 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 cf68804eef1e6f58571d1535a97c220c6a6fe624..c75e78a3fec87a39ca1bfcbc5bdf441e9c8deb44 100644 +index d5958936fae11ed8bb2a373a7d4ff0bd7fb34f51..67ec3852d26ffb27ad3d242f690f2554b535b338 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in -@@ -76,6 +76,14 @@ messages -> NetworkProcess LegacyReceiver { +@@ -77,6 +77,14 @@ messages -> NetworkProcess LegacyReceiver { PreconnectTo(PAL::SessionID sessionID, WebKit::WebPageProxyIdentifier webPageProxyID, WebCore::PageIdentifier webPageID, URL url, String userAgent, enum:uint8_t WebCore::StoredCredentialsPolicy storedCredentialsPolicy, enum:bool std::optional isNavigatingToAppBoundDomain, enum:bool WebKit::LastNavigationWasAppInitiated lastNavigationWasAppInitiated); @@ -9217,14 +9217,14 @@ index cf68804eef1e6f58571d1535a97c220c6a6fe624..c75e78a3fec87a39ca1bfcbc5bdf441e + GetLocalStorageData(PAL::SessionID sessionID) -> (Vector>> origins) Async + SetLocalStorageData(PAL::SessionID sessionID, WebKit::StorageNamespaceIdentifier storageNamespaceID, Vector>> origins) -> (String error) Async + - #if ENABLE(RESOURCE_LOAD_STATISTICS) + #if ENABLE(INTELLIGENT_TRACKING_PREVENTION) 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 70a1b491b243aaefb3d27bdcad00a605e424f50f..2fee08c736b61ffe334077ea903b04664f3542e2 100644 +index ffbf9322cd923b13febbaa7d0e8f8ae8988ef306..e0651bad9259fc4c0e08a9fc6f745bad4ca12ef9 100644 --- a/Source/WebKit/NetworkProcess/NetworkSession.h +++ b/Source/WebKit/NetworkProcess/NetworkSession.h -@@ -161,6 +161,9 @@ public: +@@ -163,6 +163,9 @@ public: bool isStaleWhileRevalidateEnabled() const { return m_isStaleWhileRevalidateEnabled; } @@ -9234,10 +9234,10 @@ index 70a1b491b243aaefb3d27bdcad00a605e424f50f..2fee08c736b61ffe334077ea903b0466 #if ENABLE(SERVICE_WORKER) void addSoftUpdateLoader(std::unique_ptr&& loader) { m_softUpdateLoaders.add(WTFMove(loader)); } void removeSoftUpdateLoader(ServiceWorkerSoftUpdateLoader* loader) { m_softUpdateLoaders.remove(loader); } -@@ -209,6 +212,7 @@ protected: +@@ -210,6 +213,7 @@ protected: #endif bool m_isStaleWhileRevalidateEnabled { false }; - std::unique_ptr m_privateClickMeasurement; + UniqueRef m_privateClickMeasurement; + bool m_ignoreCertificateErrors { false }; HashSet> m_keptAliveLoads; @@ -9449,7 +9449,7 @@ index d602a5f90999fc7f440e2468d40332625ed37083..577b76728f762e7f5aa509531a65eaab void didReceiveMessage(IPC::Connection&, IPC::Decoder&); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h -index 938bf8f8fe4ced1ec80233bc9b9adc9d2a3c2243..abc0ba2065f7a2143443918af05a2a65e5eba7e3 100644 +index b9ab0deebb9f927c73742e86a0be7f97160bd6fb..735d3bdf70f24d96d01aa84b53b4a09b0fcddaac 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h @@ -88,6 +88,8 @@ public: @@ -9462,7 +9462,7 @@ index 938bf8f8fe4ced1ec80233bc9b9adc9d2a3c2243..abc0ba2065f7a2143443918af05a2a65 NetworkDataTaskCocoa(NetworkSession&, NetworkDataTaskClient&, const NetworkLoadParameters&); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm -index 4e34f5eecc8837853269014cc4a6f9e2ea2bec51..b7bd17cd49b90b66146243314c6053b1623f340f 100644 +index e6f4c14a1ad2459f9c2aa0677115dd9f48c8ab46..850ae39428207262d04ac56e83534099525a119a 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm @@ -42,6 +42,7 @@ @@ -9534,7 +9534,7 @@ index 4e34f5eecc8837853269014cc4a6f9e2ea2bec51..b7bd17cd49b90b66146243314c6053b1 + } diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 138c4e9291d533e87ebf42bcd5b36ef0586d2298..72ba3f99bf84ccf689c4bec141e2d436f1e4e0d2 100644 +index b2bdf59a05784d1583fb702765ecb438efc07eac..3fc5e301b57b99f35918d2201333cf4e0a9461c8 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 @@ -9561,7 +9561,7 @@ index 138c4e9291d533e87ebf42bcd5b36ef0586d2298..72ba3f99bf84ccf689c4bec141e2d436 #if !LOG_DISABLED LOG(NetworkSession, "%llu didReceiveResponse completionHandler (%d)", taskIdentifier, policyAction); diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp -index e9f9b2c257866d9300e79781cbef3addc59cd9de..c45d2f047614da8a5e360b88960fbd2afb16072f 100644 +index 715701aa5a53f5a7ea833772170d56faa5a0121c..05241c9cf0ba6c91343a34110fd8d67ab9ebfb9d 100644 --- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp +++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp @@ -26,9 +26,13 @@ @@ -9734,7 +9734,7 @@ index 1c427ddb78d6953fe8960c5692afde4f4f0eee85..cf33ff6076dd95ffe564f1dde89c177a WebCore::ShouldRelaxThirdPartyCookieBlocking m_shouldRelaxThirdPartyCookieBlocking { WebCore::ShouldRelaxThirdPartyCookieBlocking::No }; diff --git a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp -index 1a28cdb7937f2c7bea4279bf2001d32ea6d67c44..1c5b66daa0346bad99584d502cd674ad4860cda6 100644 +index 175283132c0ca93eb4e6c4f7a9c466e7b6b22764..9cf8319b3bb71ba1503243b71569d9e3c567a166 100644 --- a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp +++ b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp @@ -493,6 +493,7 @@ void NetworkDataTaskSoup::didSendRequest(GRefPtr&& inputStream) @@ -10087,10 +10087,10 @@ index f48dc00755b6847f2c13e5f7dac652c2a91f66ea..eb9c890c52f47913a8dc7950d6d3fa1e NSEvent* nativeEvent() const { return m_nativeEvent.get(); } #elif PLATFORM(GTK) diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -index 87fec7fef1dab4e8bda7ed2af19c379d9134098d..e97b6232b02553f8ebfb412325136dd229a78ad9 100644 +index fabcef6c212523ef01cc89a49846006d8ea2df93..6d0bc8dc3dc486db963bd08b96e01d59b2582db1 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -@@ -120,6 +120,10 @@ +@@ -119,6 +119,10 @@ #include #endif @@ -10101,7 +10101,7 @@ index 87fec7fef1dab4e8bda7ed2af19c379d9134098d..e97b6232b02553f8ebfb412325136dd2 // FIXME: Seems like we could use std::tuple to cut down the code below a lot! namespace IPC { -@@ -675,7 +679,7 @@ bool ArgumentCoder::decode(Decoder& decoder, FloatBoxExtent& flo +@@ -674,7 +678,7 @@ bool ArgumentCoder::decode(Decoder& decoder, FloatBoxExtent& flo { return SimpleArgumentCoder::decode(decoder, floatBoxExtent); } @@ -10110,7 +10110,7 @@ index 87fec7fef1dab4e8bda7ed2af19c379d9134098d..e97b6232b02553f8ebfb412325136dd2 void ArgumentCoder::encode(Encoder& encoder, const FloatSize& floatSize) { -@@ -1424,6 +1428,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature +@@ -1423,6 +1427,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature encoder << windowFeatures.resizable; encoder << windowFeatures.fullscreen; encoder << windowFeatures.dialog; @@ -10120,7 +10120,7 @@ index 87fec7fef1dab4e8bda7ed2af19c379d9134098d..e97b6232b02553f8ebfb412325136dd2 } bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& windowFeatures) -@@ -1452,6 +1459,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win +@@ -1451,6 +1458,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win return false; if (!decoder.decode(windowFeatures.dialog)) return false; @@ -10133,7 +10133,7 @@ index 87fec7fef1dab4e8bda7ed2af19c379d9134098d..e97b6232b02553f8ebfb412325136dd2 return true; } -@@ -1465,6 +1478,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) +@@ -1464,6 +1477,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) #if PLATFORM(COCOA) encoder << dragData.pasteboardName(); encoder << dragData.fileNames(); @@ -10145,7 +10145,7 @@ index 87fec7fef1dab4e8bda7ed2af19c379d9134098d..e97b6232b02553f8ebfb412325136dd2 #endif encoder << dragData.dragDestinationActionMask(); encoder << dragData.pageID(); -@@ -1488,9 +1506,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1487,9 +1505,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(applicationFlags)) return false; @@ -10163,7 +10163,7 @@ index 87fec7fef1dab4e8bda7ed2af19c379d9134098d..e97b6232b02553f8ebfb412325136dd2 if (!decoder.decode(pasteboardName)) return false; -@@ -1506,8 +1531,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1505,8 +1530,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(pageID)) return false; @@ -10316,7 +10316,7 @@ index 3dbe10d49b4de34636900efe31fb57e7e60e341c..1457cbaad0bf5c3b17902fd8c2f243a2 const WebCore::IntPoint& globalPosition() const { return m_globalPosition; } float deltaX() const { return m_deltaX; } diff --git a/Source/WebKit/Shared/WebPageCreationParameters.cpp b/Source/WebKit/Shared/WebPageCreationParameters.cpp -index d66f91a851b87b6ef4de4def28b87669dbb055ee..369af6d539fd88e7dc3009762b9cfa06efdfef12 100644 +index ad411b806298a4b85e8785bbf475ff2d93cf17ef..05f95934ccc7c052bc721a51b5b19c2dc9f8de11 100644 --- a/Source/WebKit/Shared/WebPageCreationParameters.cpp +++ b/Source/WebKit/Shared/WebPageCreationParameters.cpp @@ -156,6 +156,8 @@ void WebPageCreationParameters::encode(IPC::Encoder& encoder) const @@ -10328,7 +10328,7 @@ index d66f91a851b87b6ef4de4def28b87669dbb055ee..369af6d539fd88e7dc3009762b9cfa06 encoder << shouldCaptureAudioInUIProcess; encoder << shouldCaptureAudioInGPUProcess; encoder << shouldCaptureVideoInUIProcess; -@@ -539,7 +541,10 @@ std::optional WebPageCreationParameters::decode(IPC:: +@@ -543,7 +545,10 @@ std::optional WebPageCreationParameters::decode(IPC:: if (!processDisplayName) return std::nullopt; parameters.processDisplayName = WTFMove(*processDisplayName); @@ -10341,7 +10341,7 @@ index d66f91a851b87b6ef4de4def28b87669dbb055ee..369af6d539fd88e7dc3009762b9cfa06 return std::nullopt; diff --git a/Source/WebKit/Shared/WebPageCreationParameters.h b/Source/WebKit/Shared/WebPageCreationParameters.h -index 968248d432f6451e0d2c29f7a340b06741729f70..1f1fba6f2b76d361ab9d55cfaf0b7ad46b2788ed 100644 +index 98df46cfa4a214d78101743bb3e8ea0083f43384..2e7be14e6ca2a414fdc005049365874c63c68c44 100644 --- a/Source/WebKit/Shared/WebPageCreationParameters.h +++ b/Source/WebKit/Shared/WebPageCreationParameters.h @@ -251,6 +251,8 @@ struct WebPageCreationParameters { @@ -10657,10 +10657,10 @@ index 85d6f74114f4e7f82d9502d1b99d69098d6a49b6..6896c9756edb233dda46c7031e1af699 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index e190b9d0440fae8e0117560ba22f0bc0e5eb06be..e48ec574a627cae3b9f2759012ba947abd3bc5da 100644 +index 42665b504fdffd05df5cdccd47f35dc26674be06..d2c6610ab1338b41b49dd302a9aa1b3a16aadee7 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -302,11 +302,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -308,11 +308,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -10675,7 +10675,7 @@ index e190b9d0440fae8e0117560ba22f0bc0e5eb06be..e48ec574a627cae3b9f2759012ba947a UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -315,6 +318,7 @@ UIProcess/PageLoadState.cpp +@@ -321,6 +324,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -10683,7 +10683,7 @@ index e190b9d0440fae8e0117560ba22f0bc0e5eb06be..e48ec574a627cae3b9f2759012ba947a UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -355,6 +359,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -361,6 +365,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -10692,7 +10692,7 @@ index e190b9d0440fae8e0117560ba22f0bc0e5eb06be..e48ec574a627cae3b9f2759012ba947a UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPreferences.cpp -@@ -476,7 +482,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -482,7 +488,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -10705,10 +10705,10 @@ index e190b9d0440fae8e0117560ba22f0bc0e5eb06be..e48ec574a627cae3b9f2759012ba947a UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 8913834f6bb5f939e720b09efcb02c9544f84aaa..b880e1c45d02a8df2f775ec0915901765ec28ce3 100644 +index 11e729684e4a2adf0b5cb893ad6791d900582605..e724f7e6e1a5905425113eb0f97f580bf11ee9c5 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -270,6 +270,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm +@@ -274,6 +274,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -10716,7 +10716,7 @@ index 8913834f6bb5f939e720b09efcb02c9544f84aaa..b880e1c45d02a8df2f775ec091590176 UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -442,6 +443,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -446,6 +447,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -10922,7 +10922,7 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0 } #endif diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp -index 85163f4450ace3d36d5971696d481eb780aed01c..0a254f504fe4076135a6b5ad5f75dd5370d3259a 100644 +index 349f900e0c7432a21ac06bc4d2eb3899b5cbe46f..ff1d615457d9efe03f584b9e4c34f0de2a720500 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 @@ -11023,7 +11023,7 @@ index afa925f36c29db9c23921298dead9cce737500d6..42d396342acdb6d39830f611df0ee40e NS_ASSUME_NONNULL_END diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm -index 32530ef3c02444979afc268ddd0a911b7b8cc187..f83129f73d37712df73eaebef02e864423eab4c1 100644 +index 7b09e5a55173933dbce62c46e795516d17f1b5dc..5a614065e889ed1cd0f1b5c191702f7cb5b3c777 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm @@ -42,6 +42,7 @@ @@ -11499,7 +11499,7 @@ index 6c1cf45443633e4c548c146657bd52a574362ab3..7259c07ec55f92d0d74ab46376aafdce bool canRunBeforeUnloadConfirmPanel() const final { return true; } diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -index bd2d4d20206f8b86fe4cd1ac90d90b79c348ed9d..b8a366703f04f589c2caa84349f8e77e38e741fb 100644 +index 1bc51dd1ed3b1185ed7265559bb1d3aed979026d..adff0ce038ca876c5b0397811faae16beee7a899 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp @@ -120,8 +120,8 @@ enum { @@ -12613,10 +12613,10 @@ index 3301ed48f045a9dd54f3a853bae90f12eda7ca57..08e760b54681bfd2230e12303620a0e2 #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index 1eb27a9be5e60b9a492eb4771bde97c5af79e338..0a58134adcda7501cece9ff13eba206ff3a2a049 100644 +index eb8561176596db9a4249cb10771ece1e359fe6d3..3ed5173359f8315e02a166330333077d338650e0 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -@@ -417,7 +417,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process +@@ -421,7 +421,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process auto screenProperties = WebCore::collectScreenProperties(); parameters.screenProperties = WTFMove(screenProperties); #if PLATFORM(MAC) @@ -12625,7 +12625,7 @@ index 1eb27a9be5e60b9a492eb4771bde97c5af79e338..0a58134adcda7501cece9ff13eba206f #endif #if PLATFORM(IOS) -@@ -702,8 +702,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -706,8 +706,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -12637,7 +12637,7 @@ index 1eb27a9be5e60b9a492eb4771bde97c5af79e338..0a58134adcda7501cece9ff13eba206f m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSApp queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h -index 01d56d0a4c140e776a54ee207aa73de3e6a79068..398bf661fee94b0f9d78f983065473a1f0b68304 100644 +index 262d56fd976fb3b47b725b8ebd66da6342d684a5..85e7a05fd644eb31fd4e4177c9b615f629e77ee1 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h @@ -514,6 +514,9 @@ public: @@ -12651,10 +12651,10 @@ index 01d56d0a4c140e776a54ee207aa73de3e6a79068..398bf661fee94b0f9d78f983065473a1 void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -index 495549e382df05eb08e80dfe203761ba3099a8c2..372a255ea3710280b09a344a8044caf5e8736bbb 100644 +index 9aab7fb686bf6e56ab5362cd7fdf2dc999f4b5c5..c061e7d7f33a55316cb0e604791264b91cca6a35 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -@@ -2609,6 +2609,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() +@@ -2615,6 +2615,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() if (!m_colorSpace) m_colorSpace = [NSColorSpace sRGBColorSpace]; } @@ -12666,7 +12666,7 @@ index 495549e382df05eb08e80dfe203761ba3099a8c2..372a255ea3710280b09a344a8044caf5 ASSERT(m_colorSpace); return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] }; -@@ -4691,6 +4696,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu +@@ -4696,6 +4701,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu return adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions)); } @@ -12934,7 +12934,7 @@ index e87f14a1772973db924624671dd40fe919904a5e..711335158c64e743a17e31c082a402eb } // namespace WebKit diff --git a/Source/WebKit/UIProcess/DrawingAreaProxy.h b/Source/WebKit/UIProcess/DrawingAreaProxy.h -index 826c417c6c9ba1c7e6c2c32a6ab0f3ab8d72f0e0..641f418f78c56aba25740586bb982231997b6bf5 100644 +index babc553d170fc71d582e26426e8cf903a9e80d33..3ec1d0258344dc5fef94c73bdd3c7d5cbc7652c9 100644 --- a/Source/WebKit/UIProcess/DrawingAreaProxy.h +++ b/Source/WebKit/UIProcess/DrawingAreaProxy.h @@ -75,6 +75,7 @@ public: @@ -12945,7 +12945,7 @@ index 826c417c6c9ba1c7e6c2c32a6ab0f3ab8d72f0e0..641f418f78c56aba25740586bb982231 #if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER) // The timeout we use when waiting for a DidUpdateGeometry message. -@@ -160,6 +161,9 @@ private: +@@ -161,6 +162,9 @@ private: virtual void update(uint64_t /* backingStoreStateID */, const UpdateInfo&) { } virtual void didUpdateBackingStoreState(uint64_t /* backingStoreStateID */, const UpdateInfo&, const LayerTreeContext&) { } virtual void exitAcceleratedCompositingMode(uint64_t /* backingStoreStateID */, const UpdateInfo&) { } @@ -16296,10 +16296,10 @@ 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 fbe3bda4965084b1a1ef41c1b9a4f4569305d53b..e68cb6cdc25fc286674a93bb1356e9ea66af4cb2 100644 +index 5998c94340cd5936dc0ec22a7103e8036e7f7a8f..028aa3c14e887889363be4884dfa1e541c518d2b 100644 --- a/Source/WebKit/UIProcess/PageClient.h +++ b/Source/WebKit/UIProcess/PageClient.h -@@ -320,6 +320,11 @@ public: +@@ -323,6 +323,11 @@ public: virtual void selectionDidChange() = 0; #endif @@ -17343,7 +17343,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c403fea552 100644 +index d9f3855c6f48fa2fc5c8a70d105aaaf5ffd26c97..586d5caf63df3d4a101a5c6092d9edd6c815b8af 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -246,6 +246,9 @@ @@ -17397,7 +17397,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1896,6 +1919,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); } @@ -17429,7 +17429,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2086,6 +2134,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2095,6 +2143,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -17455,7 +17455,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2658,6 +2725,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2667,6 +2734,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -17464,7 +17464,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2668,6 +2737,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()); @@ -17473,7 +17473,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2683,18 +2754,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2703,6 +2797,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2712,6 +2806,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -17543,7 +17543,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2715,8 +2827,18 @@ void WebPageProxy::didStartDrag() +@@ -2724,8 +2836,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17563,7 +17563,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2821,16 +2943,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2830,16 +2952,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17609,7 +17609,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3050,7 +3194,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) { @@ -17618,7 +17618,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -3083,7 +3227,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; @@ -17627,7 +17627,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3472,6 +3616,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) { @@ -17636,7 +17636,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 receivedPolicyDecision(policyAction, navigation, WTFMove(policies), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3538,6 +3684,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) { @@ -17644,7 +17644,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4280,6 +4427,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4289,6 +4436,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17656,7 +17656,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4613,6 +4765,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4622,6 +4774,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17664,7 +17664,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4835,6 +4988,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4844,6 +4997,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17673,7 +17673,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 // 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; -@@ -5287,7 +5442,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) { @@ -17689,7 +17689,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5825,6 +5987,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5835,6 +5997,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(); @@ -17697,7 +17697,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 auto completionHandler = [this, protectedThis = makeRef(*this), mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -5865,6 +6028,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5875,6 +6038,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17705,7 +17705,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 } void WebPageProxy::exitFullscreenImmediately() -@@ -5900,6 +6064,10 @@ void WebPageProxy::closePage() +@@ -5910,6 +6074,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17716,7 +17716,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -5936,6 +6104,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -5946,6 +6114,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f } runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { @@ -17725,7 +17725,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -5957,6 +6127,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -5967,6 +6137,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17734,7 +17734,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { page.m_uiClient->runJavaScriptConfirm(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](bool result) mutable { -@@ -5980,6 +6152,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -5990,6 +6162,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17743,7 +17743,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply), defaultValue](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { page.m_uiClient->runJavaScriptPrompt(page, message, defaultValue, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](auto& result) mutable { -@@ -6140,6 +6314,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6150,6 +6324,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17752,7 +17752,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7364,6 +7540,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7374,6 +7550,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -17761,7 +17761,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 } break; } -@@ -7378,10 +7556,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7388,10 +7566,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) pageClient().wheelEventWasNotHandledByWebCore(oldestProcessedEvent); } @@ -17778,7 +17778,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 break; } -@@ -7390,7 +7571,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7400,7 +7581,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) case WebEvent::RawKeyDown: case WebEvent::Char: { LOG(KeyHandling, "WebPageProxy::didReceiveEvent: %s (queue empty %d)", webKeyboardEventTypeString(type), m_keyEventQueue.isEmpty()); @@ -17786,7 +17786,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7409,7 +7589,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7419,7 +7599,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) // The call to doneWithKeyEvent may close this WebPage. // Protect against this being destroyed. Ref protect(*this); @@ -17794,7 +17794,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7418,6 +7597,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7428,6 +7607,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -17802,7 +17802,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 } break; } -@@ -7750,7 +7930,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7759,7 +7939,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%d", reason); @@ -17814,7 +17814,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8123,6 +8306,7 @@ static const Vector& mediaRelatedIOKitClasses() +@@ -8132,6 +8315,7 @@ static const Vector& mediaRelatedIOKitClasses() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -17822,7 +17822,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8315,6 +8499,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8324,6 +8508,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.shouldRelaxThirdPartyCookieBlocking = m_configuration->shouldRelaxThirdPartyCookieBlocking(); parameters.canUseCredentialStorage = m_canUseCredentialStorage; @@ -17831,7 +17831,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 #if PLATFORM(GTK) parameters.gtkSettings = GtkSettingsManager::singleton().settingsState(); #endif -@@ -8391,6 +8577,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8404,6 +8590,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -17846,7 +17846,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = makeRef(*this), authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8484,6 +8678,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8497,6 +8691,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17863,7 +17863,7 @@ index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c4 // 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 54fad223d1a388e9c0d4a67a454aa3ff5c0dc80d..8d330bdd2a4e85e3b1cd06f42103d88510c725b0 100644 +index f441714431a414fb5395f641bbf8ede8d3546a1b..9a47700f78f55f125f8665455ac415cfca9bc1a3 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17874,7 +17874,7 @@ index 54fad223d1a388e9c0d4a67a454aa3ff5c0dc80d..8d330bdd2a4e85e3b1cd06f42103d885 #include "LayerTreeContext.h" #include "MediaKeySystemPermissionRequestManagerProxy.h" #include "MediaPlaybackState.h" -@@ -143,8 +144,11 @@ +@@ -144,8 +145,11 @@ #include "EndowmentStateTracker.h" #endif @@ -17886,7 +17886,7 @@ index 54fad223d1a388e9c0d4a67a454aa3ff5c0dc80d..8d330bdd2a4e85e3b1cd06f42103d885 #endif #if ENABLE(TOUCH_EVENTS) -@@ -166,6 +170,14 @@ +@@ -167,6 +171,14 @@ #include "ArgumentCodersGtk.h" #endif @@ -17901,7 +17901,7 @@ index 54fad223d1a388e9c0d4a67a454aa3ff5c0dc80d..8d330bdd2a4e85e3b1cd06f42103d885 #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY) #include #include -@@ -245,6 +257,7 @@ class AuthenticationChallenge; +@@ -246,6 +258,7 @@ class AuthenticationChallenge; class CertificateInfo; class Cursor; class DragData; @@ -17909,7 +17909,7 @@ index 54fad223d1a388e9c0d4a67a454aa3ff5c0dc80d..8d330bdd2a4e85e3b1cd06f42103d885 class FloatRect; class FontAttributeChanges; class FontChanges; -@@ -252,7 +265,6 @@ class GraphicsLayer; +@@ -253,7 +266,6 @@ class GraphicsLayer; class IntSize; class ProtectionSpace; class RunLoopObserver; @@ -17917,7 +17917,7 @@ index 54fad223d1a388e9c0d4a67a454aa3ff5c0dc80d..8d330bdd2a4e85e3b1cd06f42103d885 class SharedBuffer; class SpeechRecognitionRequest; class TextIndicator; -@@ -532,6 +544,8 @@ public: +@@ -533,6 +545,8 @@ public: void setControlledByAutomation(bool); WebPageInspectorController& inspectorController() { return *m_inspectorController; } @@ -17926,7 +17926,7 @@ index 54fad223d1a388e9c0d4a67a454aa3ff5c0dc80d..8d330bdd2a4e85e3b1cd06f42103d885 #if PLATFORM(IOS_FAMILY) void showInspectorIndication(); -@@ -614,6 +628,11 @@ public: +@@ -615,6 +629,11 @@ public: void setPageLoadStateObserver(std::unique_ptr&&); @@ -17938,7 +17938,7 @@ index 54fad223d1a388e9c0d4a67a454aa3ff5c0dc80d..8d330bdd2a4e85e3b1cd06f42103d885 void initializeWebPage(); void setDrawingArea(std::unique_ptr&&); -@@ -641,6 +660,7 @@ public: +@@ -642,6 +661,7 @@ public: void closePage(); void addPlatformLoadParameters(WebProcessProxy&, LoadParameters&); @@ -17946,7 +17946,7 @@ index 54fad223d1a388e9c0d4a67a454aa3ff5c0dc80d..8d330bdd2a4e85e3b1cd06f42103d885 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); -@@ -1154,6 +1174,7 @@ public: +@@ -1157,6 +1177,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -17954,7 +17954,7 @@ index 54fad223d1a388e9c0d4a67a454aa3ff5c0dc80d..8d330bdd2a4e85e3b1cd06f42103d885 void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1228,14 +1249,20 @@ public: +@@ -1231,14 +1252,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -17976,7 +17976,7 @@ index 54fad223d1a388e9c0d4a67a454aa3ff5c0dc80d..8d330bdd2a4e85e3b1cd06f42103d885 #endif void processDidBecomeUnresponsive(); -@@ -1479,6 +1506,8 @@ public: +@@ -1482,6 +1509,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -18025,7 +18025,7 @@ index 54fad223d1a388e9c0d4a67a454aa3ff5c0dc80d..8d330bdd2a4e85e3b1cd06f42103d885 #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 fc55e7659a8920980fd42129ac3f0dac75bbb913..1a7dcc20a04263cbb8951c3236d343f7fa9e3ed6 100644 +index 4ba558ae824cb339027c4af30c0eb8878315c9bf..c2f6a7e00f98f69bf2334bc571f7ded87cdba73e 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -18060,7 +18060,7 @@ index fc55e7659a8920980fd42129ac3f0dac75bbb913..1a7dcc20a04263cbb8951c3236d343f7 DidPerformDragOperation(bool handled) #endif diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index 9f2bb74bf4a191b5a5ec0b0f6298d2b0ceb00ee4..942ca37acc24615d1ffdb35c69b7a429e434149c 100644 +index dc764f8d4fe7cf4e878133459ef5966c1d24604a..8cc753fcf337061cf4e49fdbe5a7dd6032548615 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp @@ -512,6 +512,14 @@ void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkPro @@ -18094,10 +18094,10 @@ index 9f2bb74bf4a191b5a5ec0b0f6298d2b0ceb00ee4..942ca37acc24615d1ffdb35c69b7a429 parameters.urlSchemesRegisteredAsEmptyDocument = copyToVector(m_schemesToRegisterAsEmptyDocument); parameters.urlSchemesRegisteredAsSecure = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsSecure()); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp -index 43d9d4918b149a8155f74403fd965dcee2f4ee3f..a887bb101e29c59ae9a8cb6ca8b7cb602c6bfacc 100644 +index 2cbe12884b5c076e9d04df28fc99445b2f38e8a4..5831bfc909f4a9c5d988966f5c20af0cf745390a 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp -@@ -126,6 +126,11 @@ HashMap& WebProcessProxy::allProcesses() +@@ -145,6 +145,11 @@ HashMap& WebProcessProxy::allProcesses() return map; } @@ -18110,7 +18110,7 @@ index 43d9d4918b149a8155f74403fd965dcee2f4ee3f..a887bb101e29c59ae9a8cb6ca8b7cb60 { return allProcesses().get(identifier); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h -index 9dc7284904ceaef0e044ef5d262f48ee9a4904b7..06d0022acb23c5cc896d25e5de2870acf4757a8d 100644 +index 6dce42e82ad23813206dc7fe250985afe818a455..fda6ea5376d688855e6e325f42c84023bbe30279 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.h +++ b/Source/WebKit/UIProcess/WebProcessProxy.h @@ -142,6 +142,7 @@ public: @@ -18122,10 +18122,10 @@ index 9dc7284904ceaef0e044ef5d262f48ee9a4904b7..06d0022acb23c5cc896d25e5de2870ac WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index 4978cccb4cba615ded690828603349ddd441b49c..2d24e37b1b9223dbf03376c6498ebe9cf6f9c5a3 100644 +index 778960ac338f22ffad5a6b25052759e855a593dd..ef6ceb2ea892f75b7331df7ed97c9d350a22a130 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -2197,6 +2197,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O +@@ -2209,6 +2209,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O networkProcess().renameOriginInWebsiteData(m_sessionID, oldName, newName, dataTypes, WTFMove(completionHandler)); } @@ -18144,13 +18144,13 @@ index 4978cccb4cba615ded690828603349ddd441b49c..2d24e37b1b9223dbf03376c6498ebe9c void WebsiteDataStore::hasAppBoundSession(CompletionHandler&& completionHandler) const { diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -index f2f5886fee16ca72d350a2f3d6e7ca0cc2a8201c..e4a45e3016c30cb45680b5e8b96320cbe2c03273 100644 +index f3d5a24e59ceb515a2f777b0ee0ee053676007ea..508c1ff4557db181780ee95d1132762d5020387e 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -@@ -86,6 +86,7 @@ class DeviceIdHashSaltStorage; +@@ -86,6 +86,7 @@ class SecKeyProxyStore; + class DeviceIdHashSaltStorage; class NetworkProcessProxy; class SOAuthorizationCoordinator; - class WebCertificateInfo; +class DownloadProxy; class WebPageProxy; class WebProcessPool; @@ -18180,7 +18180,7 @@ index f2f5886fee16ca72d350a2f3d6e7ca0cc2a8201c..e4a45e3016c30cb45680b5e8b96320cb class WebsiteDataStore : public API::ObjectImpl, public Identified, public CanMakeWeakPtr { public: static Ref defaultDataStore(); -@@ -288,11 +300,13 @@ public: +@@ -289,11 +301,13 @@ public: const WebCore::CurlProxySettings& networkProxySettings() const { return m_proxySettings; } #endif @@ -18195,7 +18195,7 @@ index f2f5886fee16ca72d350a2f3d6e7ca0cc2a8201c..e4a45e3016c30cb45680b5e8b96320cb void setNetworkProxySettings(WebCore::SoupNetworkProxySettings&&); const WebCore::SoupNetworkProxySettings& networkProxySettings() const { return m_networkProxySettings; } void setCookiePersistentStorage(const String&, SoupCookiePersistentStorageType); -@@ -351,6 +365,14 @@ public: +@@ -352,6 +366,14 @@ public: static WTF::String defaultJavaScriptConfigurationDirectory(); static bool http3Enabled(); @@ -18208,9 +18208,9 @@ index f2f5886fee16ca72d350a2f3d6e7ca0cc2a8201c..e4a45e3016c30cb45680b5e8b96320cb + DownloadInstrumentation* downloadInstrumentation() { return m_downloadInstrumentation; }; + void resetQuota(CompletionHandler&&); + void clearStorage(CompletionHandler&&); - #if ENABLE(APP_BOUND_DOMAINS) -@@ -437,9 +459,11 @@ private: +@@ -439,9 +461,11 @@ private: WebCore::CurlProxySettings m_proxySettings; #endif @@ -18223,7 +18223,7 @@ index f2f5886fee16ca72d350a2f3d6e7ca0cc2a8201c..e4a45e3016c30cb45680b5e8b96320cb WebCore::SoupNetworkProxySettings m_networkProxySettings; String m_cookiePersistentStoragePath; SoupCookiePersistentStorageType m_cookiePersistentStorageType { SoupCookiePersistentStorageType::SQLite }; -@@ -467,6 +491,11 @@ private: +@@ -469,6 +493,11 @@ private: RefPtr m_cookieStore; RefPtr m_networkProcess; @@ -20180,10 +20180,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b96de01c2 100644 +index 45d8830b2cb94ba9ddde19e72057d4cb303fc597..f7e25b452c2f79107dc7a90da9361e6cebfed608 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1967,6 +1967,18 @@ +@@ -1968,6 +1968,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 */; }; @@ -20202,7 +20202,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 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 */; }; -@@ -2023,6 +2035,9 @@ +@@ -2024,6 +2036,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, ); }; }; @@ -20212,7 +20212,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 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, ); }; }; -@@ -5909,6 +5924,19 @@ +@@ -5928,6 +5943,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 = ""; }; @@ -20232,7 +20232,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 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 = ""; }; -@@ -6027,6 +6055,14 @@ +@@ -6046,6 +6074,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 = ""; }; @@ -20247,7 +20247,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 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 = ""; }; -@@ -6143,6 +6179,7 @@ +@@ -6162,6 +6198,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -20255,7 +20255,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -8053,6 +8090,7 @@ +@@ -8072,6 +8109,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -20263,7 +20263,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -9119,6 +9157,7 @@ +@@ -9138,6 +9176,7 @@ isa = PBXGroup; children = ( 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -20271,7 +20271,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, ); -@@ -9580,6 +9619,12 @@ +@@ -9624,6 +9663,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -20284,7 +20284,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b ); path = Agents; sourceTree = ""; -@@ -9588,6 +9633,7 @@ +@@ -9632,6 +9677,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -20292,7 +20292,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -10099,6 +10145,12 @@ +@@ -10143,6 +10189,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -20305,7 +20305,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -10400,6 +10452,7 @@ +@@ -10445,6 +10497,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -20313,7 +20313,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -10994,6 +11047,11 @@ +@@ -11040,6 +11093,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -20325,7 +20325,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, C1817362205844A900DFDA65 /* DisplayLink.cpp */, -@@ -11847,6 +11905,7 @@ +@@ -11893,6 +11951,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -20333,7 +20333,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -12145,6 +12204,7 @@ +@@ -12191,6 +12250,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -20341,7 +20341,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -12160,6 +12220,7 @@ +@@ -12206,6 +12266,7 @@ 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, F40BBB41257FF46E0067463A /* GPUProcessWakeupMessageArguments.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -20349,7 +20349,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -12307,6 +12368,7 @@ +@@ -12353,6 +12414,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -20357,7 +20357,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, 93085DE026E5BCFD000EC6A7 /* NetworkStorageManager.h in Headers */, -@@ -12397,6 +12459,7 @@ +@@ -12444,6 +12506,7 @@ BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -20365,7 +20365,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */, -@@ -12418,6 +12481,7 @@ +@@ -12465,6 +12528,7 @@ CDAC20B423FB58F20021DEE3 /* RemoteCDMInstanceProxy.h in Headers */, CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, @@ -20373,7 +20373,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -12736,6 +12800,7 @@ +@@ -12783,6 +12847,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -20381,7 +20381,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -12868,6 +12933,7 @@ +@@ -12915,6 +12980,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -20389,7 +20389,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -12921,6 +12987,7 @@ +@@ -12968,6 +13034,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -20397,7 +20397,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -13077,6 +13144,7 @@ +@@ -13124,6 +13191,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -20405,7 +20405,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -14306,6 +14374,7 @@ +@@ -14353,6 +14421,7 @@ C1A152D724E5A29A00978C8B /* HandleXPCEndpointMessages.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -20413,7 +20413,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 9BF5EC642541145600984E77 /* JSIPCBinding.cpp in Sources */, 2D913441212CF9F000128AFD /* JSNPMethod.cpp in Sources */, 2D913442212CF9F000128AFD /* JSNPObject.cpp in Sources */, -@@ -14325,6 +14394,7 @@ +@@ -14372,6 +14441,7 @@ 2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */, 2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */, 2D92A77A212B6A6100F493FD /* Module.cpp in Sources */, @@ -20421,7 +20421,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 57B826452304F14000B72EB0 /* NearFieldSoftLink.mm in Sources */, 2D913443212CF9F000128AFD /* NetscapeBrowserFuncs.cpp in Sources */, 2D913444212CF9F000128AFD /* NetscapePlugin.cpp in Sources */, -@@ -14351,6 +14421,7 @@ +@@ -14398,6 +14468,7 @@ 1A2D8439127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp in Sources */, 2D92A792212B6AD400F493FD /* NPObjectProxy.cpp in Sources */, 2D92A793212B6AD400F493FD /* NPRemoteObjectMap.cpp in Sources */, @@ -20429,7 +20429,7 @@ index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b 2D913447212CF9F000128AFD /* NPRuntimeObjectMap.cpp in Sources */, 2D913448212CF9F000128AFD /* NPRuntimeUtilities.cpp in Sources */, 2D92A794212B6AD400F493FD /* NPVariantData.cpp in Sources */, -@@ -14656,6 +14727,7 @@ +@@ -14703,6 +14774,7 @@ 2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -20643,7 +20643,7 @@ index ecd4052eac038028255a786236e1969853afa1d8..da1f3a2887b7b10088703c92c77eb753 if (m_coreLoader) didFailResourceLoad(error); diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -index 7d34ee19e017c96052e0ef7a693a829cb314f5cc..8300b3d561232554fc6c2ffa4732c5e28fbd2cfe 100644 +index 8cd191c03674c415e9bce9a8cc586cade0d90a65..d17e3266e5111bb56db1e43bea80a84a8cebcc4e 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp @@ -398,6 +398,8 @@ void WebChromeClient::setResizable(bool resizable) @@ -20697,7 +20697,7 @@ index 2eb0886f13ed035a53b8eaa60605de4dfe53fbe3..c46393209cb4f80704bbc9268fad4371 { } diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -index cd3e71a26427cb5243b0678ede4306f8cbc7b159..6e0b8a7e8aeca0fbce5aa036ad9ee0114443792e 100644 +index 00889b00c85793598b7fe1330ef29d86a77ee48f..a496e9543a0d7b5268b29f23ca05e890f41fa421 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp @@ -1575,13 +1575,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() @@ -21007,7 +21007,7 @@ index ba3ed840b341f9e6b84e80c451a40379fcb412eb..0a28547f21dbd8129bbe05e0226017df virtual void adoptLayersFromDrawingArea(DrawingArea&) { } virtual void adoptDisplayRefreshMonitorsFromDrawingArea(DrawingArea&) { } diff --git a/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp b/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp -index 633828983ef77632392d0dbc2e4a90489e340b9e..91a09a613a0031fc3ba5ee452ac4bb843a216ffe 100644 +index 9aab0800140df2620b360e0bb8c8c904d86977ef..a5b77a7c8d5be31ade42af628805c74f996bf04a 100644 --- a/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp @@ -28,15 +28,19 @@ @@ -21101,10 +21101,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 b96754a02dec9467dc06b10cf9c4e9f133ffb746..eb0a5f341d63a9b37834a2fb8383f874bd9fc785 100644 +index 1abdf7e042488e6c5e98740354a5eff9a8eb8f45..60637dacec9d1fb724601faf103b309ac3ae829b 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -@@ -890,6 +890,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) +@@ -895,6 +895,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) m_page->setCanUseCredentialStorage(parameters.canUseCredentialStorage); @@ -21114,7 +21114,7 @@ index b96754a02dec9467dc06b10cf9c4e9f133ffb746..eb0a5f341d63a9b37834a2fb8383f874 updateThrottleState(); } -@@ -1679,6 +1682,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet +@@ -1696,6 +1699,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet } #endif @@ -21137,7 +21137,7 @@ index b96754a02dec9467dc06b10cf9c4e9f133ffb746..eb0a5f341d63a9b37834a2fb8383f874 void WebPage::loadRequest(LoadParameters&& loadParameters) { setLastNavigationWasAppInitiated(loadParameters.request.isAppInitiated()); -@@ -1924,17 +1943,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1941,17 +1960,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -21156,7 +21156,7 @@ index b96754a02dec9467dc06b10cf9c4e9f133ffb746..eb0a5f341d63a9b37834a2fb8383f874 // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -1951,20 +1966,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1968,20 +1983,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -21184,7 +21184,7 @@ index b96754a02dec9467dc06b10cf9c4e9f133ffb746..eb0a5f341d63a9b37834a2fb8383f874 #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -1972,7 +1985,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1989,7 +2002,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -21192,7 +21192,7 @@ index b96754a02dec9467dc06b10cf9c4e9f133ffb746..eb0a5f341d63a9b37834a2fb8383f874 void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2267,6 +2279,7 @@ void WebPage::scaleView(double scale) +@@ -2284,6 +2296,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -21200,7 +21200,7 @@ index b96754a02dec9467dc06b10cf9c4e9f133ffb746..eb0a5f341d63a9b37834a2fb8383f874 scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2371,17 +2384,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2388,17 +2401,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -21219,7 +21219,7 @@ index b96754a02dec9467dc06b10cf9c4e9f133ffb746..eb0a5f341d63a9b37834a2fb8383f874 } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3263,6 +3272,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3280,6 +3289,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -21324,7 +21324,7 @@ index b96754a02dec9467dc06b10cf9c4e9f133ffb746..eb0a5f341d63a9b37834a2fb8383f874 #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3339,6 +3446,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3356,6 +3463,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -21335,8 +21335,8 @@ index b96754a02dec9467dc06b10cf9c4e9f133ffb746..eb0a5f341d63a9b37834a2fb8383f874 + void WebPage::insertNewlineInQuotedContent() { - Frame& frame = m_page->focusController().focusedOrMainFrame(); -@@ -3576,6 +3688,7 @@ void WebPage::didCompletePageTransition() + Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame(); +@@ -3594,6 +3706,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -21344,7 +21344,7 @@ index b96754a02dec9467dc06b10cf9c4e9f133ffb746..eb0a5f341d63a9b37834a2fb8383f874 } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4340,7 +4453,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4358,7 +4471,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -21353,7 +21353,7 @@ index b96754a02dec9467dc06b10cf9c4e9f133ffb746..eb0a5f341d63a9b37834a2fb8383f874 void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6672,6 +6785,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6684,6 +6797,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -21364,7 +21364,7 @@ index b96754a02dec9467dc06b10cf9c4e9f133ffb746..eb0a5f341d63a9b37834a2fb8383f874 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index b2864572b741449da36f7acc15f8bd72f2434468..c5e1490eaf52f80c187d11bc8ad94e9cc6adcbc7 100644 +index 7f65d2b48354b84b0052b70f748e2a64c9b85f67..1cabd11e55fc3718c1e3cc2c48044fd9716bd770 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -116,6 +116,10 @@ typedef struct _AtkObject AtkObject; @@ -21436,7 +21436,7 @@ index b2864572b741449da36f7acc15f8bd72f2434468..c5e1490eaf52f80c187d11bc8ad94e9c void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2273,6 +2281,7 @@ private: +@@ -2275,6 +2283,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -21445,7 +21445,7 @@ index b2864572b741449da36f7acc15f8bd72f2434468..c5e1490eaf52f80c187d11bc8ad94e9c bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 596b4f7f6022f5aae343a6e3f009f9f96bbe8985..9c8dfcf3ce512b877f4ed65c3f903050f27df0d6 100644 +index 0c59c9130ea25b7bd60b5e845fd5e3e55d0cfa90..bcb04f91964e2327777ce193c848e6fad110c800 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in @@ -132,6 +132,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType @@ -21497,10 +21497,10 @@ index 596b4f7f6022f5aae343a6e3f009f9f96bbe8985..9c8dfcf3ce512b877f4ed65c3f903050 RequestDragStart(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) RequestAdditionalItemsForDragSession(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -index f39c829787946bc3929da96b1e931c8bb84eb74b..076cb3e1d9bca37fa0c6becd146e9ed84fbf0926 100644 +index 1751f694a0fe17271f1595411dd05ad5f21775d5..3031862c88241872472a0580f13aa69710a84b57 100644 --- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm +++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -@@ -835,21 +835,37 @@ String WebPage::platformUserAgent(const URL&) const +@@ -836,21 +836,37 @@ String WebPage::platformUserAgent(const URL&) const bool WebPage::hoverSupportedByPrimaryPointingDevice() const { @@ -21589,7 +21589,7 @@ index 0cf4707d44fb20a2cb125aaf9465d1282bf84651..59a6c108a4be8ef05ae01cb594898357 } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index 7d12acba1bba4ad9217708a2a70f913d695eef6c..2ea841ede4e5a634539d07e142c0946a13c222f0 100644 +index 6b3b54b387619e91e3fe254fb6b291dacf1a6ee9..b1d354229166a20e7f79cf8a718debc5fdb97d0f 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -88,6 +88,7 @@ @@ -21600,7 +21600,7 @@ index 7d12acba1bba4ad9217708a2a70f913d695eef6c..2ea841ede4e5a634539d07e142c0946a #include #include #include -@@ -346,6 +347,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter +@@ -348,6 +349,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter platformInitializeProcess(parameters); updateCPULimit(); @@ -21625,10 +21625,10 @@ index 8987c3964a9308f2454759de7f8972215a3ae416..bcac0afeb94ed8123d1f9fb0b932c849 SetProcessDPIAware(); return true; diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -index e4653412699e26e57a023ab8576cd9c9405f6561..866bc55ebe4ed9afe3397a78d34dee64dcea4243 100644 +index 23092260f6bc1507834aed6d850ccbd2abdbb487..212a453acc0f250f5404c99e045f70826f6f6f2c 100644 --- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -@@ -4237,7 +4237,7 @@ static BOOL currentScrollIsBlit(NSView *clipView) +@@ -4241,7 +4241,7 @@ static BOOL currentScrollIsBlit(NSView *clipView) _private->handlingMouseDownEvent = NO; } @@ -21691,7 +21691,7 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 8539b9d239ed389b92707b06406d054e0f2f9fc5..e4a1e5b9340aba3429d40a7c711f3c3eb326788b 100644 +index 5e8501a6000a30a192bbd603e7dab8a2d7714024..2ba5734d33d482c938cbbe206c52c5f243e5caee 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -5,6 +5,7 @@ WEBKIT_OPTION_BEGIN() @@ -21740,15 +21740,15 @@ index 8539b9d239ed389b92707b06406d054e0f2f9fc5..e4a1e5b9340aba3429d40a7c711f3c3e WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PUBLIC ON) -@@ -153,7 +158,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE ON) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE ON) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PRIVATE ON) +@@ -156,7 +161,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) -WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) -@@ -170,6 +174,17 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) +@@ -172,6 +176,17 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_API_STATISTICS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21766,7 +21766,7 @@ index 8539b9d239ed389b92707b06406d054e0f2f9fc5..e4a1e5b9340aba3429d40a7c711f3c3e include(GStreamerDependencies) # Finalize the value for all options. Do not attempt to use an option before -@@ -266,7 +281,7 @@ if (NOT EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py") +@@ -268,7 +283,7 @@ if (NOT EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py") endif () SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_UNIX_PRINTING ${GTK_UNIX_PRINT_FOUND}) @@ -21776,7 +21776,7 @@ index 8539b9d239ed389b92707b06406d054e0f2f9fc5..e4a1e5b9340aba3429d40a7c711f3c3e # GUri is available in GLib since version 2.66, but we only want to use it if version is >= 2.67.1. if (PC_GLIB_VERSION VERSION_GREATER "2.67.1" OR PC_GLIB_VERSION STREQUAL "2.67.1") diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake -index 5986998dc9e24f280a67b5dabff35b9126ade9c0..3b798085269db895fbe193b753a4091ea4670e72 100644 +index 0e23732209de52a342e8dc19eea5efbb7b85b97a..398b92a14e8273a929fc359ad821eccd9b48a06b 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -3,6 +3,7 @@ include(VersioningUtils) @@ -21787,15 +21787,15 @@ index 5986998dc9e24f280a67b5dabff35b9126ade9c0..3b798085269db895fbe193b753a4091e set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") find_package(Cairo 1.14.0 REQUIRED) -@@ -51,7 +52,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DARK_MODE_CSS PRIVATE ON) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PRIVATE ON) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GPU_PROCESS PRIVATE OFF) +@@ -54,7 +55,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) -WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE ON) -@@ -68,15 +68,35 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE OFF) +@@ -70,15 +70,35 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBXR PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21834,7 +21834,7 @@ index 5986998dc9e24f280a67b5dabff35b9126ade9c0..3b798085269db895fbe193b753a4091e WEBKIT_OPTION_DEFINE(USE_SYSTEMD "Whether to enable journald logging" PUBLIC ON) WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON) -@@ -282,7 +302,7 @@ SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL TRUE) +@@ -284,7 +304,7 @@ SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL TRUE) SET_AND_EXPOSE_TO_BUILD(USE_TILED_BACKING_STORE TRUE) SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS TRUE) SET_AND_EXPOSE_TO_BUILD(USE_NICOSIA TRUE) @@ -21844,7 +21844,7 @@ index 5986998dc9e24f280a67b5dabff35b9126ade9c0..3b798085269db895fbe193b753a4091e # GUri is available in GLib since version 2.66, but we only want to use it if version is >= 2.67.1. if (PC_GLIB_VERSION VERSION_GREATER "2.67.1" OR PC_GLIB_VERSION STREQUAL "2.67.1") diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake -index 67b426e58c7409f66889ed1d835af6636ad27642..9104fcb4a9a1869a2ffb2d09695e5e2d95de71df 100644 +index fb99a1e511986a6a0ea6a593d0c5a225bcc26fe3..5c31cd3f0529c81d932b3adc092ea8c1bab877e0 100644 --- a/Source/cmake/OptionsWin.cmake +++ b/Source/cmake/OptionsWin.cmake @@ -7,8 +7,9 @@ add_definitions(-D_WINDOWS -DWINVER=0x601 -D_WIN32_WINNT=0x601) @@ -22454,7 +22454,7 @@ index 775b41868718ea6734efc9082f8161eee2e0015e..68a720c0cb01d534653a259536c48168 list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp -index 8337dc59e6f9bcd991fce4e9e21944ad6dcc873c..3f66249829875babc8bc78dd2c9a7eb8eb4406b2 100644 +index 88515afddeb0fa2dcf76d57f4e381849b6aaa546..30ff6cd0a112a877a09a10fb14c89d4cf81481aa 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp @@ -796,6 +796,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)