diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index d5aa8fea62..5d0e554a41 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1564 -Changed: dkolesa@igalia.com Fri Oct 15 17:00:53 CEST 2021 +1565 +Changed: dpino@igalia.com Thu Oct 21 16:32:56 UTC 2021 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 3375d19fa9..90126d15b4 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="3c65cb188f1e0b0d2a5905bb3988642991e1b1aa" +BASE_REVISION="e01d5946aff61513a22e9ffe9efa3bf8051bce28" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 59253bd112..f221bdd5a3 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -31,10 +31,10 @@ index 8b9182ced101951a8d005b06b7e17c1961ada076..e5ab9784176273b80b7e28bb1bdac12c ${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 c927a54ef7538eb95d53567f8617eeab81552f0e..b57c538382f500c8a035b253327f1ae12ccccabd 100644 +index 9a639237f8b29d6cfe88c6cbc21d6a92c5b73392..31ddbaf5198fa561441aebf0b9c468f0e6615c02 100644 --- a/Source/JavaScriptCore/DerivedSources.make +++ b/Source/JavaScriptCore/DerivedSources.make -@@ -281,22 +281,27 @@ INSPECTOR_DOMAINS := \ +@@ -284,22 +284,27 @@ INSPECTOR_DOMAINS := \ $(JavaScriptCore)/inspector/protocol/CSS.json \ $(JavaScriptCore)/inspector/protocol/Canvas.json \ $(JavaScriptCore)/inspector/protocol/Console.json \ @@ -2081,10 +2081,10 @@ index b929c9d72addb6500e98e1b0ad535bd018c547cc..8141987b4c4100f00a5db487c6ce83f7 type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index f85b7875b5d9b73e68cd5a7a3dcc8a8487fb05aa..b9b5123902b83d55d0f60bb3449e1cc3b5271b48 100644 +index 2c176ae23d5aae49471a340c7b2dc456c9142165..83768668fee38ffded232d0759ab35ba70f6f8ad 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -@@ -405,7 +405,7 @@ CrossOriginOpenerPolicyEnabled: +@@ -417,7 +417,7 @@ CrossOriginEmbedderPolicyEnabled: WebKitLegacy: default: false WebKit: @@ -2093,7 +2093,7 @@ index f85b7875b5d9b73e68cd5a7a3dcc8a8487fb05aa..b9b5123902b83d55d0f60bb3449e1cc3 WebCore: default: false -@@ -784,9 +784,9 @@ MaskWebGLStringsEnabled: +@@ -810,9 +810,9 @@ MaskWebGLStringsEnabled: WebKitLegacy: default: true WebKit: @@ -2105,7 +2105,7 @@ index f85b7875b5d9b73e68cd5a7a3dcc8a8487fb05aa..b9b5123902b83d55d0f60bb3449e1cc3 # FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well. MediaCapabilitiesExtensionsEnabled: -@@ -1210,7 +1210,7 @@ SpeechRecognitionEnabled: +@@ -1236,7 +1236,7 @@ SpeechRecognitionEnabled: WebKitLegacy: default: false WebKit: @@ -2249,10 +2249,10 @@ index de0b45bd0a88eaba466b6e6c0ad66dc02f525741..81857a2be24fa3ff0a60ebbcd0113096 WTF_EXPORT_PRIVATE LocalTimeOffset calculateLocalTimeOffset(double utcInMilliseconds, TimeType = UTCTime); diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index 8738d25d1bcc709589b26b2f928f4f8cee60c6f9..414d6a6fc88ebc54f738b0a650ed521e7ae8d828 100644 +index 22a6f5b4d7399800773514c0f0a44a270a6072f7..a00692f511b1b9619de145cd8f728cf090d6cdfb 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h -@@ -413,7 +413,7 @@ +@@ -412,7 +412,7 @@ #endif #if !defined(ENABLE_ORIENTATION_EVENTS) @@ -2261,7 +2261,7 @@ index 8738d25d1bcc709589b26b2f928f4f8cee60c6f9..414d6a6fc88ebc54f738b0a650ed521e #endif #if OS(WINDOWS) -@@ -474,7 +474,7 @@ +@@ -473,7 +473,7 @@ #endif #if !defined(ENABLE_TOUCH_EVENTS) @@ -2271,10 +2271,10 @@ index 8738d25d1bcc709589b26b2f928f4f8cee60c6f9..414d6a6fc88ebc54f738b0a650ed521e #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index f09ca6e01a2fb22e1021c478d95985844f9fe413..180f01be4581b52cadfd4b2b74adb84934ecfafc 100644 +index d1db2221b26a6ecf7d8bb8c900985e9a17763905..186d426c86d993656d86300e1c81addea9da91d5 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h -@@ -216,7 +216,7 @@ +@@ -220,7 +220,7 @@ #define ENABLE_DATA_DETECTION 1 #endif @@ -2284,10 +2284,10 @@ index f09ca6e01a2fb22e1021c478d95985844f9fe413..180f01be4581b52cadfd4b2b74adb849 #endif diff --git a/Source/WTF/wtf/PlatformGTK.cmake b/Source/WTF/wtf/PlatformGTK.cmake -index 4a12b5a4393fe2bbe39673e3fa547c9d6976abd7..678b777736019debbd25fcd72fd34f3dd925c459 100644 +index d609129ef1b2899b27a3a43f5271ea360925efec..a11f9a2b4893b743b73060bfbea6cb5321fbbf8a 100644 --- a/Source/WTF/wtf/PlatformGTK.cmake +++ b/Source/WTF/wtf/PlatformGTK.cmake -@@ -74,6 +74,7 @@ list(APPEND WTF_LIBRARIES +@@ -77,6 +77,7 @@ list(APPEND WTF_LIBRARIES ${GLIB_LIBRARIES} Threads::Threads ZLIB::ZLIB @@ -2296,7 +2296,7 @@ index 4a12b5a4393fe2bbe39673e3fa547c9d6976abd7..678b777736019debbd25fcd72fd34f3d if (Systemd_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index f71b524b2dc3a34132699275de5618ee69df8325..c38afe320bc2756cd95423be328217fbebaea551 100644 +index cd073c4968285efa079a0d4ea12e88510bf3adc2..111d01c5786119a5981da5d00bcf3a80b42b1a1e 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -384,7 +384,7 @@ @@ -2309,10 +2309,10 @@ index f71b524b2dc3a34132699275de5618ee69df8325..c38afe320bc2756cd95423be328217fb #endif diff --git a/Source/WTF/wtf/PlatformWPE.cmake b/Source/WTF/wtf/PlatformWPE.cmake -index 643ef0fcdf4f3ce4a1f27bc0cc6e179b7143bbd4..f6ee05b80ebc200d0db74fc7e975d96ce0dcd75f 100644 +index 3b47997e5cf9cc4b04e01e1f69d0eb1185789636..0e89ea259b77cd3737b4848ff776d217019e0097 100644 --- a/Source/WTF/wtf/PlatformWPE.cmake +++ b/Source/WTF/wtf/PlatformWPE.cmake -@@ -48,6 +48,7 @@ list(APPEND WTF_LIBRARIES +@@ -50,6 +50,7 @@ list(APPEND WTF_LIBRARIES ${GLIB_LIBRARIES} Threads::Threads ZLIB::ZLIB @@ -2321,10 +2321,10 @@ index 643ef0fcdf4f3ce4a1f27bc0cc6e179b7143bbd4..f6ee05b80ebc200d0db74fc7e975d96c if (Systemd_FOUND) diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index 5c773a489da19cc2085ecce713eb007b200f8852..f64d32049c71a4109071260ada20cb2260b8c329 100644 +index d924abe9a77f779dc2256e93efd332004f55698e..eaf736e8c5502a5787353b49060f7bb9cdd4f679 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make -@@ -783,6 +783,10 @@ JS_BINDING_IDLS := \ +@@ -793,6 +793,10 @@ JS_BINDING_IDLS := \ $(WebCore)/dom/Slotable.idl \ $(WebCore)/dom/StaticRange.idl \ $(WebCore)/dom/StringCallback.idl \ @@ -2335,7 +2335,7 @@ index 5c773a489da19cc2085ecce713eb007b200f8852..f64d32049c71a4109071260ada20cb22 $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1320,9 +1324,6 @@ JS_BINDING_IDLS := \ +@@ -1333,9 +1337,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -2424,24 +2424,15 @@ index f1b96958057d2fe6044d2c7b259db6c5ceb44efe..29e51dad380285fb16bd32ef04efde2a [self sendSpeechEndIfNeeded]; diff --git a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTaskMock.mm b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTaskMock.mm -index 66cec91542b74765a9c1ffbc2f28e1a5085c55e0..9a2a89a09279b3b7102282de6bfc4cc7e2b5925f 100644 +index bc5c6219b5dadc3b1cdc590d65c897b7250b1e21..37d07ef4f59ad450077d90d451cf512005f360f4 100644 --- a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTaskMock.mm +++ b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTaskMock.mm -@@ -36,6 +36,9 @@ NS_ASSUME_NONNULL_BEGIN - - - (instancetype)initWithIdentifier:(SpeechRecognitionConnectionClientIdentifier)identifier locale:(NSString*)localeIdentifier doMultipleRecognitions:(BOOL)continuous reportInterimResults:(BOOL)interimResults maxAlternatives:(unsigned long)alternatives delegateCallback:(void(^)(const SpeechRecognitionUpdate&))callback - { -+ UNUSED_PARAM(localeIdentifier); -+ UNUSED_PARAM(interimResults); -+ UNUSED_PARAM(alternatives); - if (!(self = [super init])) - return nil; - -@@ -51,6 +54,7 @@ NS_ASSUME_NONNULL_BEGIN - +@@ -56,7 +56,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)audioSamplesAvailable:(CMSampleBufferRef)sampleBuffer { -+ UNUSED_PARAM(sampleBuffer); + UNUSED_PARAM(sampleBuffer); +- ++ if (!_hasSentSpeechStart) { _hasSentSpeechStart = true; _delegateCallback(SpeechRecognitionUpdate::create(_identifier, SpeechRecognitionUpdateType::SpeechStart)); @@ -2458,10 +2449,10 @@ index 9f4daefcd385d534149f0a5a6ce0e8016e25638f..37f64495ec9b316bbf0a5e3212917d43 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index 76041fce66cb94da6d55b04b93938e73bf8fc98c..46639efd91dbc303b8e7a25112fbdf6932fdf577 100644 +index 906c299845db03f7738e581850d4d0c4ae9a30c6..e27f97c613819ddb4cdf00e52e7f25933dfa0cb9 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt -@@ -602,3 +602,9 @@ platform/graphics/angle/ANGLEUtilities.cpp @no-unify +@@ -605,3 +605,9 @@ platform/graphics/angle/ANGLEUtilities.cpp @no-unify platform/graphics/angle/ExtensionsGLANGLE.cpp @no-unify platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify platform/graphics/angle/TemporaryANGLESetting.cpp @no-unify @@ -2472,10 +2463,10 @@ index 76041fce66cb94da6d55b04b93938e73bf8fc98c..46639efd91dbc303b8e7a25112fbdf69 +JSTouchList.cpp +// Playwright end diff --git a/Source/WebCore/SourcesGTK.txt b/Source/WebCore/SourcesGTK.txt -index 3cdf3e81ee35352c59f83be1b8bcdcdf1d79bf39..2b3d39bfdcafbbecff259dad3b037d3bc3ffa47f 100644 +index 60373635c135f23dcf83ffbe05ad21c39c844ac9..55409c4c9163645383d1726d305b2bbb3a6d7fcd 100644 --- a/Source/WebCore/SourcesGTK.txt +++ b/Source/WebCore/SourcesGTK.txt -@@ -92,7 +92,7 @@ platform/graphics/egl/GLContextEGLLibWPE.cpp @no-unify +@@ -93,7 +93,7 @@ platform/graphics/egl/GLContextEGLLibWPE.cpp @no-unify platform/graphics/egl/GLContextEGLWayland.cpp @no-unify platform/graphics/egl/GLContextEGLX11.cpp @no-unify @@ -2523,10 +2514,10 @@ index 9f85e4986c53a1cc8d63b3394d3f7295832af387..1228fda7c688c5b24cecaf07e21437d3 __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index d6cfaf1cd834865802f3210d4e5667a89a38d8cd..b396e003edfe624149b876488ea9f8769a288266 100644 +index 340e420bab59bbf78ab0af65fa4d9f31206713d7..3a7ba903fa8277d98440f7aea809aef0abf7b0ff 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5408,6 +5408,14 @@ +@@ -5421,6 +5421,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, ); }; }; @@ -2541,7 +2532,7 @@ index d6cfaf1cd834865802f3210d4e5667a89a38d8cd..b396e003edfe624149b876488ea9f876 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, ); }; }; -@@ -16848,6 +16856,14 @@ +@@ -16890,6 +16898,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 = ""; }; @@ -2556,7 +2547,7 @@ index d6cfaf1cd834865802f3210d4e5667a89a38d8cd..b396e003edfe624149b876488ea9f876 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 = ""; }; -@@ -22507,7 +22523,12 @@ +@@ -22552,7 +22568,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2569,7 +2560,7 @@ index d6cfaf1cd834865802f3210d4e5667a89a38d8cd..b396e003edfe624149b876488ea9f876 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -28337,6 +28358,8 @@ +@@ -28387,6 +28408,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2578,7 +2569,7 @@ index d6cfaf1cd834865802f3210d4e5667a89a38d8cd..b396e003edfe624149b876488ea9f876 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -30572,6 +30595,7 @@ +@@ -30645,6 +30668,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2586,7 +2577,7 @@ index d6cfaf1cd834865802f3210d4e5667a89a38d8cd..b396e003edfe624149b876488ea9f876 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -31587,6 +31611,7 @@ +@@ -31658,6 +31682,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2594,7 +2585,7 @@ index d6cfaf1cd834865802f3210d4e5667a89a38d8cd..b396e003edfe624149b876488ea9f876 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -33684,6 +33709,7 @@ +@@ -33757,6 +33782,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2602,7 +2593,7 @@ index d6cfaf1cd834865802f3210d4e5667a89a38d8cd..b396e003edfe624149b876488ea9f876 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -35809,9 +35835,11 @@ +@@ -35885,9 +35911,11 @@ B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */, @@ -2614,7 +2605,7 @@ index d6cfaf1cd834865802f3210d4e5667a89a38d8cd..b396e003edfe624149b876488ea9f876 B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -36763,6 +36791,7 @@ +@@ -36846,6 +36874,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2622,7 +2613,7 @@ index d6cfaf1cd834865802f3210d4e5667a89a38d8cd..b396e003edfe624149b876488ea9f876 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -36832,6 +36861,7 @@ +@@ -36916,6 +36945,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2630,7 +2621,7 @@ index d6cfaf1cd834865802f3210d4e5667a89a38d8cd..b396e003edfe624149b876488ea9f876 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -36880,6 +36910,7 @@ +@@ -36964,6 +36994,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2638,7 +2629,7 @@ index d6cfaf1cd834865802f3210d4e5667a89a38d8cd..b396e003edfe624149b876488ea9f876 DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -37412,6 +37443,7 @@ +@@ -37496,6 +37527,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2647,7 +2638,7 @@ index d6cfaf1cd834865802f3210d4e5667a89a38d8cd..b396e003edfe624149b876488ea9f876 2D8B92F5203D13E1009C868F /* UnifiedSource520.cpp in Sources */, 2D8B92F6203D13E1009C868F /* UnifiedSource521.cpp in Sources */, diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp -index e174b2fb4d536f92270c74da477eea7ed1018060..0ae6f36d1cf2289cc882f4614a73407db725f202 100644 +index 1a70b2efd621e11cb662e925015e028f34d64542..ae055af9b8f5e56b20ddbe01d45068c1921339ab 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -60,6 +60,7 @@ @@ -2658,7 +2649,7 @@ index e174b2fb4d536f92270c74da477eea7ed1018060..0ae6f36d1cf2289cc882f4614a73407d #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3349,10 +3350,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -3350,10 +3351,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (useParentData ? m_isIgnoredFromParentData.isPresentationalChildOfAriaRole : isPresentationalChildOfAriaRole()) return AccessibilityObjectInclusion::IgnoreObject; @@ -2678,7 +2669,7 @@ index e174b2fb4d536f92270c74da477eea7ed1018060..0ae6f36d1cf2289cc882f4614a73407d { AXComputedObjectAttributeCache* attributeCache = nullptr; diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -index 5d5b299c16165945783cdb771183be7a806b9add..315653baa1343265ff42c0b880574c81026843c6 100644 +index e0a6217399110431bc005c3365ad12bfd84841e4..872a2bad956f50fe83629ab14e8d699d826c4bc8 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h @@ -109,6 +109,8 @@ namespace WebCore { @@ -2699,10 +2690,10 @@ index 5d5b299c16165945783cdb771183be7a806b9add..315653baa1343265ff42c0b880574c81 macro(OffscreenCanvas) \ macro(OffscreenCanvasRenderingContext2D) \ diff --git a/Source/WebCore/css/MediaQueryEvaluator.cpp b/Source/WebCore/css/MediaQueryEvaluator.cpp -index d47391fbefc085666f7e4d4b2f63703e86a6766a..2ba34113b3f1d8103a96443067629c9319792499 100644 +index 856ec46ac0f8f6079bf3668823734749d242dda7..1dd61f7227c3887a8780b0fed2e2f1324ce6a015 100644 --- a/Source/WebCore/css/MediaQueryEvaluator.cpp +++ b/Source/WebCore/css/MediaQueryEvaluator.cpp -@@ -840,7 +840,11 @@ static bool prefersContrastEvaluate(CSSValue* value, const CSSToLengthConversion +@@ -846,7 +846,11 @@ static bool prefersContrastEvaluate(CSSValue* value, const CSSToLengthConversion static bool prefersReducedMotionEvaluate(CSSValue* value, const CSSToLengthConversionData&, Frame& frame, MediaFeaturePrefix) { bool userPrefersReducedMotion = false; @@ -2715,7 +2706,7 @@ index d47391fbefc085666f7e4d4b2f63703e86a6766a..2ba34113b3f1d8103a96443067629c93 switch (frame.settings().forcedPrefersReducedMotionAccessibilityValue()) { case ForcedAccessibilityValue::On: userPrefersReducedMotion = true; -@@ -853,6 +857,7 @@ static bool prefersReducedMotionEvaluate(CSSValue* value, const CSSToLengthConve +@@ -859,6 +863,7 @@ static bool prefersReducedMotionEvaluate(CSSValue* value, const CSSToLengthConve #endif break; } @@ -6040,10 +6031,10 @@ index ccbdfa4963e40396c79ea9639cb5a079b4f3ed26..b8952ccaaeb9e38391fb806c458ec057 #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 61935b3413b322f2ca7d4582b4a463bc2db8b820..f2a68901ac20c0f46ff82083b8e40174e137771c 100644 +index f96c3128ed9fd38b36e0e5d1a416ffdefd3bb36c..3020fc0d0fdfcdb4d5b09332cdefbb7d1465f020 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp -@@ -137,6 +137,7 @@ +@@ -138,6 +138,7 @@ #if ENABLE(TOUCH_EVENTS) && !ENABLE(IOS_TOUCH_EVENTS) #include "PlatformTouchEvent.h" @@ -6051,7 +6042,7 @@ index 61935b3413b322f2ca7d4582b4a463bc2db8b820..f2a68901ac20c0f46ff82083b8e40174 #endif #if ENABLE(MAC_GESTURE_EVENTS) -@@ -796,9 +797,7 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve +@@ -797,9 +798,7 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve m_mousePressNode = event.targetNode(); m_frame.document()->setFocusNavigationStartingNode(event.targetNode()); @@ -6061,7 +6052,7 @@ index 61935b3413b322f2ca7d4582b4a463bc2db8b820..f2a68901ac20c0f46ff82083b8e40174 m_mousePressed = true; m_selectionInitiationState = HaveNotStartedSelection; -@@ -838,8 +837,6 @@ VisiblePosition EventHandler::selectionExtentRespectingEditingBoundary(const Vis +@@ -839,8 +838,6 @@ VisiblePosition EventHandler::selectionExtentRespectingEditingBoundary(const Vis return adjustedTarget->renderer()->positionForPoint(LayoutPoint(selectionEndPoint), nullptr); } @@ -6070,7 +6061,7 @@ index 61935b3413b322f2ca7d4582b4a463bc2db8b820..f2a68901ac20c0f46ff82083b8e40174 #if !PLATFORM(IOS_FAMILY) bool EventHandler::supportsSelectionUpdatesOnMouseDrag() const -@@ -861,8 +858,10 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -862,8 +859,10 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e Ref protectedFrame(m_frame); @@ -6081,7 +6072,7 @@ index 61935b3413b322f2ca7d4582b4a463bc2db8b820..f2a68901ac20c0f46ff82083b8e40174 RefPtr targetNode = event.targetNode(); if (event.event().button() != LeftButton || !targetNode) -@@ -883,7 +882,9 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -884,7 +883,9 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e ASSERT(mouseDownMayStartSelect() || m_mouseDownMayStartAutoscroll); #endif @@ -6091,7 +6082,7 @@ index 61935b3413b322f2ca7d4582b4a463bc2db8b820..f2a68901ac20c0f46ff82083b8e40174 if (m_mouseDownMayStartAutoscroll && !panScrollInProgress()) { m_autoscrollController->startAutoscrollForSelection(renderer); -@@ -900,6 +901,8 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -901,6 +902,8 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e return true; } @@ -6100,7 +6091,7 @@ index 61935b3413b322f2ca7d4582b4a463bc2db8b820..f2a68901ac20c0f46ff82083b8e40174 bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const { // This is a pre-flight check of whether the event might lead to a drag being started. Be careful -@@ -931,6 +934,8 @@ bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const +@@ -932,6 +935,8 @@ bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const return targetElement && page->dragController().draggableElement(&m_frame, targetElement.get(), result.roundedPointInInnerNodeFrame(), state); } @@ -6109,7 +6100,7 @@ index 61935b3413b322f2ca7d4582b4a463bc2db8b820..f2a68901ac20c0f46ff82083b8e40174 void EventHandler::updateSelectionForMouseDrag() { if (!supportsSelectionUpdatesOnMouseDrag()) -@@ -1025,7 +1030,6 @@ void EventHandler::updateSelectionForMouseDrag(const HitTestResult& hitTestResul +@@ -1026,7 +1031,6 @@ void EventHandler::updateSelectionForMouseDrag(const HitTestResult& hitTestResul if (oldSelection != newSelection && HTMLElement::isImageOverlayText(newSelection.start().containerNode()) && HTMLElement::isImageOverlayText(newSelection.end().containerNode())) invalidateClick(); } @@ -6117,7 +6108,7 @@ index 61935b3413b322f2ca7d4582b4a463bc2db8b820..f2a68901ac20c0f46ff82083b8e40174 void EventHandler::lostMouseCapture() { -@@ -1073,9 +1077,7 @@ bool EventHandler::handleMouseReleaseEvent(const MouseEventWithHitTestResults& e +@@ -1074,9 +1078,7 @@ bool EventHandler::handleMouseReleaseEvent(const MouseEventWithHitTestResults& e // on the selection, the selection goes away. However, if we are // editing, place the caret. if (m_mouseDownWasSingleClickInSelection && m_selectionInitiationState != ExtendedSelection @@ -6127,7 +6118,7 @@ index 61935b3413b322f2ca7d4582b4a463bc2db8b820..f2a68901ac20c0f46ff82083b8e40174 && m_frame.selection().isRange() && event.event().button() != RightButton) { VisibleSelection newSelection; -@@ -2042,10 +2044,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE +@@ -2043,10 +2045,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE swallowEvent = !dispatchMouseEvent(eventNames().mousemoveEvent, mouseEvent.targetNode(), 0, platformMouseEvent, FireMouseOverOut::Yes); @@ -6138,7 +6129,7 @@ index 61935b3413b322f2ca7d4582b4a463bc2db8b820..f2a68901ac20c0f46ff82083b8e40174 return swallowEvent; } -@@ -4106,7 +4106,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr +@@ -4107,7 +4107,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr if (!m_frame.document()) return false; @@ -6154,7 +6145,7 @@ index 61935b3413b322f2ca7d4582b4a463bc2db8b820..f2a68901ac20c0f46ff82083b8e40174 auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; if (dragState().shouldDispatchEvents) { -@@ -4517,7 +4524,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4518,7 +4525,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) allTouchReleased = false; } @@ -6164,7 +6155,7 @@ index 61935b3413b322f2ca7d4582b4a463bc2db8b820..f2a68901ac20c0f46ff82083b8e40174 PlatformTouchPoint::State pointState = point.state(); LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); -@@ -4644,6 +4652,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4645,6 +4653,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) changedTouches[pointState].m_touches->append(WTFMove(touch)); changedTouches[pointState].m_targets.add(touchTarget); } @@ -6175,10 +6166,10 @@ index 61935b3413b322f2ca7d4582b4a463bc2db8b820..f2a68901ac20c0f46ff82083b8e40174 m_touchPressed = touches->length() > 0; if (allTouchReleased) diff --git a/Source/WebCore/page/EventHandler.h b/Source/WebCore/page/EventHandler.h -index 496d1357937767f11ea9ab9ad72f956e0b2b3914..6f8a6dc479af1731b9557e6f2a8b41cdd041a2ed 100644 +index a539bb773e7885f17b1383ce90b8f95ea57d0554..fe955651e7ac472cc9261d0e1bfff45d1cce5c78 100644 --- a/Source/WebCore/page/EventHandler.h +++ b/Source/WebCore/page/EventHandler.h -@@ -136,9 +136,7 @@ public: +@@ -135,9 +135,7 @@ public: WEBCORE_EXPORT VisiblePosition selectionExtentRespectingEditingBoundary(const VisibleSelection&, const LayoutPoint&, Node*); @@ -6188,7 +6179,7 @@ index 496d1357937767f11ea9ab9ad72f956e0b2b3914..6f8a6dc479af1731b9557e6f2a8b41cd #if ENABLE(PAN_SCROLLING) void didPanScrollStart(); -@@ -384,10 +382,8 @@ private: +@@ -383,10 +381,8 @@ private: bool startKeyboardScrolling(KeyboardEvent&); void stopKeyboardScrolling(); @@ -6199,7 +6190,7 @@ index 496d1357937767f11ea9ab9ad72f956e0b2b3914..6f8a6dc479af1731b9557e6f2a8b41cd WEBCORE_EXPORT bool handleMouseReleaseEvent(const MouseEventWithHitTestResults&); -@@ -488,10 +484,8 @@ private: +@@ -487,10 +483,8 @@ private: void defaultTabEventHandler(KeyboardEvent&); void defaultArrowEventHandler(FocusDirection, KeyboardEvent&); @@ -6210,7 +6201,7 @@ index 496d1357937767f11ea9ab9ad72f956e0b2b3914..6f8a6dc479af1731b9557e6f2a8b41cd // The following are called at the beginning of handleMouseUp and handleDrag. // If they return true it indicates that they have consumed the event. -@@ -499,9 +493,10 @@ private: +@@ -498,9 +492,10 @@ private: #if ENABLE(DRAG_SUPPORT) bool eventLoopHandleMouseDragged(const MouseEventWithHitTestResults&); @@ -6222,7 +6213,7 @@ index 496d1357937767f11ea9ab9ad72f956e0b2b3914..6f8a6dc479af1731b9557e6f2a8b41cd enum class SetOrClearLastScrollbar { Clear, Set }; void updateLastScrollbarUnderMouse(Scrollbar*, SetOrClearLastScrollbar); -@@ -593,8 +588,8 @@ private: +@@ -592,8 +587,8 @@ private: Timer m_autoHideCursorTimer; #endif @@ -6253,7 +6244,7 @@ index 602631bb7cd10860b1a3121043c97d8efe44761d..867320c576201d35124a186ac60c2927 request.setHTTPHeaderField(HTTPHeaderName::Accept, "text/event-stream"); request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache"); diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp -index 8e0a19a664e62b7c3ee4dcf88be77ab5ba2737ed..cd5213633c4f68f6ca5ba36cbb42f38d69deb747 100644 +index 7e8ac05240a5e103c854c0c4573ddb2c5b7d7a2a..b32e7f4ab896e9ed5027d23a58eeadfdb1551b25 100644 --- a/Source/WebCore/page/Frame.cpp +++ b/Source/WebCore/page/Frame.cpp @@ -39,6 +39,7 @@ @@ -6783,7 +6774,7 @@ index 28d1fc3242174a680711027877d4153923790220..058b5309eed081fcc1e4158f66e80642 if (stateObjectType == StateObjectType::Push) { frame->loader().history().pushState(WTFMove(data), title, fullURL.string()); diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp -index 00613fa6876a6be6a9261332161e496822af4182..a3a90eb6ea410f87d95833804cb7d025ec33f6f5 100644 +index a2b2b5f605b37c1185bf75eec3dc936a42a2659f..4b99643a482b4adc89f1998cf7873862538accc1 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp @@ -466,6 +466,37 @@ void Page::setOverrideViewportArguments(const std::optional& @@ -6835,7 +6826,7 @@ index 00613fa6876a6be6a9261332161e496822af4182..a3a90eb6ea410f87d95833804cb7d025 resetSeenPlugins(); resetSeenMediaEngines(); -@@ -3274,6 +3301,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3301,6 +3328,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -6853,10 +6844,10 @@ index 00613fa6876a6be6a9261332161e496822af4182..a3a90eb6ea410f87d95833804cb7d025 { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index ec7711fe3bdd79f7eab0330f1be3be0dcac09fe7..9697e9cd2f6d28c316ca1b8ab69031b0f2a2f7d9 100644 +index 015f85244c9acd5ff50b3c89dec0a4c1a8d4f9ee..0a2e81b6903fbf87d13369081951c5355a4759c8 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h -@@ -265,6 +265,9 @@ public: +@@ -266,6 +266,9 @@ public: const std::optional& overrideViewportArguments() const { return m_overrideViewportArguments; } WEBCORE_EXPORT void setOverrideViewportArguments(const std::optional&); @@ -6866,7 +6857,7 @@ index ec7711fe3bdd79f7eab0330f1be3be0dcac09fe7..9697e9cd2f6d28c316ca1b8ab69031b0 static void refreshPlugins(bool reload); WEBCORE_EXPORT PluginData& pluginData(); void clearPluginData(); -@@ -317,6 +320,10 @@ public: +@@ -318,6 +321,10 @@ public: DragCaretController& dragCaretController() const { return *m_dragCaretController; } #if ENABLE(DRAG_SUPPORT) DragController& dragController() const { return *m_dragController; } @@ -6877,7 +6868,7 @@ index ec7711fe3bdd79f7eab0330f1be3be0dcac09fe7..9697e9cd2f6d28c316ca1b8ab69031b0 #endif FocusController& focusController() const { return *m_focusController; } #if ENABLE(CONTEXT_MENUS) -@@ -475,6 +482,8 @@ public: +@@ -476,6 +483,8 @@ public: WEBCORE_EXPORT void effectiveAppearanceDidChange(bool useDarkAppearance, bool useElevatedUserInterfaceLevel); bool defaultUseDarkAppearance() const { return m_useDarkAppearance; } void setUseDarkAppearanceOverride(std::optional); @@ -6886,7 +6877,7 @@ index ec7711fe3bdd79f7eab0330f1be3be0dcac09fe7..9697e9cd2f6d28c316ca1b8ab69031b0 #if ENABLE(TEXT_AUTOSIZING) float textAutosizingWidth() const { return m_textAutosizingWidth; } -@@ -859,6 +868,11 @@ public: +@@ -860,6 +869,11 @@ public: WEBCORE_EXPORT Vector> editableElementsInRect(const FloatRect&) const; @@ -6898,7 +6889,7 @@ index ec7711fe3bdd79f7eab0330f1be3be0dcac09fe7..9697e9cd2f6d28c316ca1b8ab69031b0 #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -947,6 +961,9 @@ private: +@@ -950,6 +964,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -6908,7 +6899,7 @@ index ec7711fe3bdd79f7eab0330f1be3be0dcac09fe7..9697e9cd2f6d28c316ca1b8ab69031b0 #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1026,6 +1043,7 @@ private: +@@ -1029,6 +1046,7 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6916,7 +6907,7 @@ index ec7711fe3bdd79f7eab0330f1be3be0dcac09fe7..9697e9cd2f6d28c316ca1b8ab69031b0 #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1191,6 +1209,11 @@ private: +@@ -1194,6 +1212,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -6990,7 +6981,7 @@ index f90b8e6de036986779294cbb03c753ffcaf71801..af9672ae6605c341f2cbda8559e5441c #endif diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h -index aa6083e74ab6c3fee4ac2a55cc0f4cdb06b74de0..bf00b6524f333c33ec84457ef0a8722d01164fad 100644 +index 1f5bd43006b7278a25d6f4f2e221731ad3037a5e..a0d0a6b00a239800832aaa811373b3c6d93b67a9 100644 --- a/Source/WebCore/page/RuntimeEnabledFeatures.h +++ b/Source/WebCore/page/RuntimeEnabledFeatures.h @@ -202,6 +202,7 @@ public: @@ -7055,7 +7046,7 @@ index 3bec0aef174336939838fb1069fffbcb9f3d5604..566ef3806be3c5ccf1bb951251c2a90d RefPtr SocketProvider::createWebSocketChannel(Document&, WebSocketChannelClient&) diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp -index d88516747a44d6ada4ead0c6990e73b9142b1a1c..c2ed7258fbaddcdbc6344c2cbe71a98c2ac454c2 100644 +index 63315ba5ef688b8409c8a5f2c6ff40ecaf8fcd53..8c6dd28bd61d390c2baddfadb0a36882f8ff86cd 100644 --- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp @@ -292,6 +292,8 @@ bool ContentSecurityPolicy::protocolMatchesSelf(const URL& url) const @@ -7372,11 +7363,11 @@ index d47d193e8bee85c2d2a35e218decdd84b7212dc1..a1cd2f3b8f025436b596d1b1081357d9 #endif diff --git a/Source/WebCore/platform/ScrollableArea.h b/Source/WebCore/platform/ScrollableArea.h -index 30d39180788fd753125c4b5864d43f3030f02ebf..303916b2d1d8e42138cc6a5c88e17d61a30c34a2 100644 +index fe42c4ec6eba4f048f94fef590493690be53565a..4511ff4d65de37a66f77314bf5dd034d72e7aa1d 100644 --- a/Source/WebCore/platform/ScrollableArea.h +++ b/Source/WebCore/platform/ScrollableArea.h -@@ -101,7 +101,7 @@ public: - void doPostThumbMoveSnapping(ScrollbarOrientation); +@@ -103,7 +103,7 @@ public: + void stopKeyboardScrollAnimation(); #if ENABLE(TOUCH_EVENTS) - virtual bool handleTouchEvent(const PlatformTouchEvent&); @@ -9228,7 +9219,7 @@ index 0000000000000000000000000000000000000000..cf2b51f6f02837a1106f4d999f2f130e + +} // namespace WebCore diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp -index 02c5c15cf6878190c5a2e22282293c4fecd8a80c..d4fbcde2e0c432d2f6f61da722bdd59dbb91e5dc 100644 +index 11e3aeb4b20e6677be15f0ec6f2470f71b44b97b..e74dfdecafa9068fca6f469d21842529431e768d 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp @@ -2604,7 +2604,7 @@ LayoutRect RenderLayer::getRectToExpose(const LayoutRect& visibleRect, const Lay @@ -9287,7 +9278,7 @@ index 694008e0451edc5770142a0a6d9eed52b04ded80..ec93869f9486bdf7bd3bb56478c62469 WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, ScrollAlignment::Behavior); diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp -index 5d7b5ea146168df4d0497b2141f3b3d8d130b067..9255e8a434907fe1d69a5dc98a98c78369292ad4 100644 +index a613e0eed69c7373fbba5fc85ae9418ba57e7f72..05bee42b49bb3840dc0e7758bb4ef8dfd1f83be9 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp @@ -76,6 +76,11 @@ @@ -9302,7 +9293,7 @@ index 5d7b5ea146168df4d0497b2141f3b3d8d130b067..9255e8a434907fe1d69a5dc98a98c783 #if ENABLE(APPLE_PAY_REMOTE_UI) #include "WebPaymentCoordinatorProxyMessages.h" #endif -@@ -948,6 +953,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) +@@ -951,6 +956,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) #endif } @@ -9481,10 +9472,10 @@ index c0661ec5746af36f36ce03edef02dce66890a758..b45a8c263b424b1d4714d14241f5afcd 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 47d1dd7c17f075169bacfdf52f61743641a77d42..322b0381600672526128a777dcb26ff3afa22e68 100644 +index fe4db050370f4a426135a8f43ffef4b55c0ca45a..d1846620059353ad1ec5f0fc96a3624de75f92f9 100644 --- a/Source/WebKit/NetworkProcess/NetworkSession.h +++ b/Source/WebKit/NetworkProcess/NetworkSession.h -@@ -168,6 +168,9 @@ public: +@@ -169,6 +169,9 @@ public: bool isStaleWhileRevalidateEnabled() const { return m_isStaleWhileRevalidateEnabled; } @@ -9494,7 +9485,7 @@ index 47d1dd7c17f075169bacfdf52f61743641a77d42..322b0381600672526128a777dcb26ff3 #if ENABLE(SERVICE_WORKER) void addSoftUpdateLoader(std::unique_ptr&& loader) { m_softUpdateLoaders.add(WTFMove(loader)); } void removeSoftUpdateLoader(ServiceWorkerSoftUpdateLoader* loader) { m_softUpdateLoaders.remove(loader); } -@@ -220,6 +223,7 @@ protected: +@@ -221,6 +224,7 @@ protected: bool m_privateClickMeasurementDebugModeEnabled { false }; std::optional m_ephemeralMeasurement; bool m_isRunningEphemeralMeasurementTest { false }; @@ -9709,10 +9700,10 @@ index d602a5f90999fc7f440e2468d40332625ed37083..577b76728f762e7f5aa509531a65eaab void didReceiveMessage(IPC::Connection&, IPC::Decoder&); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 4e9a53195f1cafc101f775edf0557265f2aa0d9f..329d38f2d1d16cc01cbb306c6976a5a853076077 100644 +index 284979e61201d79b764538b17001a0da8a5728d4..bc16673844c8f6c1a846f18e0980c88df5ecb408 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -@@ -718,7 +718,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se +@@ -720,7 +720,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se NegotiatedLegacyTLS negotiatedLegacyTLS = NegotiatedLegacyTLS::No; if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { @@ -9721,7 +9712,7 @@ index 4e9a53195f1cafc101f775edf0557265f2aa0d9f..329d38f2d1d16cc01cbb306c6976a5a8 return completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]); NSURLSessionTaskTransactionMetrics *metrics = task._incompleteTaskMetrics.transactionMetrics.lastObject; -@@ -951,6 +951,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END +@@ -953,6 +953,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData(taskMetrics, networkDataTask->networkLoadMetrics())); @@ -9909,7 +9900,7 @@ index 1c427ddb78d6953fe8960c5692afde4f4f0eee85..cf33ff6076dd95ffe564f1dde89c177a WebCore::ShouldRelaxThirdPartyCookieBlocking m_shouldRelaxThirdPartyCookieBlocking { WebCore::ShouldRelaxThirdPartyCookieBlocking::No }; diff --git a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp -index 055e1504c3850ff293fd852019746d8490dee22c..457aa314c73a67114c64cb2c1866561411530268 100644 +index b20aa51a0f84f95ad8f0b7807d74171adc5205a3..902f52af2b6e590e769e0931ef029e96d553cba7 100644 --- a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp +++ b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp @@ -493,6 +493,8 @@ void NetworkDataTaskSoup::didSendRequest(GRefPtr&& inputStream) @@ -10063,7 +10054,7 @@ index 88c560cc9f62ce5c5e9cdef9d470de47fad45ae4..c3f101ee43d6f665d5b092a38d997199 set(WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2GTK_INSTALLED_HEADERS}) list(REMOVE_ITEM WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitEnumTypes.h) diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake -index f4cd5bef402b0c63e1fbb7a07132900ce6f738bb..e8287cc0173859a248ceb5e1d04f586f1e0e2943 100644 +index 87765f9418e07ec856895a2f1771af6838f3811a..88f64247ada0075c0fc8a669beee7b2f754f9288 100644 --- a/Source/WebKit/PlatformWPE.cmake +++ b/Source/WebKit/PlatformWPE.cmake @@ -166,6 +166,7 @@ set(WPE_API_INSTALLED_HEADERS @@ -10297,7 +10288,7 @@ index f2f3979fcac9dfd97d0e0ead600fe35eb8defd40..ac91412e1a96bdf521b1890a66e465dc NSEvent* nativeEvent() const { return m_nativeEvent.get(); } #elif PLATFORM(GTK) diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -index 2bb58ffb74287265ccc3855744fad5dd01e2c953..a0d65b6248b4e4c460e32d41b3027e83f376baa2 100644 +index 51c7a372047bca0fdb625d2591eced9132e9db6e..4fe13df08b5788f4dc92c158297cc164f3374ba6 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp @@ -119,6 +119,10 @@ @@ -10311,7 +10302,7 @@ index 2bb58ffb74287265ccc3855744fad5dd01e2c953..a0d65b6248b4e4c460e32d41b3027e83 // FIXME: Seems like we could use std::tuple to cut down the code below a lot! namespace IPC { -@@ -1375,6 +1379,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature +@@ -1377,6 +1381,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature encoder << windowFeatures.resizable; encoder << windowFeatures.fullscreen; encoder << windowFeatures.dialog; @@ -10321,7 +10312,7 @@ index 2bb58ffb74287265ccc3855744fad5dd01e2c953..a0d65b6248b4e4c460e32d41b3027e83 } bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& windowFeatures) -@@ -1403,6 +1410,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win +@@ -1405,6 +1412,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win return false; if (!decoder.decode(windowFeatures.dialog)) return false; @@ -10334,7 +10325,7 @@ index 2bb58ffb74287265ccc3855744fad5dd01e2c953..a0d65b6248b4e4c460e32d41b3027e83 return true; } -@@ -1416,6 +1429,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) +@@ -1418,6 +1431,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) #if PLATFORM(COCOA) encoder << dragData.pasteboardName(); encoder << dragData.fileNames(); @@ -10346,7 +10337,7 @@ index 2bb58ffb74287265ccc3855744fad5dd01e2c953..a0d65b6248b4e4c460e32d41b3027e83 #endif encoder << dragData.dragDestinationActionMask(); encoder << dragData.pageID(); -@@ -1439,9 +1457,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1441,9 +1459,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(applicationFlags)) return false; @@ -10364,7 +10355,7 @@ index 2bb58ffb74287265ccc3855744fad5dd01e2c953..a0d65b6248b4e4c460e32d41b3027e83 if (!decoder.decode(pasteboardName)) return false; -@@ -1457,8 +1482,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1459,8 +1484,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(pageID)) return false; @@ -10858,10 +10849,10 @@ index 85d6f74114f4e7f82d9502d1b99d69098d6a49b6..6896c9756edb233dda46c7031e1af699 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index 55319cbb57ae4abad3e32dfbfdb5ff2a8c741543..aeda255610c78cd66e253b57d248fbd56a2c5297 100644 +index f1998a60c6319bb1d3e7384f746a9effe0c72c2b..473a6c35a6872963504d26208993a80b4f3a1a99 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -313,11 +313,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -315,11 +315,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -10876,7 +10867,7 @@ index 55319cbb57ae4abad3e32dfbfdb5ff2a8c741543..aeda255610c78cd66e253b57d248fbd5 UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -326,6 +329,7 @@ UIProcess/PageLoadState.cpp +@@ -328,6 +331,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -10884,7 +10875,7 @@ index 55319cbb57ae4abad3e32dfbfdb5ff2a8c741543..aeda255610c78cd66e253b57d248fbd5 UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -366,6 +370,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -368,6 +372,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -10893,7 +10884,7 @@ index 55319cbb57ae4abad3e32dfbfdb5ff2a8c741543..aeda255610c78cd66e253b57d248fbd5 UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPreferences.cpp -@@ -487,7 +493,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -489,7 +495,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -10906,10 +10897,10 @@ index 55319cbb57ae4abad3e32dfbfdb5ff2a8c741543..aeda255610c78cd66e253b57d248fbd5 UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 057883ab00cfd700b2e4136a2c73ef0d9420bf70..cc3cac19061c793a93d5d8049a9a13642363cd26 100644 +index 209693e4b329c9310541a11738e0a71cb08b089f..fd5223322c2902978734b850b861b2ad7e210bc0 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -275,6 +275,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm +@@ -277,6 +277,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -10917,7 +10908,7 @@ index 057883ab00cfd700b2e4136a2c73ef0d9420bf70..cc3cac19061c793a93d5d8049a9a1364 UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -448,6 +449,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -449,6 +450,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -11135,7 +11126,7 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0 } #endif diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp -index 1fb2f27ad2b921a88eacad8c79684b68521e67ec..3a39258ee0765de211b09e34a78d9a5f6a741b5d 100644 +index a8da7fd485a4764996447f6282a79f20a487921e..afc6b251a6a3012f31c7f2f9c10da835b699b54a 100644 --- a/Source/WebKit/UIProcess/API/C/WKPage.cpp +++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp @@ -1776,6 +1776,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient @@ -11411,7 +11402,7 @@ index ca94c2173757a54a0c755cbf30f8e05a0b75c9cb..422c1379da9b091ae5903a42bc7625be #import diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorExtension.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorExtension.mm -index 46561d34314a79d42c57e59bf7927ad1fa451045..c84cbe9adc5236ad64240a18f5ff9a7215ba2ba2 100644 +index 66bb7757b884d36211ec3b29dde9eab226b2a0ce..108f46d2488bf66e84ff223dc4113ab068f533ec 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorExtension.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorExtension.mm @@ -24,7 +24,10 @@ @@ -11459,7 +11450,7 @@ index e23314a2904c781ca23a9f8d906299740677759e..941d0b483bba4647a9b4b160e9c3c9a7 { _processPoolConfiguration->setIsAutomaticProcessWarmingEnabled(prewarms); diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm -index 114f749d46624393fc21d198c2a29c4999dd7e30..ae13397f1fd5ff786639328547ee84a437a8109b 100644 +index d106906ed03e600e0381b5e22dcd3db016e954e3..599eaf4ab5786c805bc800789b521a7ba1b4b6a9 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm @@ -24,6 +24,7 @@ @@ -11697,7 +11688,7 @@ index 0000000000000000000000000000000000000000..e0b1da48465c850f541532ed961d1b77 +WebKit::WebPageProxy* webkitBrowserInspectorCreateNewPageInContext(WebKitWebContext*); +void webkitBrowserInspectorQuitApplication(); diff --git a/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp b/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp -index 6c1cf45443633e4c548c146657bd52a574362ab3..7259c07ec55f92d0d74ab46376aafdce79af90d3 100644 +index 64c90f9f25fc44911e819ab94fa973bf0b82a0e4..8d8c739fb903b71f7881801cb41901f241709b2a 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp @@ -98,6 +98,10 @@ private: @@ -12731,10 +12722,10 @@ index e679695a3fe1a0aef28dd5af0248d6906f341987..7a8898483f4a22d668a54c56a840fed9 bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRequestGeolocationPermissionForFrameDecisionHandler : 1; diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm -index 107fa24ce14753407dfacf05608486b5d9da2eed..30452ec6fc8b0c2c13e60c61e1aea919df720c27 100644 +index 28c20e9b3c80b092d47824bafa9f0c2de23a8488..f51c0e10e053e89fbf3e362df2c6d62a88798c6a 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm -@@ -106,6 +106,7 @@ void UIDelegate::setDelegate(id delegate) +@@ -109,6 +109,7 @@ void UIDelegate::setDelegate(id delegate) m_delegateMethods.webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:)]; m_delegateMethods.webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:completionHandler:)]; m_delegateMethods.webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:completionHandler:)]; @@ -12742,7 +12733,7 @@ index 107fa24ce14753407dfacf05608486b5d9da2eed..30452ec6fc8b0c2c13e60c61e1aea919 m_delegateMethods.webViewRequestStorageAccessPanelUnderFirstPartyCompletionHandler = [delegate respondsToSelector:@selector(_webView:requestStorageAccessPanelForDomain:underCurrentDomain:completionHandler:)]; m_delegateMethods.webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(_webView:runBeforeUnloadConfirmPanelWithMessage:initiatedByFrame:completionHandler:)]; m_delegateMethods.webViewRequestGeolocationPermissionForOriginDecisionHandler = [delegate respondsToSelector:@selector(_webView:requestGeolocationPermissionForOrigin:initiatedByFrame:decisionHandler:)]; -@@ -376,6 +377,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St +@@ -379,6 +380,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St }).get()]; } @@ -12838,10 +12829,10 @@ index 915b7f4c648e2fe0198efd15b55ff451181ad6f7..994a1eb25362a259f33e9307833f66d1 #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index 4c211f5fcebcd1141847de8111ea12480c7036f3..a692dd10f01465ca45e270551ed52f7dc8a31df3 100644 +index b1215fc9b22424bd852e3cca6cf1fbf6121be678..d39050a9b959de92873de8dfc2196531c8e40383 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -@@ -449,7 +449,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process +@@ -455,7 +455,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process auto screenProperties = WebCore::collectScreenProperties(); parameters.screenProperties = WTFMove(screenProperties); #if PLATFORM(MAC) @@ -12850,7 +12841,7 @@ index 4c211f5fcebcd1141847de8111ea12480c7036f3..a692dd10f01465ca45e270551ed52f7d #endif #if PLATFORM(IOS) -@@ -760,8 +760,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -766,8 +766,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -12862,7 +12853,7 @@ index 4c211f5fcebcd1141847de8111ea12480c7036f3..a692dd10f01465ca45e270551ed52f7d m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSApp queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h -index 590b87c1c5c2c09ace8b9f1710db937842b156c5..920e083b18aeedb6d993f2e94de9e757b94ec9c3 100644 +index 1c574458ef308c1a05541bd6add2bda50400d260..babdf3eb59c550c6c4b215bc2c078dade4cf4e57 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h @@ -514,6 +514,9 @@ public: @@ -12876,7 +12867,7 @@ index 590b87c1c5c2c09ace8b9f1710db937842b156c5..920e083b18aeedb6d993f2e94de9e757 void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -index 402d2ccb37e5d2731c70601ec308cd6627354df7..d9565418da60426d794f16f9053e88ca8ad7c55b 100644 +index 69f43a09627637eef9562ab3bf9266917b12f10f..db3dbdc84d5d8097e8f306493159eb288ef07364 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm @@ -2615,6 +2615,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() @@ -16546,7 +16537,7 @@ index 7a14cfba15c103a2d4fe263fa49d25af3c396ec2..3ee0e154349661632799057c71f1d1f1 BOOL result = ::CreateProcess(0, commandLine.data(), 0, 0, true, 0, 0, 0, &startupInfo, &processInformation); diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h -index b66a7f38cd6f3b337f205356acda448100c3fca8..3f5c15caee1a7c033729ff90db3dbb7eb38c001a 100644 +index 9e7df1841ae9f59908477cdda1adc510586796e0..8303055373dcfbff8c598c5c00bb8a5bf3dc3ee6 100644 --- a/Source/WebKit/UIProcess/PageClient.h +++ b/Source/WebKit/UIProcess/PageClient.h @@ -324,6 +324,11 @@ public: @@ -17593,10 +17584,10 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21fa610f0eb 100644 +index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c5d0414c4 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp -@@ -246,6 +246,9 @@ +@@ -247,6 +247,9 @@ #if PLATFORM(GTK) #include "GtkSettingsManager.h" @@ -17606,7 +17597,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f #include #endif -@@ -618,6 +621,10 @@ WebPageProxy::~WebPageProxy() +@@ -620,6 +623,10 @@ WebPageProxy::~WebPageProxy() if (m_preferences->mediaSessionCoordinatorEnabled()) GroupActivitiesSessionNotifier::sharedNotifier().removeWebPage(*this); #endif @@ -17616,8 +17607,8 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f +#endif } - // FIXME: Should return a const PageClient& and add a separate non-const -@@ -1004,6 +1011,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) + void WebPageProxy::addAllMessageReceivers() +@@ -1018,6 +1025,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) m_pageLoadState.didSwapWebProcesses(); if (reason != ProcessLaunchReason::InitialProcess) m_drawingArea->waitForBackingStoreUpdateOnNextPaint(); @@ -17625,7 +17616,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f } void WebPageProxy::didAttachToRunningProcess() -@@ -1357,6 +1365,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1371,6 +1379,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -17647,7 +17638,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1906,6 +1929,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1920,6 +1943,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -17679,7 +17670,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2096,6 +2144,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2110,6 +2158,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -17705,7 +17696,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2668,6 +2735,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2682,6 +2749,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -17714,7 +17705,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2678,6 +2747,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2692,6 +2761,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -17723,7 +17714,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2693,18 +2764,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2713,6 +2807,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2727,6 +2821,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -17793,7 +17784,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2725,8 +2837,18 @@ void WebPageProxy::didStartDrag() +@@ -2739,8 +2851,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17813,7 +17804,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2831,16 +2953,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2845,16 +2967,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17859,7 +17850,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3059,7 +3203,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3073,7 +3217,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17868,7 +17859,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -3092,7 +3236,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3106,7 +3250,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -17877,7 +17868,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3481,6 +3625,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3495,6 +3639,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -17886,7 +17877,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f receivedPolicyDecision(policyAction, navigation, WTFMove(policies), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3547,6 +3693,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3561,6 +3707,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, RefPtr&& websitePolicies, std::variant, Ref>&& navigationActionOrResponse, Ref&& sender, std::optional sandboxExtensionHandle, WillContinueLoadInNewProcess willContinueLoadInNewProcess) { @@ -17894,7 +17885,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4269,6 +4416,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4283,6 +4430,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17906,7 +17897,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4602,6 +4754,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4616,6 +4768,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17914,7 +17905,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4824,6 +4977,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4840,6 +4993,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17923,7 +17914,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f // If the provisional page's load fails then we destroy the provisional page. if (m_provisionalPage && m_provisionalPage->mainFrame() == &frame && willContinueLoading == WillContinueLoading::No) m_provisionalPage = nullptr; -@@ -5273,7 +5428,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5308,7 +5463,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, NavigationActionData&& navigationActionData, FrameInfoData&& originatingFrameInfo, std::optional originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&& request, IPC::FormDataReference&& requestBody, WebCore::ResourceResponse&& redirectResponse, const UserData& userData, uint64_t listenerID) { @@ -17939,7 +17930,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5810,6 +5972,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5845,6 +6007,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa auto* originatingPage = m_process->webPage(originatingPageID); auto originatingFrameInfo = API::FrameInfo::create(WTFMove(originatingFrameInfoData), originatingPage); auto mainFrameURL = m_mainFrame ? m_mainFrame->url() : URL(); @@ -17947,7 +17938,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f auto completionHandler = [this, protectedThis = Ref { *this }, mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -5853,6 +6016,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5888,6 +6051,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17955,7 +17946,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f } void WebPageProxy::exitFullscreenImmediately() -@@ -5888,6 +6052,10 @@ void WebPageProxy::closePage() +@@ -5923,6 +6087,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17966,7 +17957,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -5924,6 +6092,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -5959,6 +6127,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f } runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { @@ -17975,7 +17966,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -5945,6 +6115,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -5980,6 +6150,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17984,7 +17975,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { page.m_uiClient->runJavaScriptConfirm(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](bool result) mutable { -@@ -5968,6 +6140,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -6003,6 +6175,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17993,7 +17984,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply), defaultValue](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { page.m_uiClient->runJavaScriptPrompt(page, message, defaultValue, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](auto& result) mutable { -@@ -6128,6 +6302,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6163,6 +6337,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -18002,7 +17993,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7360,6 +7536,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7395,6 +7571,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -18011,7 +18002,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f } break; } -@@ -7374,10 +7552,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7409,10 +7587,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) pageClient().wheelEventWasNotHandledByWebCore(oldestProcessedEvent); } @@ -18028,7 +18019,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f break; } -@@ -7386,7 +7567,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7421,7 +7602,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) case WebEvent::RawKeyDown: case WebEvent::Char: { LOG(KeyHandling, "WebPageProxy::didReceiveEvent: %s (queue empty %d)", webKeyboardEventTypeString(type), m_keyEventQueue.isEmpty()); @@ -18036,7 +18027,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7405,7 +7585,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7440,7 +7620,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) // The call to doneWithKeyEvent may close this WebPage. // Protect against this being destroyed. Ref protect(*this); @@ -18044,7 +18035,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7414,6 +7593,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7449,6 +7628,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -18052,7 +18043,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f } break; } -@@ -7768,7 +7948,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7803,7 +7983,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%{public}s", processTerminationReasonToString(reason)); @@ -18064,7 +18055,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8141,6 +8324,7 @@ static const Vector& mediaRelatedIOKitClasses() +@@ -8184,6 +8367,7 @@ static const Vector& mediaRelatedIOKitClasses() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -18072,7 +18063,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8334,6 +8518,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8377,6 +8561,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.shouldRelaxThirdPartyCookieBlocking = m_configuration->shouldRelaxThirdPartyCookieBlocking(); parameters.canUseCredentialStorage = m_canUseCredentialStorage; @@ -18081,7 +18072,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f #if PLATFORM(GTK) parameters.gtkSettings = GtkSettingsManager::singleton().settingsState(); #endif -@@ -8414,6 +8600,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8457,6 +8643,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -18096,7 +18087,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8507,6 +8701,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8550,6 +8744,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -18113,7 +18104,7 @@ index 71fadfded6f4e9d0d37019224448fdc03878706d..03584d8288f405581dad67828be7a21f // 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 cc0024ab9f5b7d6829ffa202531b15d569e40019..33d6d492cd9ee319ea71cf3534c86ca55d6b8597 100644 +index ceea92766cf9eb132b961890a56e13cbb6efc37f..50a46f4d718c8ddb82171046f84d4037cec6478f 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -18124,7 +18115,7 @@ index cc0024ab9f5b7d6829ffa202531b15d569e40019..33d6d492cd9ee319ea71cf3534c86ca5 #include "LayerTreeContext.h" #include "MediaKeySystemPermissionRequestManagerProxy.h" #include "MediaPlaybackState.h" -@@ -146,8 +147,11 @@ +@@ -148,8 +149,11 @@ #include "EndowmentStateTracker.h" #endif @@ -18136,7 +18127,7 @@ index cc0024ab9f5b7d6829ffa202531b15d569e40019..33d6d492cd9ee319ea71cf3534c86ca5 #endif #if ENABLE(TOUCH_EVENTS) -@@ -169,6 +173,14 @@ +@@ -170,6 +174,14 @@ #include "ArgumentCodersGtk.h" #endif @@ -18151,7 +18142,7 @@ index cc0024ab9f5b7d6829ffa202531b15d569e40019..33d6d492cd9ee319ea71cf3534c86ca5 #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY) #include #include -@@ -248,6 +260,7 @@ class AuthenticationChallenge; +@@ -249,6 +261,7 @@ class AuthenticationChallenge; class CertificateInfo; class Cursor; class DragData; @@ -18159,7 +18150,7 @@ index cc0024ab9f5b7d6829ffa202531b15d569e40019..33d6d492cd9ee319ea71cf3534c86ca5 class FloatRect; class FontAttributeChanges; class FontChanges; -@@ -255,7 +268,6 @@ class GraphicsLayer; +@@ -256,7 +269,6 @@ class GraphicsLayer; class IntSize; class ProtectionSpace; class RunLoopObserver; @@ -18167,7 +18158,7 @@ index cc0024ab9f5b7d6829ffa202531b15d569e40019..33d6d492cd9ee319ea71cf3534c86ca5 class SharedBuffer; class SpeechRecognitionRequest; class TextIndicator; -@@ -535,6 +547,8 @@ public: +@@ -536,6 +548,8 @@ public: void setControlledByAutomation(bool); WebPageInspectorController& inspectorController() { return *m_inspectorController; } @@ -18176,7 +18167,7 @@ index cc0024ab9f5b7d6829ffa202531b15d569e40019..33d6d492cd9ee319ea71cf3534c86ca5 #if PLATFORM(IOS_FAMILY) void showInspectorIndication(); -@@ -619,6 +633,11 @@ public: +@@ -620,6 +634,11 @@ public: void setPageLoadStateObserver(std::unique_ptr&&); @@ -18188,7 +18179,7 @@ index cc0024ab9f5b7d6829ffa202531b15d569e40019..33d6d492cd9ee319ea71cf3534c86ca5 void initializeWebPage(); void setDrawingArea(std::unique_ptr&&); -@@ -646,6 +665,7 @@ public: +@@ -647,6 +666,7 @@ public: void closePage(); void addPlatformLoadParameters(WebProcessProxy&, LoadParameters&); @@ -18196,7 +18187,7 @@ index cc0024ab9f5b7d6829ffa202531b15d569e40019..33d6d492cd9ee319ea71cf3534c86ca5 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); -@@ -1165,6 +1185,7 @@ public: +@@ -1166,6 +1186,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -18204,7 +18195,7 @@ index cc0024ab9f5b7d6829ffa202531b15d569e40019..33d6d492cd9ee319ea71cf3534c86ca5 void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1239,14 +1260,20 @@ public: +@@ -1240,14 +1261,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -18226,7 +18217,7 @@ index cc0024ab9f5b7d6829ffa202531b15d569e40019..33d6d492cd9ee319ea71cf3534c86ca5 #endif void processDidBecomeUnresponsive(); -@@ -1490,6 +1517,8 @@ public: +@@ -1491,6 +1518,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -18235,7 +18226,7 @@ index cc0024ab9f5b7d6829ffa202531b15d569e40019..33d6d492cd9ee319ea71cf3534c86ca5 #endif #if ENABLE(WEB_CRYPTO) -@@ -2601,6 +2630,7 @@ private: +@@ -2615,6 +2644,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -18243,7 +18234,7 @@ index cc0024ab9f5b7d6829ffa202531b15d569e40019..33d6d492cd9ee319ea71cf3534c86ca5 #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2861,6 +2891,20 @@ private: +@@ -2875,6 +2905,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -18264,7 +18255,7 @@ index cc0024ab9f5b7d6829ffa202531b15d569e40019..33d6d492cd9ee319ea71cf3534c86ca5 #endif PageLoadState m_pageLoadState; -@@ -3069,6 +3113,9 @@ private: +@@ -3086,6 +3130,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -18275,7 +18266,7 @@ index cc0024ab9f5b7d6829ffa202531b15d569e40019..33d6d492cd9ee319ea71cf3534c86ca5 #if PLATFORM(IOS_FAMILY) && ENABLE(DEVICE_ORIENTATION) std::unique_ptr m_webDeviceOrientationUpdateProviderProxy; diff --git a/Source/WebKit/UIProcess/WebPageProxy.messages.in b/Source/WebKit/UIProcess/WebPageProxy.messages.in -index 5edf31d343aed8d72169db97352e5b71f7285088..2c04a896db54b560381e400ba0a7d5deae7c5c04 100644 +index f5705a06115a22e8e3076bc5f95bc9dc1be7c46a..6e10bc4717252db7bf44ed2d20950254a5bcf293 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -18372,10 +18363,10 @@ index 139517bdb24b54c48edfbbeb013de929a5f14ef6..91c6db9cb4d8ad4375c39a4c2409664c WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index 1d55079d2146b827cd428394f02373aebe7e829d..fd1566037aac5c943b4cd8b42e1ad6dc96109e7c 100644 +index fffca2266fe7015a6c039b2937aa648891b3cd46..a74df874c619a92a696e57fe078c86f9a6b5b9a5 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -2219,6 +2219,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O +@@ -2220,6 +2220,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O networkProcess().renameOriginInWebsiteData(m_sessionID, oldName, newName, dataTypes, WTFMove(completionHandler)); } @@ -18394,7 +18385,7 @@ index 1d55079d2146b827cd428394f02373aebe7e829d..fd1566037aac5c943b4cd8b42e1ad6dc void WebsiteDataStore::hasAppBoundSession(CompletionHandler&& completionHandler) const { diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -index 95d2d00f0ab077082234c654c101f0378489a0ee..68bf8ceee17042bfc5aa4e43ba84a5d364795fbe 100644 +index 42ee676ccda4ab14b5a4289ee1a571d12edc5feb..317cbdaf23103b1e7b55a9cc310d2d99f2b73312 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h @@ -87,6 +87,7 @@ class SecKeyProxyStore; @@ -20430,10 +20421,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29ed6b48bc 100644 +index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3b6c391e0 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1985,6 +1985,18 @@ +@@ -1994,6 +1994,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 */; }; @@ -20452,7 +20443,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 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 */; }; -@@ -2042,6 +2054,9 @@ +@@ -2051,6 +2063,9 @@ E5CB07DC20E1678F0022C183 /* WKFormColorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */; }; E5DEFA6826F8F42600AB68DB /* PhotosUISPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E5DEFA6726F8F42600AB68DB /* PhotosUISPI.h */; }; ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -20462,7 +20453,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 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, ); }; }; -@@ -6016,6 +6031,19 @@ +@@ -6045,6 +6060,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 = ""; }; @@ -20482,7 +20473,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 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 = ""; }; -@@ -6136,6 +6164,14 @@ +@@ -6165,6 +6193,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 = ""; }; @@ -20497,7 +20488,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 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 = ""; }; -@@ -6275,6 +6311,7 @@ +@@ -6304,6 +6340,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -20505,7 +20496,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -8201,6 +8238,7 @@ +@@ -8235,6 +8272,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -20513,7 +20504,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -9276,6 +9314,7 @@ +@@ -9328,6 +9366,7 @@ isa = PBXGroup; children = ( 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -20521,7 +20512,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, ); -@@ -9761,6 +9800,12 @@ +@@ -9833,6 +9872,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -20534,7 +20525,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 ); path = Agents; sourceTree = ""; -@@ -9769,6 +9814,7 @@ +@@ -9841,6 +9886,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -20542,7 +20533,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -10290,6 +10336,12 @@ +@@ -10362,6 +10408,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -20555,7 +20546,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -10592,6 +10644,7 @@ +@@ -10664,6 +10716,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -20563,7 +20554,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -11191,6 +11244,11 @@ +@@ -11263,6 +11316,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -20575,7 +20566,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, C1817362205844A900DFDA65 /* DisplayLink.cpp */, -@@ -12062,6 +12120,7 @@ +@@ -12137,6 +12195,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -20583,7 +20574,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -12368,6 +12427,7 @@ +@@ -12442,6 +12501,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -20591,7 +20582,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -12384,6 +12444,7 @@ +@@ -12458,6 +12518,7 @@ 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, F40BBB41257FF46E0067463A /* GPUProcessWakeupMessageArguments.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -20599,7 +20590,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -12531,6 +12592,7 @@ +@@ -12608,6 +12669,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -20607,7 +20598,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, 93085DE026E5BCFD000EC6A7 /* NetworkStorageManager.h in Headers */, -@@ -12623,6 +12685,7 @@ +@@ -12700,6 +12762,7 @@ BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -20615,7 +20606,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */, -@@ -12645,6 +12708,7 @@ +@@ -12722,6 +12785,7 @@ CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, @@ -20623,7 +20614,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -12967,6 +13031,7 @@ +@@ -13046,6 +13110,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -20631,7 +20622,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -13099,6 +13164,7 @@ +@@ -13178,6 +13243,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -20639,7 +20630,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -13152,6 +13218,7 @@ +@@ -13231,6 +13297,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -20647,7 +20638,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -13308,6 +13375,7 @@ +@@ -13387,6 +13454,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -20655,7 +20646,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -14621,6 +14689,7 @@ +@@ -14726,6 +14794,7 @@ C1A152D724E5A29A00978C8B /* HandleXPCEndpointMessages.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -20663,7 +20654,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 9BF5EC642541145600984E77 /* JSIPCBinding.cpp in Sources */, 2D913441212CF9F000128AFD /* JSNPMethod.cpp in Sources */, 2D913442212CF9F000128AFD /* JSNPObject.cpp in Sources */, -@@ -14640,6 +14709,7 @@ +@@ -14745,6 +14814,7 @@ 2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */, 2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */, 2D92A77A212B6A6100F493FD /* Module.cpp in Sources */, @@ -20671,7 +20662,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 57B826452304F14000B72EB0 /* NearFieldSoftLink.mm in Sources */, 2D913443212CF9F000128AFD /* NetscapeBrowserFuncs.cpp in Sources */, 2D913444212CF9F000128AFD /* NetscapePlugin.cpp in Sources */, -@@ -14666,6 +14736,7 @@ +@@ -14771,6 +14841,7 @@ 1A2D8439127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp in Sources */, 2D92A792212B6AD400F493FD /* NPObjectProxy.cpp in Sources */, 2D92A793212B6AD400F493FD /* NPRemoteObjectMap.cpp in Sources */, @@ -20679,7 +20670,7 @@ index e057238754cac3f1232bef19cba22e04e9482708..66dbb3b9bad437f2751c3d56a35e1c29 2D913447212CF9F000128AFD /* NPRuntimeObjectMap.cpp in Sources */, 2D913448212CF9F000128AFD /* NPRuntimeUtilities.cpp in Sources */, 2D92A794212B6AD400F493FD /* NPVariantData.cpp in Sources */, -@@ -14973,6 +15044,7 @@ +@@ -15078,6 +15149,7 @@ 2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -20946,7 +20937,7 @@ index 2eb0886f13ed035a53b8eaa60605de4dfe53fbe3..c46393209cb4f80704bbc9268fad4371 { } diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -index 13d638748e10b5df37f907b83a1d593e4befb3af..a07de293a2de72e532d14414160e0bb4f9375b79 100644 +index 99a51ab5feaae479a03a3d581c889470b00ee9c2..3d69e88bf8ad783221b9ff18b0647a0bb21ea59d 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp @@ -1572,13 +1572,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() @@ -21326,7 +21317,7 @@ index f127d64d005ab7b93875591b94a5899205e91579..df0de26e4dc449a0fbf93e7037444df4 uint64_t m_navigationID; }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -index 7f434420444e3c6948a4737fbebe52aa4464c34f..892f36750aad1558efebf1b1a853563c9aed499f 100644 +index c1866a25bb9d47671108c409a8f2f4b33aaa37f7..205e1a27f2f1fe1f5ce80b2a561c6021c0bdca96 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp @@ -897,6 +897,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) @@ -21578,7 +21569,7 @@ index 7f434420444e3c6948a4737fbebe52aa4464c34f..892f36750aad1558efebf1b1a853563c void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6722,6 +6835,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6731,6 +6844,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -21589,7 +21580,7 @@ index 7f434420444e3c6948a4737fbebe52aa4464c34f..892f36750aad1558efebf1b1a853563c return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index 53961a03a52c3819bca29e0b717dbc5008f9fe5c..000832e52db721b72a5cb5beb6f212b920834c91 100644 +index 1d8fdf4462e1ac5b68c5390c617133b8d64ff72e..f66e42e7e4a578fd3aaa86a369694fcd0d5dd27e 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -121,6 +121,10 @@ typedef struct _AtkObject AtkObject; @@ -21627,7 +21618,7 @@ index 53961a03a52c3819bca29e0b717dbc5008f9fe5c..000832e52db721b72a5cb5beb6f212b9 #endif void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&); -@@ -1238,6 +1245,7 @@ public: +@@ -1241,6 +1248,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -21635,7 +21626,7 @@ index 53961a03a52c3819bca29e0b717dbc5008f9fe5c..000832e52db721b72a5cb5beb6f212b9 void insertNewlineInQuotedContent(); -@@ -1599,6 +1607,7 @@ private: +@@ -1602,6 +1610,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -21643,7 +21634,7 @@ index 53961a03a52c3819bca29e0b717dbc5008f9fe5c..000832e52db721b72a5cb5beb6f212b9 void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1636,6 +1645,7 @@ private: +@@ -1639,6 +1648,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -21651,7 +21642,7 @@ index 53961a03a52c3819bca29e0b717dbc5008f9fe5c..000832e52db721b72a5cb5beb6f212b9 #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1759,9 +1769,7 @@ private: +@@ -1762,9 +1772,7 @@ private: void countStringMatches(const String&, OptionSet, uint32_t maxMatchCount); void replaceMatches(const Vector& matchIndices, const String& replacementText, bool selectionOnly, CompletionHandler&&); @@ -21661,7 +21652,7 @@ index 53961a03a52c3819bca29e0b717dbc5008f9fe5c..000832e52db721b72a5cb5beb6f212b9 void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2296,6 +2304,7 @@ private: +@@ -2299,6 +2307,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -21670,7 +21661,7 @@ index 53961a03a52c3819bca29e0b717dbc5008f9fe5c..000832e52db721b72a5cb5beb6f212b9 bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 782ff282baa3dd8a38b0a8aca319332a9a3c8139..aea7be17f5e774bd8062b9805701650dd8547cff 100644 +index 9eb71212bed7b056d6c634a93fb6e9e2f2efe519..cce9204251b044ebe1598c4e31f66b055b47038e 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in @@ -136,6 +136,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType @@ -21722,7 +21713,7 @@ index 782ff282baa3dd8a38b0a8aca319332a9a3c8139..aea7be17f5e774bd8062b9805701650d RequestDragStart(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) RequestAdditionalItemsForDragSession(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -index b3c48bbb4a28b80cdcc1b89800780a7db90a2516..727e875ab7991fe26503bd30a4776412dbe47f62 100644 +index 060f8e0d6e67cb84f9c3b28f0b235e666040734a..b245aa5de5c74a32ad36fad82fd0b692bfbe29db 100644 --- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm +++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm @@ -836,21 +836,37 @@ String WebPage::platformUserAgent(const URL&) const @@ -21814,7 +21805,7 @@ index 0cf4707d44fb20a2cb125aaf9465d1282bf84651..59a6c108a4be8ef05ae01cb594898357 } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index f85ca363f4ef25f2921da585fd1b64c13e993644..7eb38d21d8bac75779e82f9ebc7b820783c79418 100644 +index 462c3c27814a1296cd3d3a8d4dcc29e20d01fdbc..58d583c6a791388681bdea8810b5bff0b1695e85 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -89,6 +89,7 @@ @@ -21825,7 +21816,7 @@ index f85ca363f4ef25f2921da585fd1b64c13e993644..7eb38d21d8bac75779e82f9ebc7b8207 #include #include #include -@@ -349,6 +350,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter +@@ -353,6 +354,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter platformInitializeProcess(parameters); updateCPULimit(); @@ -21863,7 +21854,7 @@ index 4b078549dc4202fbb6c272ef205ab394e3947163..baf9ec17836fea22c478c4a58368a466 - (void)touch:(WebEvent *)event { diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm -index 6d697dd87bd706ba9da7439f2db2d5c15a44dd31..19b69693368f06948b26807de61d80fdbfbcf817 100644 +index 3b10dfaffc97b4b80e3e0321334122ac6347ddff..c99fe54f99266984975ac785330afaa0f7776fde 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm @@ -4040,7 +4040,7 @@ IGNORE_WARNINGS_END @@ -21916,7 +21907,7 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 0cea3ba03a4c045e353e533a73272edaaf0d4f5b..77ba22cfa44c2e74a7a00f6eb051ebf103e44775 100644 +index 17144e3222cab6316b4720ed1cfefc56e104685c..77ba22cfa44c2e74a7a00f6eb051ebf103e44775 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -5,6 +5,7 @@ WEBKIT_OPTION_BEGIN() @@ -21927,15 +21918,6 @@ index 0cea3ba03a4c045e353e533a73272edaaf0d4f5b..77ba22cfa44c2e74a7a00f6eb051ebf1 set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") -@@ -12,7 +13,7 @@ find_package(Cairo 1.14.0 REQUIRED) - find_package(Fontconfig 2.8.0 REQUIRED) - find_package(Freetype 2.4.2 REQUIRED) - find_package(LibGcrypt 1.6.0 REQUIRED) --find_package(GLIB 2.58.3 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule) -+find_package(GLIB 2.56.4 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule) - find_package(HarfBuzz 0.9.18 REQUIRED COMPONENTS ICU) - find_package(ICU 61.2 REQUIRED COMPONENTS data i18n uc) - find_package(JPEG REQUIRED) @@ -28,6 +29,10 @@ find_package(EGL) find_package(OpenGL) find_package(OpenGLES2) @@ -22001,10 +21983,10 @@ index 0cea3ba03a4c045e353e533a73272edaaf0d4f5b..77ba22cfa44c2e74a7a00f6eb051ebf1 # Finalize the value for all options. Do not attempt to use an option before diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake -index 8933dc3eeef31c26eaff32a4ab7685d969293003..81fe25d78c38cfa35c5b4930c16b3adcb2e2a2e8 100644 +index a36e69382b629305738ca35113fc136e16b23801..c3b528bf2e07f56dd90b033d99c49a108f56bc83 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake -@@ -3,12 +3,13 @@ include(VersioningUtils) +@@ -3,6 +3,7 @@ include(VersioningUtils) SET_PROJECT_VERSION(2 33 2) @@ -22012,13 +21994,6 @@ index 8933dc3eeef31c26eaff32a4ab7685d969293003..81fe25d78c38cfa35c5b4930c16b3adc set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") find_package(Cairo 1.14.0 REQUIRED) - find_package(Fontconfig 2.8.0 REQUIRED) - find_package(Freetype 2.4.2 REQUIRED) --find_package(GLIB 2.58.3 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule) -+find_package(GLIB 2.56.4 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule) - find_package(HarfBuzz 0.9.18 REQUIRED COMPONENTS ICU) - find_package(ICU 61.2 REQUIRED COMPONENTS data i18n uc) - find_package(JPEG REQUIRED) @@ -54,7 +55,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -22653,7 +22628,7 @@ index ddc2a96ac68cd51d5f4efeca78a118db91709aa2..57a78f54e72d264daa27faa53ac2a30c # WebInspectorUI must come after JavaScriptCore and WebCore but before WebKit and WebKit2 my $webKitIndex = first { $projects[$_] eq "Source/WebKitLegacy" } 0..$#projects; diff --git a/Tools/WebKitTestRunner/PlatformGTK.cmake b/Tools/WebKitTestRunner/PlatformGTK.cmake -index 8962e645e9a9ac6bd35de9194e1b3f8447259e8d..a4725c6e5754484e0ad2b08562bebbf8b03487d4 100644 +index 6d570521e0952e78ccf73eb01a15f7937a013a78..3b5013eb982a68741ef2be52842b56ef059bc321 100644 --- a/Tools/WebKitTestRunner/PlatformGTK.cmake +++ b/Tools/WebKitTestRunner/PlatformGTK.cmake @@ -26,6 +26,7 @@ list(APPEND WebKitTestRunner_LIBRARIES @@ -22665,7 +22640,7 @@ index 8962e645e9a9ac6bd35de9194e1b3f8447259e8d..a4725c6e5754484e0ad2b08562bebbf8 list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES diff --git a/Tools/WebKitTestRunner/PlatformWPE.cmake b/Tools/WebKitTestRunner/PlatformWPE.cmake -index 775b41868718ea6734efc9082f8161eee2e0015e..68a720c0cb01d534653a259536c481683873680d 100644 +index b0f26645ea360cc7e55afbfbe2ceb4e5791a0fb7..e5401df8302bb7b1950d1c92caf9ae5851d9c8a4 100644 --- a/Tools/WebKitTestRunner/PlatformWPE.cmake +++ b/Tools/WebKitTestRunner/PlatformWPE.cmake @@ -31,6 +31,7 @@ list(APPEND WebKitTestRunner_LIBRARIES @@ -22677,10 +22652,10 @@ index 775b41868718ea6734efc9082f8161eee2e0015e..68a720c0cb01d534653a259536c48168 list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp -index feb2a397e42a368c4179ecb31d6d192063f19a07..867ccf2c09a1be59872f77fd83eff5302be1b037 100644 +index 04f1dd2028fe85ddaa5e6548bbd3857fa40648da..e802366d5759a0a6934d55537c099467c1d811b9 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp -@@ -796,6 +796,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options) +@@ -797,6 +797,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options) 0, // requestStorageAccessConfirm shouldAllowDeviceOrientationAndMotionAccess, runWebAuthenticationPanel, @@ -22689,10 +22664,10 @@ index feb2a397e42a368c4179ecb31d6d192063f19a07..867ccf2c09a1be59872f77fd83eff530 decidePolicyForMediaKeySystemPermissionRequest }; diff --git a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm -index eb11426f54f1406f5343dfdf1457d0b388c47dc3..0e207d103077306ff6c1fffde50a69fc89ba0268 100644 +index 5d11e2ff86c913c92b1c8749617f0f68c0723a35..cec4af5c4f99c1d18df032f93a5ee55f731b2bf5 100644 --- a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm +++ b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm -@@ -786,4 +786,51 @@ void EventSenderProxy::scaleGestureEnd(double scale) +@@ -826,4 +826,51 @@ void EventSenderProxy::scaleGestureEnd(double scale) #endif // ENABLE(MAC_GESTURE_EVENTS)