From 7debcf48ff5838a776cc6b059c61f99976151b4e Mon Sep 17 00:00:00 2001 From: Diego Pino Date: Wed, 8 Sep 2021 21:50:10 +0800 Subject: [PATCH] browser(webkit): roll to 08/09/21 (#8769) --- browser_patches/webkit/BUILD_NUMBER | 4 +- browser_patches/webkit/UPSTREAM_CONFIG.sh | 2 +- browser_patches/webkit/patches/bootstrap.diff | 461 +++++++++--------- 3 files changed, 231 insertions(+), 236 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 1b9ea74d51..fe7a0e3289 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1541 -Changed: pavel.feldman@gmail.com Tue 07 Sep 2021 05:51:03 PM PDT +1542 +Changed: dpino@igalia.com Wed 08 Sep 2021 10:52:59 AM UTC diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 5f0bc70875..28d0598049 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="b22be72a013442ca9d1ff4bf3aa8aa436f78f142" +BASE_REVISION="9e2a5391e30e200b63d522fc6fe849171776cb44" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 0df250cfcd..513c3193e8 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -1,8 +1,8 @@ diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt -index 34e5b8f3d876e836a89626b6756b460f83b1c62e..8bfd535a33dc69ca235f3533ae80341db2caa49e 100644 +index 38cb84da056e2b6a6c13ed9f8d70518eaf08958e..c7c390d4d547e7f6bd923437b814ca371dd73121 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1315,22 +1315,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1323,22 +1323,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json @@ -31,10 +31,10 @@ index 34e5b8f3d876e836a89626b6756b460f83b1c62e..8bfd535a33dc69ca235f3533ae80341d ${JAVASCRIPTCORE_DIR}/inspector/protocol/ServiceWorker.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Target.json diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make -index c82cf261baa0339cec2d493e4edda27c0507c040..cfbcb0219acaa2817049201a5648944db633bd05 100644 +index ecbce67f78c0034c166f50d5892a6f08c5da40d6..6dc35a802288d982ae2a28bdec5992bb930afaea 100644 --- a/Source/JavaScriptCore/DerivedSources.make +++ b/Source/JavaScriptCore/DerivedSources.make -@@ -268,22 +268,27 @@ INSPECTOR_DOMAINS := \ +@@ -275,22 +275,27 @@ INSPECTOR_DOMAINS := \ $(JavaScriptCore)/inspector/protocol/CSS.json \ $(JavaScriptCore)/inspector/protocol/Canvas.json \ $(JavaScriptCore)/inspector/protocol/Console.json \ @@ -62,19 +62,6 @@ index c82cf261baa0339cec2d493e4edda27c0507c040..cfbcb0219acaa2817049201a5648944d $(JavaScriptCore)/inspector/protocol/Security.json \ $(JavaScriptCore)/inspector/protocol/ServiceWorker.json \ $(JavaScriptCore)/inspector/protocol/Target.json \ -diff --git a/Source/JavaScriptCore/assembler/ProbeContext.h b/Source/JavaScriptCore/assembler/ProbeContext.h -index 54db1ce832efc0bd382092100a4727e389fa322a..36f430bcb50949f780395bbaf5782ca93de5f559 100644 ---- a/Source/JavaScriptCore/assembler/ProbeContext.h -+++ b/Source/JavaScriptCore/assembler/ProbeContext.h -@@ -249,7 +249,7 @@ private: - friend JS_EXPORT_PRIVATE void* probeStateForContext(Context&); // Not for general use. This should only be for writing tests. - }; - --extern "C" void executeJSCJITProbe(State*); -+extern "C" void executeJSCJITProbe(State*) REFERENCED_FROM_ASM WTF_INTERNAL; - - } // namespace Probe - } // namespace JSC diff --git a/Source/JavaScriptCore/bindings/ScriptValue.cpp b/Source/JavaScriptCore/bindings/ScriptValue.cpp index 52d955b1e4929f6d0dede53097d275559b29b91d..71c538e57acf3912f9a777f7bc7eba6efb8877eb 100644 --- a/Source/JavaScriptCore/bindings/ScriptValue.cpp @@ -1632,10 +1619,10 @@ index 274b01596d490fb81b48cf89bf668e0634e8b423..d08a9ddd745c748767ba8055907daa7b "name": "getPreview", diff --git a/Source/JavaScriptCore/inspector/protocol/Screencast.json b/Source/JavaScriptCore/inspector/protocol/Screencast.json new file mode 100644 -index 0000000000000000000000000000000000000000..73a4e53ced3acc41316bb8d4c787306d3f28a27e +index 0000000000000000000000000000000000000000..f6c541d63c0b8251874eaf8818aabe0e0449401d --- /dev/null +++ b/Source/JavaScriptCore/inspector/protocol/Screencast.json -@@ -0,0 +1,64 @@ +@@ -0,0 +1,65 @@ +{ + "domain": "Screencast", + "availability": ["web"], @@ -1654,7 +1641,8 @@ index 0000000000000000000000000000000000000000..73a4e53ced3acc41316bb8d4c787306d + { "name": "file", "type": "string", "description": "Output file location." }, + { "name": "width", "type": "integer" }, + { "name": "height", "type": "integer" }, -+ { "name": "toolbarHeight", "type": "integer" } ++ { "name": "toolbarHeight", "type": "integer" }, ++ { "name": "scale", "type": "number", "optional": true } + ], + "returns": [ + { "name": "screencastId", "$ref": "ScreencastId", "description": "Unique identifier of the screencast." } @@ -1924,7 +1912,7 @@ 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 73bcf3868ceaa078ca4f589eecef9ca97f467a96..e44f363d9fad575c0e60ec4c99b28009879714fb 100644 +index 0d35ce49c37dcf78ade4c27ba9a9eb81260688c4..6be3eeca3a947933c4971adc68815cdb5aeacaa4 100644 --- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp +++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp @@ -325,3 +325,23 @@ __ZNK3rtc13SocketAddress4HashEv @@ -2078,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 221f7d22f929f59476db393a4158e24edb65253e..8745154cd8fde7afa5224da8c8b74f6e72cec45f 100644 +index 5f544878f59d95f1dd02451c7d74129826eaf79d..c3b118da3ec0c5ad887955025ead20e262659152 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -@@ -707,9 +707,9 @@ MaskWebGLStringsEnabled: +@@ -717,9 +717,9 @@ MaskWebGLStringsEnabled: WebKitLegacy: default: true WebKit: @@ -2093,7 +2081,7 @@ index 221f7d22f929f59476db393a4158e24edb65253e..8745154cd8fde7afa5224da8c8b74f6e # FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well. MediaCapabilitiesExtensionsEnabled: -@@ -1073,7 +1073,7 @@ SpeechRecognitionEnabled: +@@ -1083,7 +1083,7 @@ SpeechRecognitionEnabled: WebKitLegacy: default: false WebKit: @@ -2284,7 +2272,7 @@ index 4a12b5a4393fe2bbe39673e3fa547c9d6976abd7..678b777736019debbd25fcd72fd34f3d if (Systemd_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 4c5f1d29a1ee2dea79a88d024e0304c361ee9045..c526fba35b8fee183a9971c2107bdaa6ee860fc3 100644 +index 9f63a301411b88654ee2f55d7fa43fd03cd9098d..24de4d7161509c5543077975d4f21bd49bf6e45b 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -387,7 +387,7 @@ @@ -2309,10 +2297,10 @@ index 643ef0fcdf4f3ce4a1f27bc0cc6e179b7143bbd4..f6ee05b80ebc200d0db74fc7e975d96c if (Systemd_FOUND) diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index abf17b72dc7a8518660b29571b70aa3970a67547..de67d9b9f2f3167a3c8330e56c84201851f6dd96 100644 +index 338f610e01231887528cf41a3925e218e41377f9..c0b3a16c72d0458d1e14a1a034826a13ef598167 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make -@@ -729,6 +729,10 @@ JS_BINDING_IDLS := \ +@@ -732,6 +732,10 @@ JS_BINDING_IDLS := \ $(WebCore)/dom/Slotable.idl \ $(WebCore)/dom/StaticRange.idl \ $(WebCore)/dom/StringCallback.idl \ @@ -2323,7 +2311,7 @@ index abf17b72dc7a8518660b29571b70aa3970a67547..de67d9b9f2f3167a3c8330e56c842018 $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1259,9 +1263,6 @@ JS_BINDING_IDLS := \ +@@ -1263,9 +1267,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -2431,10 +2419,10 @@ index bc13d564edaaece26c488b4d7a6f68e8568df467..0a49521abb26a98a39db2ec91b81d1d9 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index ca61170c34df39c01b15b10124edec49679528b0..8f366a316c2617e80ac01252760c096d1b4d41d2 100644 +index 2afd4c23201851ccbcf0f73344169fcccb8e08b8..390a74feaafc10c2364bcb2da83b19e63a049cfe 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt -@@ -598,3 +598,9 @@ platform/graphics/angle/ExtensionsGLANGLE.cpp @no-unify +@@ -599,3 +599,9 @@ platform/graphics/angle/ExtensionsGLANGLE.cpp @no-unify platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify platform/graphics/angle/GraphicsContextGLANGLEEGLUtilities.cpp @no-unify platform/graphics/angle/TemporaryANGLESetting.cpp @no-unify @@ -2496,10 +2484,10 @@ index 9f85e4986c53a1cc8d63b3394d3f7295832af387..1228fda7c688c5b24cecaf07e21437d3 __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 702610325a336f513fc21264fa0177338f4d88d0..5b796ed26d183c2e058959e43abbf81ac4c8b9cb 100644 +index 0dfbc0228de5563d9792316f225cfea3e5c1cc1f..6325aa9bd1461f3e9259663d09963a939b001742 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5362,6 +5362,14 @@ +@@ -5369,6 +5369,14 @@ EDE3A5000C7A430600956A37 /* ColorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE3A4FF0C7A430600956A37 /* ColorMac.h */; settings = {ATTRIBUTES = (Private, ); }; }; EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEC98020AED7E170059137F /* WebCorePrefix.h */; }; EFCC6C8F20FE914400A2321B /* CanvasActivityRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -2514,7 +2502,7 @@ index 702610325a336f513fc21264fa0177338f4d88d0..5b796ed26d183c2e058959e43abbf81a 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, ); }; }; -@@ -16538,6 +16546,14 @@ +@@ -16563,6 +16571,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 = ""; }; @@ -2529,7 +2517,7 @@ index 702610325a336f513fc21264fa0177338f4d88d0..5b796ed26d183c2e058959e43abbf81a 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 = ""; }; -@@ -22007,7 +22023,12 @@ +@@ -22041,7 +22057,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2542,7 +2530,7 @@ index 702610325a336f513fc21264fa0177338f4d88d0..5b796ed26d183c2e058959e43abbf81a E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -27756,6 +27777,8 @@ +@@ -27805,6 +27826,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2551,7 +2539,7 @@ index 702610325a336f513fc21264fa0177338f4d88d0..5b796ed26d183c2e058959e43abbf81a 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -29947,6 +29970,7 @@ +@@ -29998,6 +30021,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2559,7 +2547,7 @@ index 702610325a336f513fc21264fa0177338f4d88d0..5b796ed26d183c2e058959e43abbf81a 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -30958,6 +30982,7 @@ +@@ -31009,6 +31033,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2567,7 +2555,7 @@ index 702610325a336f513fc21264fa0177338f4d88d0..5b796ed26d183c2e058959e43abbf81a 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -32999,6 +33024,7 @@ +@@ -33052,6 +33077,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2575,7 +2563,7 @@ index 702610325a336f513fc21264fa0177338f4d88d0..5b796ed26d183c2e058959e43abbf81a 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -35077,9 +35103,11 @@ +@@ -35135,9 +35161,11 @@ B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */, @@ -2587,7 +2575,7 @@ index 702610325a336f513fc21264fa0177338f4d88d0..5b796ed26d183c2e058959e43abbf81a B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -36034,6 +36062,7 @@ +@@ -36092,6 +36120,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2595,7 +2583,7 @@ index 702610325a336f513fc21264fa0177338f4d88d0..5b796ed26d183c2e058959e43abbf81a 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -36120,6 +36149,7 @@ +@@ -36178,6 +36207,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2603,7 +2591,7 @@ index 702610325a336f513fc21264fa0177338f4d88d0..5b796ed26d183c2e058959e43abbf81a 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -36168,6 +36198,7 @@ +@@ -36226,6 +36256,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2611,7 +2599,7 @@ index 702610325a336f513fc21264fa0177338f4d88d0..5b796ed26d183c2e058959e43abbf81a DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -36700,6 +36731,7 @@ +@@ -36758,6 +36789,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2651,10 +2639,10 @@ index c6f99faab4a5db170b618ca72c03dc00227eeab2..5d8a30e271d578e7d68efe9b5508ecb2 { AXComputedObjectAttributeCache* attributeCache = nullptr; diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -index 25da8a759b3cb72c04c2917cb6dd2ce491bd0c82..9e6c8133dc8ccabe9a84812ccfe2c1d40fb2d1ce 100644 +index d958fe2475d821a7f674e502c0ab4fdca5da2b05..ad702be937ad558f6f4733f67d18a06b3949184c 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -@@ -90,6 +90,8 @@ namespace WebCore { +@@ -91,6 +91,8 @@ namespace WebCore { macro(Database) \ macro(DataTransferItem) \ macro(DataTransferItemList) \ @@ -2663,7 +2651,7 @@ index 25da8a759b3cb72c04c2917cb6dd2ce491bd0c82..9e6c8133dc8ccabe9a84812ccfe2c1d4 macro(DocumentTimeline) \ macro(EnterPictureInPictureEvent) \ macro(ExtendableEvent) \ -@@ -157,6 +159,7 @@ namespace WebCore { +@@ -158,6 +160,7 @@ namespace WebCore { macro(NavigatorMediaDevices) \ macro(NavigatorPermissions) \ macro(NavigatorUserMedia) \ @@ -5676,7 +5664,7 @@ index 16edb3bc689b8e2dde17597b642b706c1343e1f5..f363b2ca2410f22cff8d6ad908a88527 private: diff --git a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp -index ee20d4bff6d0a1557ec9aeb38c24a7c06be7906d..e637a195d45ac6ccd2d2600081cd615c50d142bf 100644 +index 4d047a75d0c6b7c438890448717b3a8c55f74301..f8f34f5d7579b6f798b61f36e8a9466f7d55e91a 100644 --- a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp +++ b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp @@ -252,7 +252,7 @@ void LineLayout::prepareLayoutState() @@ -5711,10 +5699,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 a60114732838d2efe2f0b710c39be305c7daa7cf..c3703f4f38d5eed26a91ce12fd5cb431f1a0bdec 100644 +index ece35646105480fe07f31d85921c0db27f92dcca..f2f492499d149f195b6f586f9365d73ee0aa04df 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp -@@ -1520,8 +1520,6 @@ void DocumentLoader::detachFromFrame() +@@ -1535,8 +1535,6 @@ void DocumentLoader::detachFromFrame() if (!m_frame) return; @@ -5724,7 +5712,7 @@ index a60114732838d2efe2f0b710c39be305c7daa7cf..c3703f4f38d5eed26a91ce12fd5cb431 } diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h -index 482b575ffb3f77bd68c82cc8ea3ce2ed91306e90..2f4bb547b333b291a1e46377664edd73b6335e86 100644 +index a7313926acda59218b0215110b973a53fa4bb2f9..48812e8193eae29bed0c8c3aedcc4820dea197ee 100644 --- a/Source/WebCore/loader/DocumentLoader.h +++ b/Source/WebCore/loader/DocumentLoader.h @@ -167,9 +167,13 @@ public: @@ -5742,10 +5730,10 @@ index 482b575ffb3f77bd68c82cc8ea3ce2ed91306e90..2f4bb547b333b291a1e46377664edd73 DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index 38e6b671406537313434f56646c915a05c42db5c..523977b32494186979c39539b3905dec4bfc8185 100644 +index 2a6e166eb227e564b881ed3189b8c1125114d1a7..f9b6ccd14966366b9156577739b6befc47f1fa8c 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp -@@ -1164,6 +1164,7 @@ void FrameLoader::loadInSameDocument(const URL& url, SerializedScriptValue* stat +@@ -1168,6 +1168,7 @@ void FrameLoader::loadInSameDocument(const URL& url, SerializedScriptValue* stat } m_client->dispatchDidNavigateWithinPage(); @@ -5753,7 +5741,7 @@ index 38e6b671406537313434f56646c915a05c42db5c..523977b32494186979c39539b3905dec m_frame.document()->statePopped(stateObject ? Ref { *stateObject } : SerializedScriptValue::nullValue()); m_client->dispatchDidPopStateWithinPage(); -@@ -1490,6 +1491,7 @@ void FrameLoader::load(FrameLoadRequest&& request) +@@ -1494,6 +1495,7 @@ void FrameLoader::load(FrameLoadRequest&& request) void FrameLoader::loadWithNavigationAction(const ResourceRequest& request, NavigationAction&& action, FrameLoadType type, RefPtr&& formState, AllowNavigationToInvalidURL allowNavigationToInvalidURL, CompletionHandler&& completionHandler) { @@ -5761,7 +5749,7 @@ index 38e6b671406537313434f56646c915a05c42db5c..523977b32494186979c39539b3905dec FRAMELOADER_RELEASE_LOG(ResourceLoading, "loadWithNavigationAction: frame load started"); Ref loader = m_client->createDocumentLoader(request, defaultSubstituteDataForURL(request.url())); -@@ -1593,6 +1595,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t +@@ -1597,6 +1599,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t const String& httpMethod = loader->request().httpMethod(); if (shouldPerformFragmentNavigation(isFormSubmission, httpMethod, policyChecker().loadType(), newURL)) { @@ -5770,7 +5758,7 @@ index 38e6b671406537313434f56646c915a05c42db5c..523977b32494186979c39539b3905dec RefPtr oldDocumentLoader = m_documentLoader; NavigationAction action { *m_frame.document(), loader->request(), InitiatedByMainFrame::Unknown, policyChecker().loadType(), isFormSubmission }; -@@ -3196,6 +3200,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) +@@ -3200,6 +3204,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) checkCompleted(); if (m_frame.page()) checkLoadComplete(); @@ -5779,7 +5767,7 @@ index 38e6b671406537313434f56646c915a05c42db5c..523977b32494186979c39539b3905dec } void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, bool shouldContinue) -@@ -3961,9 +3967,6 @@ String FrameLoader::referrer() const +@@ -3965,9 +3971,6 @@ String FrameLoader::referrer() const void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() { @@ -5789,7 +5777,7 @@ index 38e6b671406537313434f56646c915a05c42db5c..523977b32494186979c39539b3905dec Vector> worlds; ScriptController::getAllWorlds(worlds); for (auto& world : worlds) -@@ -3972,13 +3975,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() +@@ -3976,13 +3979,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world) { @@ -5890,7 +5878,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 93d6c3a08659a5c3efa6008c82cf2e3aa38d0aff..377b68a9a1967f1f33211d8a41f40d2da53ecfcd 100644 +index 7916be09b7bf39629f001a564c1fc46994876417..4bfe7f5726195233a75485ff738bf7c971d2772b 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h @@ -306,7 +306,7 @@ public: @@ -5903,7 +5891,7 @@ index 93d6c3a08659a5c3efa6008c82cf2e3aa38d0aff..377b68a9a1967f1f33211d8a41f40d2d #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 0594c99507a2b501d6d647c6fe6ed45c45402191..2f2b1d63147c4f9d1aba5af5256648fbd711f8e6 100644 +index 5bb626930a8207ce04a58268b8ae5445ef80fa0f..97aacad3482d6db57264c4b7142994f8b4d8eafb 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -131,6 +131,7 @@ @@ -6017,7 +6005,7 @@ index 0594c99507a2b501d6d647c6fe6ed45c45402191..2f2b1d63147c4f9d1aba5af5256648fb auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; if (dragState().shouldDispatchEvents) { -@@ -4468,7 +4475,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4470,7 +4477,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) allTouchReleased = false; } @@ -6027,7 +6015,7 @@ index 0594c99507a2b501d6d647c6fe6ed45c45402191..2f2b1d63147c4f9d1aba5af5256648fb PlatformTouchPoint::State pointState = point.state(); LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); -@@ -4595,6 +4603,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4597,6 +4605,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) changedTouches[pointState].m_touches->append(WTFMove(touch)); changedTouches[pointState].m_targets.add(touchTarget); } @@ -6626,7 +6614,7 @@ index 1b77026f51092001cda86e32480890395b145b2e..6026bc23508016454f331b06c9f071a8 struct SnapshotOptions { diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp -index fbb0ef435f331c3ad50089fd4f8f6e7a11eca4f3..cb916e519170c02e8835715cc53f663a4be5ce99 100644 +index 89a62d382d34545f530cc74f7067b84b5ca6a01e..c8d8e3803f1ec418de4d115c2e33b7b17aed852e 100644 --- a/Source/WebCore/page/FrameView.cpp +++ b/Source/WebCore/page/FrameView.cpp @@ -3028,7 +3028,7 @@ void FrameView::setBaseBackgroundColor(const Color& backgroundColor) @@ -6638,6 +6626,15 @@ index fbb0ef435f331c3ad50089fd4f8f6e7a11eca4f3..cb916e519170c02e8835715cc53f663a #if PLATFORM(COCOA) static const auto cssValueControlBackground = CSSValueAppleSystemControlBackground; #else +@@ -3038,7 +3038,7 @@ void FrameView::updateBackgroundRecursively(const std::optional& backgrou + + for (auto* frame = m_frame.ptr(); frame; frame = frame->tree().traverseNext(m_frame.ptr())) { + if (auto* view = frame->view()) { +-#if HAVE(OS_DARK_MODE_SUPPORT) ++#if HAVE(OS_DARK_MODE_SUPPORT) && (defined(WTF_PLATFORM_MAC) && WTF_PLATFORM_MAC) || (defined(WTF_PLATFORM_IOS_FAMILY) && WTF_PLATFORM_IOS_FAMILY) + auto baseBackgroundColor = backgroundColor.value_or(RenderTheme::singleton().systemColor(cssValueControlBackground, view->styleColorOptions())); + #else + auto baseBackgroundColor = backgroundColor.value_or(Color::white); diff --git a/Source/WebCore/page/History.cpp b/Source/WebCore/page/History.cpp index 28d1fc3242174a680711027877d4153923790220..058b5309eed081fcc1e4158f66e806421dcc9d56 100644 --- a/Source/WebCore/page/History.cpp @@ -6659,10 +6656,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 c195c7be961cd382901672b3f8e0361e042fc27c..94f588b80e3568c1b50c42317ff6970499f49e0d 100644 +index 2d5c7b7ca08df9406567d95980d0d68e6f9e23b1..b0329e8c06238d32bd76b2696592414c11b6e0ba 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp -@@ -458,6 +458,37 @@ void Page::setOverrideViewportArguments(const std::optional& +@@ -460,6 +460,37 @@ void Page::setOverrideViewportArguments(const std::optional& document->updateViewportArguments(); } @@ -6700,7 +6697,7 @@ index c195c7be961cd382901672b3f8e0361e042fc27c..94f588b80e3568c1b50c42317ff69704 ScrollingCoordinator* Page::scrollingCoordinator() { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { -@@ -1284,11 +1315,6 @@ void Page::didCommitLoad() +@@ -1286,11 +1317,6 @@ void Page::didCommitLoad() #if ENABLE(EDITABLE_REGION) m_isEditableRegionEnabled = false; #endif @@ -6712,7 +6709,7 @@ index c195c7be961cd382901672b3f8e0361e042fc27c..94f588b80e3568c1b50c42317ff69704 resetSeenPlugins(); resetSeenMediaEngines(); -@@ -3266,6 +3292,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3268,6 +3294,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -6730,10 +6727,10 @@ index c195c7be961cd382901672b3f8e0361e042fc27c..94f588b80e3568c1b50c42317ff69704 { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index a05c516cb7d60d879faf5834cee13dde23f1657d..34d7adf0a9f1fcd0a34c7b1f22378de2d2bece5e 100644 +index ec8bf20f66e5a0bac9489b2c9db157723c5da604..4770e326b09e7b450e3137c91e42172a67e21452 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h -@@ -260,6 +260,9 @@ public: +@@ -261,6 +261,9 @@ public: const std::optional& overrideViewportArguments() const { return m_overrideViewportArguments; } WEBCORE_EXPORT void setOverrideViewportArguments(const std::optional&); @@ -6743,7 +6740,7 @@ index a05c516cb7d60d879faf5834cee13dde23f1657d..34d7adf0a9f1fcd0a34c7b1f22378de2 static void refreshPlugins(bool reload); WEBCORE_EXPORT PluginData& pluginData(); void clearPluginData(); -@@ -310,6 +313,10 @@ public: +@@ -311,6 +314,10 @@ public: DragCaretController& dragCaretController() const { return *m_dragCaretController; } #if ENABLE(DRAG_SUPPORT) DragController& dragController() const { return *m_dragController; } @@ -6754,7 +6751,7 @@ index a05c516cb7d60d879faf5834cee13dde23f1657d..34d7adf0a9f1fcd0a34c7b1f22378de2 #endif FocusController& focusController() const { return *m_focusController; } #if ENABLE(CONTEXT_MENUS) -@@ -468,6 +475,8 @@ public: +@@ -469,6 +476,8 @@ public: WEBCORE_EXPORT void effectiveAppearanceDidChange(bool useDarkAppearance, bool useElevatedUserInterfaceLevel); bool defaultUseDarkAppearance() const { return m_useDarkAppearance; } void setUseDarkAppearanceOverride(std::optional); @@ -6763,7 +6760,7 @@ index a05c516cb7d60d879faf5834cee13dde23f1657d..34d7adf0a9f1fcd0a34c7b1f22378de2 #if ENABLE(TEXT_AUTOSIZING) float textAutosizingWidth() const { return m_textAutosizingWidth; } -@@ -843,6 +852,11 @@ public: +@@ -844,6 +853,11 @@ public: WEBCORE_EXPORT Vector> editableElementsInRect(const FloatRect&) const; @@ -6775,7 +6772,7 @@ index a05c516cb7d60d879faf5834cee13dde23f1657d..34d7adf0a9f1fcd0a34c7b1f22378de2 #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -930,6 +944,9 @@ private: +@@ -932,6 +946,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -6785,7 +6782,7 @@ index a05c516cb7d60d879faf5834cee13dde23f1657d..34d7adf0a9f1fcd0a34c7b1f22378de2 #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1009,6 +1026,7 @@ private: +@@ -1011,6 +1028,7 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6793,7 +6790,7 @@ index a05c516cb7d60d879faf5834cee13dde23f1657d..34d7adf0a9f1fcd0a34c7b1f22378de2 #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1170,6 +1188,11 @@ private: +@@ -1172,6 +1190,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -6932,10 +6929,10 @@ index 3bec0aef174336939838fb1069fffbcb9f3d5604..566ef3806be3c5ccf1bb951251c2a90d RefPtr SocketProvider::createWebSocketChannel(Document&, WebSocketChannelClient&) diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp -index 42a6851f39f9144777f528b398ce4ba648c00357..216770bcbd9453b0a4e2b6bdca52712ec90dae24 100644 +index 7abf8aca6022e547ca155a73370d43d2606858e5..1da53d6d90c879d9f5382bd5f69ec378b43291a8 100644 --- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp -@@ -281,6 +281,8 @@ bool ContentSecurityPolicy::protocolMatchesSelf(const URL& url) const +@@ -292,6 +292,8 @@ bool ContentSecurityPolicy::protocolMatchesSelf(const URL& url) const template typename std::enable_if::value, bool>::type ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposition, Predicate&& predicate, Args&&... args) const { @@ -6944,7 +6941,7 @@ index 42a6851f39f9144777f528b398ce4ba648c00357..216770bcbd9453b0a4e2b6bdca52712e bool isReportOnly = disposition == ContentSecurityPolicy::Disposition::ReportOnly; for (auto& policy : m_policies) { if (policy->isReportOnly() != isReportOnly) -@@ -294,6 +296,8 @@ typename std::enable_if bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposition, ViolatedDirectiveCallback&& callback, Predicate&& predicate, Args&&... args) const { @@ -6953,7 +6950,7 @@ index 42a6851f39f9144777f528b398ce4ba648c00357..216770bcbd9453b0a4e2b6bdca52712e bool isReportOnly = disposition == ContentSecurityPolicy::Disposition::ReportOnly; bool isAllowed = true; for (auto& policy : m_policies) { -@@ -310,6 +314,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit +@@ -321,6 +325,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit template bool ContentSecurityPolicy::allPoliciesAllow(ViolatedDirectiveCallback&& callback, Predicate&& predicate, Args&&... args) const { @@ -9013,10 +9010,10 @@ index 0000000000000000000000000000000000000000..cf2b51f6f02837a1106f4d999f2f130e + +} // namespace WebCore diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp -index 4672b1f0a9d4b10dab11e86d1fb9c35f0c785c33..f8c4784bd89a642aedfec09df9572ac299cc9a84 100644 +index d1d77014d1c8cf015863688ac7524c7a47c47915..6e02d5d071b00e3ec68d7f332b85b79d95d1c870 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp -@@ -2593,7 +2593,7 @@ LayoutRect RenderLayer::getRectToExpose(const LayoutRect& visibleRect, const Lay +@@ -2594,7 +2594,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(); @@ -9130,7 +9127,7 @@ index 73f3e891629e223449e47532dd1424735e3d4b0c..6395d6694b47aba393117ac228fac83c 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 746bdc6efa9892d658a8a8b1f7ec0b6d3e3a6c6e..96449986bab6d2feb8a3a7f4b62ab953e445d363 100644 +index 3610112a0e7e63644abac321508786e5b082fcc5..544455e553a63f98aa7b1b26e37ea08836d7bb8e 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -26,7 +26,6 @@ @@ -9141,8 +9138,8 @@ index 746bdc6efa9892d658a8a8b1f7ec0b6d3e3a6c6e..96449986bab6d2feb8a3a7f4b62ab953 #include "ArgumentCoders.h" #include "Attachment.h" #include "AuthenticationManager.h" -@@ -559,6 +558,59 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) - server->close(); +@@ -577,6 +576,59 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) + removeStorageManagerForSession(sessionID); } +void NetworkProcess::getAllCookies(PAL::SessionID sessionID, CompletionHandler&&)>&& completionHandler) @@ -9202,7 +9199,7 @@ index 746bdc6efa9892d658a8a8b1f7ec0b6d3e3a6c6e..96449986bab6d2feb8a3a7f4b62ab953 void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index e16f6dd4896cd4cd97b703b3da57a55228098422..68d08cbb29ac4e8065eb64e274c804f971974ffa 100644 +index caa4a2322a7d8715c1a43452fb3ea706283c6495..eba7baac6f5a34a302c99542cb614b7477d94471 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h @@ -35,6 +35,7 @@ @@ -9221,7 +9218,7 @@ index e16f6dd4896cd4cd97b703b3da57a55228098422..68d08cbb29ac4e8065eb64e274c804f9 class CurlProxySettings; class ProtectionSpace; class StorageQuotaManager; -@@ -211,6 +213,14 @@ public: +@@ -212,6 +214,14 @@ public: void addWebsiteDataStore(WebsiteDataStoreParameters&&); @@ -9237,7 +9234,7 @@ index e16f6dd4896cd4cd97b703b3da57a55228098422..68d08cbb29ac4e8065eb64e274c804f9 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 caeb8d9bb848c6900ae9555d0759f92d59bf2492..0bb689251d1ff7279b5963d2326c551560607780 100644 +index cf68804eef1e6f58571d1535a97c220c6a6fe624..c75e78a3fec87a39ca1bfcbc5bdf441e9c8deb44 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in @@ -76,6 +76,14 @@ messages -> NetworkProcess LegacyReceiver { @@ -9256,7 +9253,7 @@ index caeb8d9bb848c6900ae9555d0759f92d59bf2492..0bb689251d1ff7279b5963d2326c5515 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 a6dcd2a3ebcf16feaef538692029e0c8c461230b..5c1551f5edbfedbb8bac7bf412c6f7add08b8ff7 100644 +index 70a1b491b243aaefb3d27bdcad00a605e424f50f..2fee08c736b61ffe334077ea903b04664f3542e2 100644 --- a/Source/WebKit/NetworkProcess/NetworkSession.h +++ b/Source/WebKit/NetworkProcess/NetworkSession.h @@ -161,6 +161,9 @@ public: @@ -9269,7 +9266,7 @@ index a6dcd2a3ebcf16feaef538692029e0c8c461230b..5c1551f5edbfedbb8bac7bf412c6f7ad #if ENABLE(SERVICE_WORKER) void addSoftUpdateLoader(std::unique_ptr&& loader) { m_softUpdateLoaders.add(WTFMove(loader)); } void removeSoftUpdateLoader(ServiceWorkerSoftUpdateLoader* loader) { m_softUpdateLoaders.remove(loader); } -@@ -212,6 +215,7 @@ protected: +@@ -209,6 +212,7 @@ protected: #endif bool m_isStaleWhileRevalidateEnabled { false }; std::unique_ptr m_privateClickMeasurement; @@ -9484,10 +9481,10 @@ 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 4ebbd90cc645df5f9ddbb860d08aa3eb053c2ff6..3d5d56a5a1b407f27e533c9c71d3e4c4fb012c36 100644 +index 938bf8f8fe4ced1ec80233bc9b9adc9d2a3c2243..abc0ba2065f7a2143443918af05a2a65e5eba7e3 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h -@@ -86,6 +86,8 @@ public: +@@ -88,6 +88,8 @@ public: void checkTAO(const WebCore::ResourceResponse&); @@ -9497,7 +9494,7 @@ index 4ebbd90cc645df5f9ddbb860d08aa3eb053c2ff6..3d5d56a5a1b407f27e533c9c71d3e4c4 NetworkDataTaskCocoa(NetworkSession&, NetworkDataTaskClient&, const NetworkLoadParameters&); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm -index 6870851925288571bd6c763b3e60313d9260e98c..a7462761a3d6ce0a2a74d84b80f3db297c2cd77a 100644 +index 4e34f5eecc8837853269014cc4a6f9e2ea2bec51..b7bd17cd49b90b66146243314c6053b1623f340f 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm @@ -42,6 +42,7 @@ @@ -9508,7 +9505,7 @@ index 6870851925288571bd6c763b3e60313d9260e98c..a7462761a3d6ce0a2a74d84b80f3db29 #import #import #import -@@ -743,4 +744,59 @@ void NetworkDataTaskCocoa::checkTAO(const WebCore::ResourceResponse& response) +@@ -745,4 +746,59 @@ void NetworkDataTaskCocoa::checkTAO(const WebCore::ResourceResponse& response) networkLoadMetrics().failsTAOCheck = !passesTimingAllowOriginCheck(response, *origin); } @@ -10692,10 +10689,10 @@ index 85d6f74114f4e7f82d9502d1b99d69098d6a49b6..6896c9756edb233dda46c7031e1af699 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index 7dbacd18c0c218f28d8cd44050278e4898df1c5c..963ee97eca9e9c243218042351054df285d17e16 100644 +index e190b9d0440fae8e0117560ba22f0bc0e5eb06be..e48ec574a627cae3b9f2759012ba947abd3bc5da 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -298,11 +298,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -302,11 +302,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -10710,7 +10707,7 @@ index 7dbacd18c0c218f28d8cd44050278e4898df1c5c..963ee97eca9e9c243218042351054df2 UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -311,6 +314,7 @@ UIProcess/PageLoadState.cpp +@@ -315,6 +318,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -10718,7 +10715,7 @@ index 7dbacd18c0c218f28d8cd44050278e4898df1c5c..963ee97eca9e9c243218042351054df2 UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -351,6 +355,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -355,6 +359,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -10727,7 +10724,7 @@ index 7dbacd18c0c218f28d8cd44050278e4898df1c5c..963ee97eca9e9c243218042351054df2 UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPreferences.cpp -@@ -472,7 +478,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -476,7 +482,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -10740,10 +10737,10 @@ index 7dbacd18c0c218f28d8cd44050278e4898df1c5c..963ee97eca9e9c243218042351054df2 UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 78fb4241223b03275a966d9f75ac00fca49a7f6d..8f1651bbf29c1039b58a8a672fa113996ae72bbf 100644 +index 8913834f6bb5f939e720b09efcb02c9544f84aaa..b880e1c45d02a8df2f775ec0915901765ec28ce3 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -268,6 +268,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm +@@ -270,6 +270,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -10751,7 +10748,7 @@ index 78fb4241223b03275a966d9f75ac00fca49a7f6d..8f1651bbf29c1039b58a8a672fa11399 UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -440,6 +441,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -442,6 +443,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -11058,7 +11055,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 91bc6fbf505c4c4d2c5b4425ea034da6823e9283..f585372e1658f342ae79f946fbe224a0b7af73e4 100644 +index 32530ef3c02444979afc268ddd0a911b7b8cc187..f83129f73d37712df73eaebef02e864423eab4c1 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm @@ -42,6 +42,7 @@ @@ -12877,7 +12874,7 @@ index b23a45ff7d313317d8ba64fb430ebba3b6adef71..8419b69c5e278cf88a3ab6b98c335edd } // namespace WebKit diff --git a/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp b/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp -index cfbe7628c28c9f8f42583ad97197695e05664595..8d9c8a955eeaf161bb274f9961fdf450a16c713a 100644 +index 78967b6e2fbe893af99544726658113bd4df300d..363fdee5eb314181f86b57c82fd159fc04707261 100644 --- a/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp +++ b/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp @@ -42,8 +42,10 @@ @@ -12957,10 +12954,10 @@ index cfbe7628c28c9f8f42583ad97197695e05664595..8d9c8a955eeaf161bb274f9961fdf450 // This can cause the DownloadProxy object to be deleted. m_downloadProxyMap.downloadFinished(*this); diff --git a/Source/WebKit/UIProcess/Downloads/DownloadProxy.h b/Source/WebKit/UIProcess/Downloads/DownloadProxy.h -index 4b9e12c40517fb84cb23d2de3e2adaa66c69da59..f56879a5a799115ef7353c060b00b842b8702408 100644 +index e87f14a1772973db924624671dd40fe919904a5e..711335158c64e743a17e31c082a402eb0be9ac23 100644 --- a/Source/WebKit/UIProcess/Downloads/DownloadProxy.h +++ b/Source/WebKit/UIProcess/Downloads/DownloadProxy.h -@@ -146,6 +146,7 @@ private: +@@ -147,6 +147,7 @@ private: #if PLATFORM(COCOA) RetainPtr m_progress; #endif @@ -13290,10 +13287,10 @@ index 0000000000000000000000000000000000000000..4ec8b96bbbddf8a7b042f53a8068754a +cairo_status_t cairo_image_surface_write_to_jpeg_mem(cairo_surface_t *sfc, unsigned char **data, size_t *len, int quality); diff --git a/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..d21fcb26de43987507c90de9a3a68ea84979aacb +index 0000000000000000000000000000000000000000..20122bd89c3ba0ec4ff878ac895bddd497cc9789 --- /dev/null +++ b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp -@@ -0,0 +1,272 @@ +@@ -0,0 +1,269 @@ +/* + * Copyright (C) 2020 Microsoft Corporation. + * @@ -13383,14 +13380,8 @@ index 0000000000000000000000000000000000000000..d21fcb26de43987507c90de9a3a68ea8 +#if USE(CAIRO) +void InspectorScreencastAgent::didPaint(cairo_surface_t* surface) +{ -+ if (m_encoder) { -+ auto drawingAreaSize = m_page.drawingArea()->size(); -+#if PLATFORM(WPE) -+ double dsf = m_page.deviceScaleFactor(); -+ drawingAreaSize.scale(dsf); -+#endif -+ m_encoder->encodeFrame(surface, drawingAreaSize); -+ } ++ if (m_encoder) ++ m_encoder->encodeFrame(surface, m_page.drawingArea()->size()); + if (m_screencast) { + if (m_screencastFramesInFlight > kMaxFramesInFlight) + return; @@ -13420,7 +13411,7 @@ index 0000000000000000000000000000000000000000..d21fcb26de43987507c90de9a3a68ea8 +} +#endif + -+Inspector::Protocol::ErrorStringOr InspectorScreencastAgent::startVideo(const String& file, int width, int height, int toolbarHeight) ++Inspector::Protocol::ErrorStringOr InspectorScreencastAgent::startVideo(const String& file, int width, int height, int toolbarHeight, std::optional&& scale) +{ + if (m_encoder) + return makeUnexpected("Already recording"_s); @@ -13428,8 +13419,11 @@ index 0000000000000000000000000000000000000000..d21fcb26de43987507c90de9a3a68ea8 + if (width < 10 || width > 10000 || height < 10 || height > 10000) + return makeUnexpected("Invalid size"_s); + ++ if (scale && (*scale <= 0 || *scale > 1)) ++ return makeUnexpected("Unsupported scale"_s); ++ + String errorString; -+ m_encoder = ScreencastEncoder::create(errorString, file, WebCore::IntSize(width, height)); ++ m_encoder = ScreencastEncoder::create(errorString, file, WebCore::IntSize(width, height), WTFMove(scale)); + if (!m_encoder) + return makeUnexpected(errorString); + @@ -13568,7 +13562,7 @@ index 0000000000000000000000000000000000000000..d21fcb26de43987507c90de9a3a68ea8 +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h new file mode 100644 -index 0000000000000000000000000000000000000000..06e0a3098669ab015c979f4fe8ca37a59c3e3ba6 +index 0000000000000000000000000000000000000000..8f2795dbf1323dd8d5f986f18e6fe16431dd7f70 --- /dev/null +++ b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h @@ -0,0 +1,96 @@ @@ -13637,7 +13631,7 @@ index 0000000000000000000000000000000000000000..06e0a3098669ab015c979f4fe8ca37a5 + void didPaint(cairo_surface_t*); +#endif + -+ Inspector::Protocol::ErrorStringOr startVideo(const String& file, int width, int height, int toolbarHeight) override; ++ Inspector::Protocol::ErrorStringOr startVideo(const String& file, int width, int height, int toolbarHeight, std::optional&& scale) override; + void stopVideo(Ref&&) override; + + Inspector::Protocol::ErrorStringOr startScreencast(int width, int height, int toolbarHeight, int quality) override; @@ -13670,10 +13664,10 @@ index 0000000000000000000000000000000000000000..06e0a3098669ab015c979f4fe8ca37a5 +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..738f7774e05bdccb50d1c332cc42b5c4085c56af +index 0000000000000000000000000000000000000000..62f20814b72e90275eb4fa0e8302fc15abdaaab2 --- /dev/null +++ b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp -@@ -0,0 +1,387 @@ +@@ -0,0 +1,393 @@ +/* + * Copyright (c) 2010, The WebM Project authors. All rights reserved. + * Copyright (c) 2013 The Chromium Authors. All rights reserved. @@ -13796,8 +13790,9 @@ index 0000000000000000000000000000000000000000..738f7774e05bdccb50d1c332cc42b5c4 + : m_surface(WTFMove(surface)) + { } +#elif PLATFORM(MAC) -+ VPXFrame(RetainPtr windowImage, int offsetTop) ++ VPXFrame(RetainPtr windowImage, std::optional scale, int offsetTop) + : m_windowImage(WTFMove(windowImage)) ++ , m_scale(scale) + , m_offsetTop(offsetTop) + { } +#endif @@ -13815,7 +13810,7 @@ index 0000000000000000000000000000000000000000..738f7774e05bdccb50d1c332cc42b5c4 + int argb_stride = image->w * 4; + UniqueArray buffer = makeUniqueArray(argb_stride * image->h); + uint8_t* argb_data = buffer.get(); -+ ScreencastEncoder::imageToARGB(m_windowImage.get(), argb_data, image->w, image->h, m_offsetTop); ++ ScreencastEncoder::imageToARGB(m_windowImage.get(), argb_data, image->w, image->h, m_scale, m_offsetTop); +#endif + const int y_stride = image->stride[0]; + ASSERT(image->stride[1] == image->stride[2]); @@ -13837,6 +13832,7 @@ index 0000000000000000000000000000000000000000..738f7774e05bdccb50d1c332cc42b5c4 + RefPtr m_surface; +#elif PLATFORM(MAC) + RetainPtr m_windowImage; ++ std::optional m_scale; + int m_offsetTop { 0 }; +#endif + Seconds m_duration; @@ -13929,9 +13925,10 @@ index 0000000000000000000000000000000000000000..738f7774e05bdccb50d1c332cc42b5c4 + std::unique_ptr m_image; +}; + -+ScreencastEncoder::ScreencastEncoder(std::unique_ptr&& vpxCodec, IntSize size) ++ScreencastEncoder::ScreencastEncoder(std::unique_ptr&& vpxCodec, IntSize size, std::optional scale) + : m_vpxCodec(WTFMove(vpxCodec)) + , m_size(size) ++ , m_scale(scale) +{ + ASSERT(!size.isZero()); +} @@ -13940,7 +13937,7 @@ index 0000000000000000000000000000000000000000..738f7774e05bdccb50d1c332cc42b5c4 +{ +} + -+RefPtr ScreencastEncoder::create(String& errorString, const String& filePath, IntSize size) ++RefPtr ScreencastEncoder::create(String& errorString, const String& filePath, IntSize size, std::optional scale) +{ + vpx_codec_iface_t* codec_interface = vpx_codec_vp8_cx(); + if (!codec_interface) { @@ -13981,7 +13978,7 @@ index 0000000000000000000000000000000000000000..738f7774e05bdccb50d1c332cc42b5c4 + + std::unique_ptr vpxCodec(new VPXCodec(codec, cfg, file)); + // fprintf(stderr, "ScreencastEncoder initialized with: %s\n", vpx_codec_iface_name(codec_interface)); -+ return adoptRef(new ScreencastEncoder(WTFMove(vpxCodec), size)); ++ return adoptRef(new ScreencastEncoder(WTFMove(vpxCodec), size, scale)); +} + +void ScreencastEncoder::flushLastFrame() @@ -14018,7 +14015,10 @@ index 0000000000000000000000000000000000000000..738f7774e05bdccb50d1c332cc42b5c4 + + // TODO: compare to libyuv scale functions? + cairo_matrix_t transform; -+ if (size.width() > m_size.width() || size.height() > m_size.height()) { ++ if (m_scale) { ++ cairo_matrix_init_scale(&transform, *m_scale, *m_scale); ++ cairo_transform(cr.get(), &transform); ++ } else if (size.width() > m_size.width() || size.height() > m_size.height()) { + // If no scale is specified shrink to fit the frame. + double scale = std::min(static_cast(m_size.width()) / size.width(), + static_cast(m_size.height()) / size.height()); @@ -14040,7 +14040,7 @@ index 0000000000000000000000000000000000000000..738f7774e05bdccb50d1c332cc42b5c4 + // fprintf(stderr, "ScreencastEncoder::encodeFrame\n"); + flushLastFrame(); + -+ m_lastFrame = makeUnique(WTFMove(windowImage), m_offsetTop); ++ m_lastFrame = makeUnique(WTFMove(windowImage), m_scale, m_offsetTop); +} +#endif + @@ -14063,10 +14063,10 @@ index 0000000000000000000000000000000000000000..738f7774e05bdccb50d1c332cc42b5c4 +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.h b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.h new file mode 100644 -index 0000000000000000000000000000000000000000..36df6131950ca95f74dc191628376fc589dbcb33 +index 0000000000000000000000000000000000000000..1683da93db6b9088c3a472472c1b71477b47a7fd --- /dev/null +++ b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.h -@@ -0,0 +1,80 @@ +@@ -0,0 +1,81 @@ +/* + * Copyright (C) 2020 Microsoft Corporation. + * @@ -14115,10 +14115,10 @@ index 0000000000000000000000000000000000000000..36df6131950ca95f74dc191628376fc5 +public: + static constexpr int fps = 25; + -+ static RefPtr create(String& errorString, const String& filePath, WebCore::IntSize); ++ static RefPtr create(String& errorString, const String& filePath, WebCore::IntSize, std::optional scale); + + class VPXCodec; -+ ScreencastEncoder(std::unique_ptr&&, WebCore::IntSize); ++ ScreencastEncoder(std::unique_ptr&&, WebCore::IntSize, std::optional scale); + ~ScreencastEncoder(); + +#if USE(CAIRO) @@ -14133,11 +14133,12 @@ index 0000000000000000000000000000000000000000..36df6131950ca95f74dc191628376fc5 +private: + void flushLastFrame(); +#if PLATFORM(MAC) -+ static void imageToARGB(CGImageRef, uint8_t* rgba_data, int width, int height, int offsetTop); ++ static void imageToARGB(CGImageRef, uint8_t* rgba_data, int width, int height, std::optional scale, int offsetTop); +#endif + + std::unique_ptr m_vpxCodec; + const WebCore::IntSize m_size; ++ std::optional m_scale; + MonotonicTime m_lastFrameTimestamp; + class VPXFrame; + std::unique_ptr m_lastFrame; @@ -14854,10 +14855,10 @@ index 8c1339345d451874502b271f6aa2eca3fa0d3faf..1f8f5e74c86b61c1c5a16ac33d48afdd } // namespace WebKit diff --git a/Source/WebKit/UIProcess/Inspector/mac/ScreencastEncoderMac.mm b/Source/WebKit/UIProcess/Inspector/mac/ScreencastEncoderMac.mm new file mode 100644 -index 0000000000000000000000000000000000000000..09685defdfaf5abea8404fc3feb22ac3008073df +index 0000000000000000000000000000000000000000..66d1c743de1cb35e29d6fc9b69379d265a59961f --- /dev/null +++ b/Source/WebKit/UIProcess/Inspector/mac/ScreencastEncoderMac.mm -@@ -0,0 +1,56 @@ +@@ -0,0 +1,58 @@ +/* + * Copyright (C) 2020 Microsoft Corporation. + * @@ -14892,7 +14893,7 @@ index 0000000000000000000000000000000000000000..09685defdfaf5abea8404fc3feb22ac3 + +namespace WebKit { + -+void ScreencastEncoder::imageToARGB(CGImageRef image, uint8_t* argb_data, int width, int height, int offsetTop) ++void ScreencastEncoder::imageToARGB(CGImageRef image, uint8_t* argb_data, int width, int height, std::optional scale, int offsetTop) +{ + size_t bitsPerComponent = 8; + size_t bytesPerPixel = 4; @@ -14904,7 +14905,9 @@ index 0000000000000000000000000000000000000000..09685defdfaf5abea8404fc3feb22ac3 + // TODO: exclude controls from original screenshot + double pageHeight = imageHeight - offsetTop; + double ratio = 1; -+ if (imageWidth > width || pageHeight > height) { ++ if (scale) { ++ ratio = *scale; ++ } else if (imageWidth > width || pageHeight > height) { + ratio = std::min(width / imageWidth, height / pageHeight); + } + imageWidth *= ratio; @@ -16341,10 +16344,10 @@ index fbe3bda4965084b1a1ef41c1b9a4f4569305d53b..e68cb6cdc25fc286674a93bb1356e9ea virtual RefPtr takeViewSnapshot(std::optional&&) = 0; #endif diff --git a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp -index 3dbabb1c713ab982610aacb86877141577ef8c7d..e3f10c3666d3bbadc29817b1e31a1b2b6b7aeffc 100644 +index f65b8a487c2e6c01cb309a3cd850a5c3e33cb6f0..8a99a0d9349216bbc1aa5b2ba7376a5c6a7f8a2e 100644 --- a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp +++ b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp -@@ -619,3 +619,5 @@ bool ProvisionalPageProxy::sendMessage(UniqueRef&& encoder, Option +@@ -622,3 +622,5 @@ bool ProvisionalPageProxy::sendMessage(UniqueRef&& encoder, Option } } // namespace WebKit @@ -17372,7 +17375,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index c33cfe44d61228d804e4325259ee135c2d797937..e255985087bdf01ad7f7f72bff97c3a9205b0322 100644 +index 2fe93a59156e8b0e6987c08855d3d0ad329c8065..123a4bc576204c4dfd6e3ee192cc50c403fea552 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -246,6 +246,9 @@ @@ -17700,7 +17703,7 @@ index c33cfe44d61228d804e4325259ee135c2d797937..e255985087bdf01ad7f7f72bff97c3a9 + m_inspectorController->didFailProvisionalLoadForFrame(navigationID, error); + // If the provisional page's load fails then we destroy the provisional page. - if (m_provisionalPage && m_provisionalPage->mainFrame() == frame && willContinueLoading == WillContinueLoading::No) + if (m_provisionalPage && m_provisionalPage->mainFrame() == &frame && willContinueLoading == WillContinueLoading::No) m_provisionalPage = nullptr; @@ -5287,7 +5442,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, NavigationActionData&& navigationActionData, FrameInfoData&& originatingFrameInfo, std::optional originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&& request, @@ -17892,7 +17895,7 @@ index c33cfe44d61228d804e4325259ee135c2d797937..e255985087bdf01ad7f7f72bff97c3a9 // 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 e2b9d1b63ada262e05dd17d2953492aac997a7f3..6798882aadabc33467772f710fa0404620a62541 100644 +index 54fad223d1a388e9c0d4a67a454aa3ff5c0dc80d..8d330bdd2a4e85e3b1cd06f42103d88510c725b0 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17975,7 +17978,7 @@ index e2b9d1b63ada262e05dd17d2953492aac997a7f3..6798882aadabc33467772f710fa04046 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); -@@ -1155,6 +1175,7 @@ public: +@@ -1154,6 +1174,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -17983,7 +17986,7 @@ index e2b9d1b63ada262e05dd17d2953492aac997a7f3..6798882aadabc33467772f710fa04046 void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1229,14 +1250,20 @@ public: +@@ -1228,14 +1249,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -18005,7 +18008,7 @@ index e2b9d1b63ada262e05dd17d2953492aac997a7f3..6798882aadabc33467772f710fa04046 #endif void processDidBecomeUnresponsive(); -@@ -1480,6 +1507,8 @@ public: +@@ -1479,6 +1506,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -18014,7 +18017,7 @@ index e2b9d1b63ada262e05dd17d2953492aac997a7f3..6798882aadabc33467772f710fa04046 #endif #if ENABLE(WEB_CRYPTO) -@@ -2591,6 +2620,7 @@ private: +@@ -2590,6 +2619,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -18022,7 +18025,7 @@ index e2b9d1b63ada262e05dd17d2953492aac997a7f3..6798882aadabc33467772f710fa04046 #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2845,6 +2875,20 @@ private: +@@ -2844,6 +2874,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -18043,7 +18046,7 @@ index e2b9d1b63ada262e05dd17d2953492aac997a7f3..6798882aadabc33467772f710fa04046 #endif PageLoadState m_pageLoadState; -@@ -3058,6 +3102,9 @@ private: +@@ -3057,6 +3101,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -18089,7 +18092,7 @@ index fc55e7659a8920980fd42129ac3f0dac75bbb913..1a7dcc20a04263cbb8951c3236d343f7 DidPerformDragOperation(bool handled) #endif diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index fca9de6107ebf7cf5fa15bb65c44b3bd4a665edd..27ee4e7a596e97454f7f742331bf2da8e7ebc465 100644 +index 9f2bb74bf4a191b5a5ec0b0f6298d2b0ceb00ee4..942ca37acc24615d1ffdb35c69b7a429e434149c 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp @@ -512,6 +512,14 @@ void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkPro @@ -18151,10 +18154,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 f941b01ebfeb7fabcf110a915313c6e288285b62..01dd5877155a2ab12fbc69577fea068329443e89 100644 +index 4978cccb4cba615ded690828603349ddd441b49c..2d24e37b1b9223dbf03376c6498ebe9cf6f9c5a3 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -2190,6 +2190,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O +@@ -2197,6 +2197,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O networkProcess().renameOriginInWebsiteData(m_sessionID, oldName, newName, dataTypes, WTFMove(completionHandler)); } @@ -18173,7 +18176,7 @@ index f941b01ebfeb7fabcf110a915313c6e288285b62..01dd5877155a2ab12fbc69577fea0683 void WebsiteDataStore::hasAppBoundSession(CompletionHandler&& completionHandler) const { diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -index fdbcb5a5068537d4f90f09c53be2379bbfbcfeb5..c823e3ded745ebff50cdfed44f578b83d8d360a4 100644 +index f2f5886fee16ca72d350a2f3d6e7ca0cc2a8201c..e4a45e3016c30cb45680b5e8b96320cbe2c03273 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h @@ -86,6 +86,7 @@ class DeviceIdHashSaltStorage; @@ -18209,7 +18212,7 @@ index fdbcb5a5068537d4f90f09c53be2379bbfbcfeb5..c823e3ded745ebff50cdfed44f578b83 class WebsiteDataStore : public API::ObjectImpl, public Identified, public CanMakeWeakPtr { public: static Ref defaultDataStore(); -@@ -286,11 +298,13 @@ public: +@@ -288,11 +300,13 @@ public: const WebCore::CurlProxySettings& networkProxySettings() const { return m_proxySettings; } #endif @@ -18224,7 +18227,7 @@ index fdbcb5a5068537d4f90f09c53be2379bbfbcfeb5..c823e3ded745ebff50cdfed44f578b83 void setNetworkProxySettings(WebCore::SoupNetworkProxySettings&&); const WebCore::SoupNetworkProxySettings& networkProxySettings() const { return m_networkProxySettings; } void setCookiePersistentStorage(const String&, SoupCookiePersistentStorageType); -@@ -348,6 +362,14 @@ public: +@@ -351,6 +365,14 @@ public: static WTF::String defaultJavaScriptConfigurationDirectory(); static bool http3Enabled(); @@ -18239,7 +18242,7 @@ index fdbcb5a5068537d4f90f09c53be2379bbfbcfeb5..c823e3ded745ebff50cdfed44f578b83 void resetQuota(CompletionHandler&&); #if ENABLE(APP_BOUND_DOMAINS) -@@ -434,9 +456,11 @@ private: +@@ -437,9 +459,11 @@ private: WebCore::CurlProxySettings m_proxySettings; #endif @@ -18252,7 +18255,7 @@ index fdbcb5a5068537d4f90f09c53be2379bbfbcfeb5..c823e3ded745ebff50cdfed44f578b83 WebCore::SoupNetworkProxySettings m_networkProxySettings; String m_cookiePersistentStoragePath; SoupCookiePersistentStorageType m_cookiePersistentStorageType { SoupCookiePersistentStorageType::SQLite }; -@@ -464,6 +488,11 @@ private: +@@ -467,6 +491,11 @@ private: RefPtr m_cookieStore; RefPtr m_networkProcess; @@ -20209,10 +20212,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46f4046fda 100644 +index b3eec63ab130fe53761b8f333213168674e46154..3811631b1020bafebf4aeef5407bca0b96de01c2 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1961,6 +1961,18 @@ +@@ -1967,6 +1967,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 */; }; @@ -20231,7 +20234,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 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 */; }; -@@ -2017,6 +2029,9 @@ +@@ -2023,6 +2035,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, ); }; }; @@ -20241,7 +20244,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 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, ); }; }; -@@ -5890,6 +5905,19 @@ +@@ -5909,6 +5924,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 = ""; }; @@ -20261,7 +20264,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 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 = ""; }; -@@ -6008,6 +6036,14 @@ +@@ -6027,6 +6055,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 = ""; }; @@ -20276,7 +20279,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 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 = ""; }; -@@ -6124,6 +6160,7 @@ +@@ -6143,6 +6179,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -20284,7 +20287,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -8034,6 +8071,7 @@ +@@ -8053,6 +8090,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -20292,7 +20295,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -9103,6 +9141,7 @@ +@@ -9119,6 +9157,7 @@ isa = PBXGroup; children = ( 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -20300,7 +20303,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, ); -@@ -9548,6 +9587,12 @@ +@@ -9580,6 +9619,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -20313,7 +20316,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 ); path = Agents; sourceTree = ""; -@@ -9556,6 +9601,7 @@ +@@ -9588,6 +9633,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -20321,7 +20324,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -10062,6 +10108,12 @@ +@@ -10099,6 +10145,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -20334,7 +20337,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -10363,6 +10415,7 @@ +@@ -10400,6 +10452,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -20342,7 +20345,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -10957,6 +11010,11 @@ +@@ -10994,6 +11047,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -20354,7 +20357,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, C1817362205844A900DFDA65 /* DisplayLink.cpp */, -@@ -11807,6 +11865,7 @@ +@@ -11847,6 +11905,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -20362,7 +20365,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -12105,6 +12164,7 @@ +@@ -12145,6 +12204,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -20370,7 +20373,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -12120,6 +12180,7 @@ +@@ -12160,6 +12220,7 @@ 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, F40BBB41257FF46E0067463A /* GPUProcessWakeupMessageArguments.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -20378,15 +20381,15 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -12267,6 +12328,7 @@ +@@ -12307,6 +12368,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, + D71A94422371F67E002C4D9E /* WebPageInspectorEmulationAgent.h in Headers */, 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, - 5183247C26168C62003F239E /* NetworkURLSchemeHandler.h in Headers */, -@@ -12355,6 +12417,7 @@ + 93085DE026E5BCFD000EC6A7 /* NetworkStorageManager.h in Headers */, +@@ -12397,6 +12459,7 @@ BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -20394,7 +20397,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */, -@@ -12376,6 +12439,7 @@ +@@ -12418,6 +12481,7 @@ CDAC20B423FB58F20021DEE3 /* RemoteCDMInstanceProxy.h in Headers */, CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, @@ -20402,7 +20405,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -12694,6 +12758,7 @@ +@@ -12736,6 +12800,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -20410,7 +20413,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -12824,6 +12889,7 @@ +@@ -12868,6 +12933,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -20418,7 +20421,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -12877,6 +12943,7 @@ +@@ -12921,6 +12987,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -20426,7 +20429,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -13033,6 +13100,7 @@ +@@ -13077,6 +13144,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -20434,7 +20437,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -14262,6 +14330,7 @@ +@@ -14306,6 +14374,7 @@ C1A152D724E5A29A00978C8B /* HandleXPCEndpointMessages.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -20442,7 +20445,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 9BF5EC642541145600984E77 /* JSIPCBinding.cpp in Sources */, 2D913441212CF9F000128AFD /* JSNPMethod.cpp in Sources */, 2D913442212CF9F000128AFD /* JSNPObject.cpp in Sources */, -@@ -14281,6 +14350,7 @@ +@@ -14325,6 +14394,7 @@ 2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */, 2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */, 2D92A77A212B6A6100F493FD /* Module.cpp in Sources */, @@ -20450,7 +20453,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 57B826452304F14000B72EB0 /* NearFieldSoftLink.mm in Sources */, 2D913443212CF9F000128AFD /* NetscapeBrowserFuncs.cpp in Sources */, 2D913444212CF9F000128AFD /* NetscapePlugin.cpp in Sources */, -@@ -14305,6 +14375,7 @@ +@@ -14351,6 +14421,7 @@ 1A2D8439127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp in Sources */, 2D92A792212B6AD400F493FD /* NPObjectProxy.cpp in Sources */, 2D92A793212B6AD400F493FD /* NPRemoteObjectMap.cpp in Sources */, @@ -20458,7 +20461,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 2D913447212CF9F000128AFD /* NPRuntimeObjectMap.cpp in Sources */, 2D913448212CF9F000128AFD /* NPRuntimeUtilities.cpp in Sources */, 2D92A794212B6AD400F493FD /* NPVariantData.cpp in Sources */, -@@ -14610,6 +14681,7 @@ +@@ -14656,6 +14727,7 @@ 2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -20467,7 +20470,7 @@ index 9e416ef37444e42ebe68c0e10024bcecffb27f88..79e943a03ef371eb5613f26b71b54d46 BCBD3914125BB1A800D2C29F /* WebPageProxyMessageReceiver.cpp in Sources */, 7CE9CE101FA0767A000177DE /* WebPageUpdatePreferences.cpp in Sources */, diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp -index 5dfdbefeea2e64ceb240f65747d8ec459d05ff64..5d18cb914831924ae1f52361b60b18007f17bb33 100644 +index 35253106cb1d301339c2b30e8602f6bf24a3e72b..033529d62fc43220a324b57200bd35aef636a1fa 100644 --- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp +++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp @@ -231,6 +231,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou @@ -20580,7 +20583,7 @@ index 5dfdbefeea2e64ceb240f65747d8ec459d05ff64..5d18cb914831924ae1f52361b60b1800 { WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::SetCaptureExtraNetworkLoadMetricsEnabled(enabled), 0); diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h -index 24b69379017d5439bbb1e1b3d1a95c8b792360ef..1a8d4184766935968d373c4abe878aa5589a1d89 100644 +index c796ae50f14c16ec25e6e0149d766bf7d11e187b..bc99214f8f4170e0c8db001ee543ce7b38e0f55a 100644 --- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h +++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h @@ -41,6 +41,7 @@ struct FetchOptions; @@ -20602,7 +20605,7 @@ index 24b69379017d5439bbb1e1b3d1a95c8b792360ef..1a8d4184766935968d373c4abe878aa5 void setExistingNetworkResourceLoadIdentifierToResume(std::optional existingNetworkResourceLoadIdentifierToResume) { m_existingNetworkResourceLoadIdentifierToResume = existingNetworkResourceLoadIdentifierToResume; } -@@ -138,6 +141,7 @@ private: +@@ -140,6 +143,7 @@ private: Vector> m_onlineStateChangeListeners; std::optional m_existingNetworkResourceLoadIdentifierToResume; bool m_isOnLine { true }; @@ -20672,7 +20675,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 6180d85650ace122547fbcc5f9982e8eef60a9b3..3b8149d781fe0cac51665f938117481e0fb265cb 100644 +index 7d34ee19e017c96052e0ef7a693a829cb314f5cc..8300b3d561232554fc6c2ffa4732c5e28fbd2cfe 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp @@ -398,6 +398,8 @@ void WebChromeClient::setResizable(bool resizable) @@ -20726,7 +20729,7 @@ index 2eb0886f13ed035a53b8eaa60605de4dfe53fbe3..c46393209cb4f80704bbc9268fad4371 { } diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -index d729bacb589076acbb201b928b72a61b5ebf1b57..bf52bcd453849531f5503d86ed2ee3751d118211 100644 +index cd3e71a26427cb5243b0678ede4306f8cbc7b159..6e0b8a7e8aeca0fbce5aa036ad9ee0114443792e 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp @@ -1575,13 +1575,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() @@ -20885,7 +20888,7 @@ index 0000000000000000000000000000000000000000..9b413bb8150a1633d29b6e2606127c9c + +#endif // ENABLE(DRAG_SUPPORT) diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp -index ac01f19fc24d5486c8af55c0d442576cb6add438..d16f0f9347d78163f837e5e838b35939ac8e5a3c 100644 +index 33ac2e1d763105b82442ab34f5bc35406407bd89..b53ee311909fe125421b875b0ffe035c8bf8bf47 100644 --- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp +++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp @@ -38,6 +38,7 @@ @@ -20913,7 +20916,7 @@ index ac01f19fc24d5486c8af55c0d442576cb6add438..d16f0f9347d78163f837e5e838b35939 m_layerTreeHost->scrollNonCompositedContents(scrollRect); return; } -@@ -254,6 +265,7 @@ void DrawingAreaCoordinatedGraphics::updatePreferences(const WebPreferencesStore +@@ -256,6 +267,7 @@ void DrawingAreaCoordinatedGraphics::updatePreferences(const WebPreferencesStore settings.setAcceleratedCompositingEnabled(false); } #endif @@ -20921,7 +20924,7 @@ index ac01f19fc24d5486c8af55c0d442576cb6add438..d16f0f9347d78163f837e5e838b35939 settings.setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey())); // Fixed position elements need to be composited and create stacking contexts // in order to be scrolled by the ScrollingCoordinator. -@@ -667,6 +679,11 @@ void DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode(GraphicsLay +@@ -669,6 +681,11 @@ void DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode(GraphicsLay m_scrollOffset = IntSize(); m_displayTimer.stop(); m_isWaitingForDidUpdate = false; @@ -20933,7 +20936,7 @@ index ac01f19fc24d5486c8af55c0d442576cb6add438..d16f0f9347d78163f837e5e838b35939 } void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode() -@@ -716,6 +733,11 @@ void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode() +@@ -718,6 +735,11 @@ void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode() // UI process, we still need to let it know about the new contents, so send an Update message. send(Messages::DrawingAreaProxy::Update(m_backingStoreStateID, updateInfo)); } @@ -21130,10 +21133,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 7e00688615eefcdda04eb9e42de6a5219370b6d3..55f9ef4c6418b95b5c5c95452616808174115025 100644 +index b96754a02dec9467dc06b10cf9c4e9f133ffb746..eb0a5f341d63a9b37834a2fb8383f874bd9fc785 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -@@ -888,6 +888,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) +@@ -890,6 +890,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) m_page->setCanUseCredentialStorage(parameters.canUseCredentialStorage); @@ -21143,7 +21146,7 @@ index 7e00688615eefcdda04eb9e42de6a5219370b6d3..55f9ef4c6418b95b5c5c954526168081 updateThrottleState(); } -@@ -1684,6 +1687,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet +@@ -1679,6 +1682,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet } #endif @@ -21166,7 +21169,7 @@ index 7e00688615eefcdda04eb9e42de6a5219370b6d3..55f9ef4c6418b95b5c5c954526168081 void WebPage::loadRequest(LoadParameters&& loadParameters) { setLastNavigationWasAppInitiated(loadParameters.request.isAppInitiated()); -@@ -1929,17 +1948,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1924,17 +1943,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -21185,7 +21188,7 @@ index 7e00688615eefcdda04eb9e42de6a5219370b6d3..55f9ef4c6418b95b5c5c954526168081 // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -1956,20 +1971,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1951,20 +1966,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -21213,7 +21216,7 @@ index 7e00688615eefcdda04eb9e42de6a5219370b6d3..55f9ef4c6418b95b5c5c954526168081 #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -1977,7 +1990,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1972,7 +1985,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -21221,7 +21224,7 @@ index 7e00688615eefcdda04eb9e42de6a5219370b6d3..55f9ef4c6418b95b5c5c954526168081 void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2272,6 +2284,7 @@ void WebPage::scaleView(double scale) +@@ -2267,6 +2279,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -21229,7 +21232,7 @@ index 7e00688615eefcdda04eb9e42de6a5219370b6d3..55f9ef4c6418b95b5c5c954526168081 scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2376,17 +2389,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2371,17 +2384,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -21248,7 +21251,7 @@ index 7e00688615eefcdda04eb9e42de6a5219370b6d3..55f9ef4c6418b95b5c5c954526168081 } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3268,6 +3277,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3263,6 +3272,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -21353,7 +21356,7 @@ index 7e00688615eefcdda04eb9e42de6a5219370b6d3..55f9ef4c6418b95b5c5c954526168081 #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3344,6 +3451,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3339,6 +3446,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -21365,7 +21368,7 @@ index 7e00688615eefcdda04eb9e42de6a5219370b6d3..55f9ef4c6418b95b5c5c954526168081 void WebPage::insertNewlineInQuotedContent() { Frame& frame = m_page->focusController().focusedOrMainFrame(); -@@ -3581,6 +3693,7 @@ void WebPage::didCompletePageTransition() +@@ -3576,6 +3688,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -21373,7 +21376,7 @@ index 7e00688615eefcdda04eb9e42de6a5219370b6d3..55f9ef4c6418b95b5c5c954526168081 } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4334,7 +4447,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4340,7 +4453,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -21382,7 +21385,7 @@ index 7e00688615eefcdda04eb9e42de6a5219370b6d3..55f9ef4c6418b95b5c5c954526168081 void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6668,6 +6781,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6672,6 +6785,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -21393,7 +21396,7 @@ index 7e00688615eefcdda04eb9e42de6a5219370b6d3..55f9ef4c6418b95b5c5c954526168081 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index cc27926d45b41a887c684582f548bd2da9fe1da7..b853ac4e3ee3bd3f3986cf559dfeec9fbbd545c7 100644 +index b2864572b741449da36f7acc15f8bd72f2434468..c5e1490eaf52f80c187d11bc8ad94e9cc6adcbc7 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -116,6 +116,10 @@ typedef struct _AtkObject AtkObject; @@ -21407,7 +21410,7 @@ index cc27926d45b41a887c684582f548bd2da9fe1da7..b853ac4e3ee3bd3f3986cf559dfeec9f #if PLATFORM(GTK) || PLATFORM(WPE) #include "InputMethodState.h" #endif -@@ -970,11 +974,11 @@ public: +@@ -971,11 +975,11 @@ public: void clearSelection(); void restoreSelectionInFocusedEditableElement(); @@ -21421,7 +21424,7 @@ index cc27926d45b41a887c684582f548bd2da9fe1da7..b853ac4e3ee3bd3f3986cf559dfeec9f void performDragControllerAction(DragControllerAction, const WebCore::DragData&, SandboxExtension::Handle&&, Vector&&); #endif -@@ -988,6 +992,9 @@ public: +@@ -989,6 +993,9 @@ public: void didStartDrag(); void dragCancelled(); OptionSet allowedDragSourceActions() const { return m_allowedDragSourceActions; } @@ -21431,7 +21434,7 @@ index cc27926d45b41a887c684582f548bd2da9fe1da7..b853ac4e3ee3bd3f3986cf559dfeec9f #endif void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&); -@@ -1222,6 +1229,7 @@ public: +@@ -1223,6 +1230,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -21474,10 +21477,10 @@ index cc27926d45b41a887c684582f548bd2da9fe1da7..b853ac4e3ee3bd3f3986cf559dfeec9f bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 1e660c70f8c53ca536e10d8f8cd8feca022cf0a9..3f3d1bb44d8f9e9e92173d9569c834dafad09110 100644 +index 596b4f7f6022f5aae343a6e3f009f9f96bbe8985..9c8dfcf3ce512b877f4ed65c3f903050f27df0d6 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -@@ -133,6 +133,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -132,6 +132,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType ConnectInspector(String targetId, Inspector::FrontendChannel::ConnectionType connectionType) DisconnectInspector(String targetId) SendMessageToTargetBackend(String targetId, String message) @@ -21485,7 +21488,7 @@ index 1e660c70f8c53ca536e10d8f8cd8feca022cf0a9..3f3d1bb44d8f9e9e92173d9569c834da #if ENABLE(REMOTE_INSPECTOR) SetIndicating(bool indicating); -@@ -144,6 +145,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -143,6 +144,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType #endif #if !ENABLE(IOS_TOUCH_EVENTS) && ENABLE(TOUCH_EVENTS) TouchEvent(WebKit::WebTouchEvent event) @@ -21493,7 +21496,7 @@ index 1e660c70f8c53ca536e10d8f8cd8feca022cf0a9..3f3d1bb44d8f9e9e92173d9569c834da #endif CancelPointer(WebCore::PointerID pointerId, WebCore::IntPoint documentPoint) -@@ -173,6 +175,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -172,6 +174,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType LoadURLInFrame(URL url, String referrer, WebCore::FrameIdentifier frameID) LoadDataInFrame(IPC::DataReference data, String MIMEType, String encodingName, URL baseURL, WebCore::FrameIdentifier frameID) LoadRequest(struct WebKit::LoadParameters loadParameters) @@ -21501,7 +21504,7 @@ index 1e660c70f8c53ca536e10d8f8cd8feca022cf0a9..3f3d1bb44d8f9e9e92173d9569c834da LoadRequestWaitingForProcessLaunch(struct WebKit::LoadParameters loadParameters, URL resourceDirectoryURL, WebKit::WebPageProxyIdentifier pageID, bool checkAssumedReadAccessToResourceURL) LoadData(struct WebKit::LoadParameters loadParameters) LoadSimulatedRequestAndResponse(struct WebKit::LoadParameters loadParameters, WebCore::ResourceResponse simulatedResponse) -@@ -312,10 +315,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -311,10 +314,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType AddMIMETypeWithCustomContentProvider(String mimeType) # Drag and drop. @@ -21514,7 +21517,7 @@ index 1e660c70f8c53ca536e10d8f8cd8feca022cf0a9..3f3d1bb44d8f9e9e92173d9569c834da PerformDragControllerAction(enum:uint8_t WebKit::DragControllerAction action, WebCore::DragData dragData, WebKit::SandboxExtension::Handle sandboxExtensionHandle, Vector sandboxExtensionsForUpload) #endif #if ENABLE(DRAG_SUPPORT) -@@ -324,6 +327,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -323,6 +326,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType DragCancelled() #endif @@ -21667,10 +21670,10 @@ index e4653412699e26e57a023ab8576cd9c9405f6561..866bc55ebe4ed9afe3397a78d34dee64 - (void)touch:(WebEvent *)event { diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm -index 0d053bfd223900d9e6ce88733d4e5114ee0c2687..de9a1f240e0821b4a22044979591af364ae4b2c1 100644 +index 687fd483cb8b98cb0903f54d279e934f1c1ea407..295438a37e4546257453f4fcd8c6d12fe3810538 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm -@@ -4033,7 +4033,7 @@ IGNORE_WARNINGS_END +@@ -4036,7 +4036,7 @@ IGNORE_WARNINGS_END } #endif // PLATFORM(IOS_FAMILY) @@ -21679,7 +21682,7 @@ index 0d053bfd223900d9e6ce88733d4e5114ee0c2687..de9a1f240e0821b4a22044979591af36 - (NSArray *)_touchEventRegions { -@@ -4075,7 +4075,7 @@ IGNORE_WARNINGS_END +@@ -4078,7 +4078,7 @@ IGNORE_WARNINGS_END }).autorelease(); } @@ -21855,7 +21858,7 @@ index 5986998dc9e24f280a67b5dabff35b9126ade9c0..c048a22508c243be5080f8e85a90007e WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON) diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake -index ae2ab4d10367dbf6bc38f9a0246cab2485b6fb67..7629d6711783694d963c89685d03cfe0a9c585d6 100644 +index 67b426e58c7409f66889ed1d835af6636ad27642..9104fcb4a9a1869a2ffb2d09695e5e2d95de71df 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) @@ -21889,7 +21892,7 @@ index ae2ab4d10367dbf6bc38f9a0246cab2485b6fb67..7629d6711783694d963c89685d03cfe0 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBASSEMBLY PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PUBLIC OFF) -@@ -88,6 +86,17 @@ if (${WTF_PLATFORM_WIN_CAIRO}) +@@ -89,6 +87,17 @@ if (${WTF_PLATFORM_WIN_CAIRO}) # No support planned WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF) @@ -21908,7 +21911,7 @@ index ae2ab4d10367dbf6bc38f9a0246cab2485b6fb67..7629d6711783694d963c89685d03cfe0 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) else () diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake -index 3cce4b9f838001d93a160bd0c753ae563f331077..6afca30c04917990da8943693d91de5727bd1851 100644 +index eb40b4c66dd8b0a8458cf2a6a5441619fe031e7c..f2a2470d9012cc8b5bc08aef9ab1756ae5d0363b 100644 --- a/Source/cmake/OptionsWinCairo.cmake +++ b/Source/cmake/OptionsWinCairo.cmake @@ -27,15 +27,36 @@ if (OpenJPEG_FOUND) @@ -22465,10 +22468,10 @@ index 775b41868718ea6734efc9082f8161eee2e0015e..68a720c0cb01d534653a259536c48168 list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp -index 3ec0dd21f402acec6a818d3d5f0505b57a06ea63..1071c6b3ccff0e1f24f1eb47d5745666c2e1ed10 100644 +index 8337dc59e6f9bcd991fce4e9e21944ad6dcc873c..3f66249829875babc8bc78dd2c9a7eb8eb4406b2 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp -@@ -787,6 +787,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options) +@@ -796,6 +796,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options) 0, // requestStorageAccessConfirm shouldAllowDeviceOrientationAndMotionAccess, runWebAuthenticationPanel, @@ -22533,18 +22536,10 @@ index 296c902f375b1189f45ee56bb3ffd4d826dd26f6..45d8ca4bdd18e2467b26b0c6998b4dc5 + } // namespace WTR diff --git a/Tools/glib/dependencies/apt b/Tools/glib/dependencies/apt -index 02fa9bff0ab4bd094fd9498b042e06f35c25e7fc..f33f29a9a26d1219aa5780b1860792353a70f4ee 100644 +index 178e74ac90708b9571330c216a1ee07f7db3dff2..f33f29a9a26d1219aa5780b1860792353a70f4ee 100644 --- a/Tools/glib/dependencies/apt +++ b/Tools/glib/dependencies/apt -@@ -34,6 +34,7 @@ PACKAGES=( - libgstreamer-plugins-base1.0-dev - libjpeg-dev - libkate-dev -+ liblcms2-dev - libopenjp2-7-dev - libpng-dev - libseccomp-dev -@@ -44,9 +45,11 @@ PACKAGES=( +@@ -45,9 +45,11 @@ PACKAGES=( libwayland-dev libwebp-dev libwoff-dev