diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 9cd6ba2400..0c1410a31b 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1524 -Changed: yurys@chromium.org Mon 02 Aug 2021 03:47:03 PM PDT +1525 +Changed: dkolesa@igalia.com Wed Aug 4 07:01:06 PM CEST 2021 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 39d9e627b4..1c0e07bdd3 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="2cf99c4a7d4fb944ebb1f2b7cb4ddd864be6d141" +BASE_REVISION="29e16514d1f040bfd22e50723e0a10b643c625e4" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 2e6decced1..b034bf9b25 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -2011,10 +2011,10 @@ index 7a6bead41cfa95d415975b5ce63ddd9e00c6f295..a95f0980cd723b21b740ff4dda373e22 type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index 4aaf759ab041d9bbd419ab32ba485936cf23fc7f..a13e708f98ef3a4efc4198d10929df1ff4c8ef70 100644 +index fb08649b6c862d6b7f79ea087a3de56b8a52dabe..acad166c842d1f84da8f3ce76ffd83a9acdfa333 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -@@ -635,9 +635,9 @@ MaskWebGLStringsEnabled: +@@ -647,9 +647,9 @@ MaskWebGLStringsEnabled: WebKitLegacy: default: true WebKit: @@ -2026,7 +2026,7 @@ index 4aaf759ab041d9bbd419ab32ba485936cf23fc7f..a13e708f98ef3a4efc4198d10929df1f # FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well. MediaCapabilitiesExtensionsEnabled: -@@ -977,7 +977,7 @@ SpeechRecognitionEnabled: +@@ -1001,7 +1001,7 @@ SpeechRecognitionEnabled: WebKitLegacy: default: false WebKit: @@ -2170,7 +2170,7 @@ 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 d10aa42b80a2b576c9e8c5c699a5d8b0ee2d8009..94ebea19af93d8282246c6af6e8d4a1e3e35fe40 100644 +index 5c14d14c1482cee4c54054efe183678d5687fe19..e39e20e9a1abda8ec0fb7fd37d6fe9887a561ff1 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h @@ -413,7 +413,7 @@ @@ -2192,10 +2192,10 @@ index d10aa42b80a2b576c9e8c5c699a5d8b0ee2d8009..94ebea19af93d8282246c6af6e8d4a1e #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index a9e10a2519e0939313bf2f58f4a9696ee21f57ad..e092b9c8180663afc80efc1ff5b7b1f98068b442 100644 +index 50178dbbf450c56aa133df0aaa553a46ddd1ac7b..955224be3eef1d59ebf0e0fb6bcb98ebea944341 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h -@@ -200,7 +200,7 @@ +@@ -204,7 +204,7 @@ #define ENABLE_DATA_DETECTION 1 #endif @@ -2217,7 +2217,7 @@ index 9bd5fde5bc38355e25bc09d05a045df31efaa259..3f3be653fef9930a7ac8a348c8b9f9a2 if (Systemd_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 86f441e80a530a34d5ebd86c568fb97f973cb051..62e2824ef70dcfec8c87bced014271f1676cdbc7 100644 +index 61f13c2b73dd2e03592c3a97792f936f97dc1f44..ffee291160127e11440772c720f3c8d2a5fb96b7 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -391,7 +391,7 @@ @@ -2242,10 +2242,10 @@ index a840a487ff03a3c827455cab67faa8f83d20bfa9..29dd6a14f17295f1611451e6f5386617 if (Systemd_FOUND) diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index eba1f1700e125ac8a108c3cd10f5805ba9feedd1..a59d2c9e211a0d2a5c105b232e5fa559292735d1 100644 +index f1332c0d3f923ba0a2a7533da3b980339748398d..240c224a96e09eeb937dc4a930fd0d9f17be002a 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make -@@ -780,6 +780,10 @@ JS_BINDING_IDLS := \ +@@ -719,6 +719,10 @@ JS_BINDING_IDLS := \ $(WebCore)/dom/Slotable.idl \ $(WebCore)/dom/StaticRange.idl \ $(WebCore)/dom/StringCallback.idl \ @@ -2256,7 +2256,7 @@ index eba1f1700e125ac8a108c3cd10f5805ba9feedd1..a59d2c9e211a0d2a5c105b232e5fa559 $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1310,9 +1314,6 @@ JS_BINDING_IDLS := \ +@@ -1249,9 +1253,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -2364,19 +2364,32 @@ index bc13d564edaaece26c488b4d7a6f68e8568df467..0a49521abb26a98a39db2ec91b81d1d9 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index 682dbcc06ceae7d76c1e0e9a66abf427e1ccb49b..9548501875df91a2901d01cfcdf9c4c43170c026 100644 +index ca61170c34df39c01b15b10124edec49679528b0..8f366a316c2617e80ac01252760c096d1b4d41d2 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt -@@ -620,3 +620,9 @@ platform/graphics/angle/TemporaryANGLESetting.cpp @no-unify - // Derived Sources - - WHLSLStandardLibraryFunctionMap.cpp +@@ -598,3 +598,9 @@ platform/graphics/angle/ExtensionsGLANGLE.cpp @no-unify + platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify + platform/graphics/angle/GraphicsContextGLANGLEEGLUtilities.cpp @no-unify + platform/graphics/angle/TemporaryANGLESetting.cpp @no-unify + +// Playwright begin +JSTouch.cpp +JSTouchEvent.cpp +JSTouchList.cpp +// Playwright end +diff --git a/Source/WebCore/SourcesGTK.txt b/Source/WebCore/SourcesGTK.txt +index e222f66b156a8b7f26b5f98d66e9d7acca3d4d06..2c603f4512a3793afe47064df8bda242cdd9dddf 100644 +--- a/Source/WebCore/SourcesGTK.txt ++++ b/Source/WebCore/SourcesGTK.txt +@@ -84,7 +84,7 @@ platform/graphics/egl/GLContextEGLLibWPE.cpp @no-unify + platform/graphics/egl/GLContextEGLWayland.cpp @no-unify + platform/graphics/egl/GLContextEGLX11.cpp @no-unify + +-platform/graphics/glx/GLContextGLX.cpp ++platform/graphics/glx/GLContextGLX.cpp @no-unify + + platform/graphics/gtk/ColorGtk.cpp + platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp diff --git a/Source/WebCore/SourcesWPE.txt b/Source/WebCore/SourcesWPE.txt index b10c1ece52075b7535da51c2cc316dc9343fd081..8520d6b90ccb2aa2762d83fab0f63c1e7107aed3 100644 --- a/Source/WebCore/SourcesWPE.txt @@ -2416,10 +2429,10 @@ index ef168b76819216d984b7a2d0f760005fb9d24de8..2d6cf51f3b45191ad84106429d4f108f __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 9b6358b1b0f161b66e777a91db4c76dd1f6f6deb..e47522cc1ba59e16a5bc355df672789fb8d66e0b 100644 +index 823eb2b789bf3e94f3f67c09dfd9cad1990f499b..9921e6c85fe9f3988524d036c45a9ea8897a1b79 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5354,6 +5354,14 @@ +@@ -5342,6 +5342,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, ); }; }; @@ -2434,7 +2447,7 @@ index 9b6358b1b0f161b66e777a91db4c76dd1f6f6deb..e47522cc1ba59e16a5bc355df672789f 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, ); }; }; -@@ -16871,6 +16879,14 @@ +@@ -16470,6 +16478,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 = ""; }; @@ -2449,7 +2462,7 @@ index 9b6358b1b0f161b66e777a91db4c76dd1f6f6deb..e47522cc1ba59e16a5bc355df672789f 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 = ""; }; -@@ -22492,7 +22508,12 @@ +@@ -21915,7 +21931,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2462,7 +2475,7 @@ index 9b6358b1b0f161b66e777a91db4c76dd1f6f6deb..e47522cc1ba59e16a5bc355df672789f E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -28206,6 +28227,8 @@ +@@ -27634,6 +27655,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2471,7 +2484,7 @@ index 9b6358b1b0f161b66e777a91db4c76dd1f6f6deb..e47522cc1ba59e16a5bc355df672789f 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -30645,6 +30668,7 @@ +@@ -29823,6 +29846,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2479,7 +2492,7 @@ index 9b6358b1b0f161b66e777a91db4c76dd1f6f6deb..e47522cc1ba59e16a5bc355df672789f 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -31656,6 +31680,7 @@ +@@ -30834,6 +30858,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2487,7 +2500,7 @@ index 9b6358b1b0f161b66e777a91db4c76dd1f6f6deb..e47522cc1ba59e16a5bc355df672789f 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -33696,6 +33721,7 @@ +@@ -32865,6 +32890,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2495,7 +2508,7 @@ index 9b6358b1b0f161b66e777a91db4c76dd1f6f6deb..e47522cc1ba59e16a5bc355df672789f 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -35761,9 +35787,11 @@ +@@ -34931,9 +34957,11 @@ B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */, @@ -2507,7 +2520,7 @@ index 9b6358b1b0f161b66e777a91db4c76dd1f6f6deb..e47522cc1ba59e16a5bc355df672789f B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -36725,6 +36753,7 @@ +@@ -35891,6 +35919,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2515,7 +2528,7 @@ index 9b6358b1b0f161b66e777a91db4c76dd1f6f6deb..e47522cc1ba59e16a5bc355df672789f 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -36811,6 +36840,7 @@ +@@ -35977,6 +36006,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2523,7 +2536,7 @@ index 9b6358b1b0f161b66e777a91db4c76dd1f6f6deb..e47522cc1ba59e16a5bc355df672789f 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -36859,6 +36889,7 @@ +@@ -36025,6 +36055,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2531,7 +2544,7 @@ index 9b6358b1b0f161b66e777a91db4c76dd1f6f6deb..e47522cc1ba59e16a5bc355df672789f DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -37391,6 +37422,7 @@ +@@ -36557,6 +36588,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2571,7 +2584,7 @@ index 220b4a87f39b5df253e859126502fb3aa181c97c..bd5b0d39f09b21ef8ef4b3996e6f3ee0 { AXComputedObjectAttributeCache* attributeCache = nullptr; diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -index 0b5f8ee23e93b84f1aa673e69482ee1f67c7f046..f7e3db9f6a19ee3b0485c9e5c4ae5a83780b49a6 100644 +index c12850c7c78dcc874634836f84121efe9169db1d..65d624a21c8b5d25603edd56cfcb47c30a984c87 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h @@ -89,6 +89,8 @@ namespace WebCore { @@ -2583,7 +2596,7 @@ index 0b5f8ee23e93b84f1aa673e69482ee1f67c7f046..f7e3db9f6a19ee3b0485c9e5c4ae5a83 macro(DocumentTimeline) \ macro(EnterPictureInPictureEvent) \ macro(ExtendableEvent) \ -@@ -183,6 +185,7 @@ namespace WebCore { +@@ -155,6 +157,7 @@ namespace WebCore { macro(NavigatorCredentials) \ macro(NavigatorMediaDevices) \ macro(NavigatorUserMedia) \ @@ -2921,10 +2934,10 @@ index 784bf482fd68da68e1f38fd5cd6bcedc8971dfda..6cdf012453ff31120adbe5946ce23f07 } // namespace WebCore diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp -index c121523071a026888cbd608031ad15dc85af1719..c8557a307178db00b79e7e1c4156242b242bc7d1 100644 +index fe206aea35e67933e2019fc5af1e93afda0e3837..db3de523ae31e7c6b055ff26cfad2de748268b84 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.cpp +++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp -@@ -641,6 +641,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen +@@ -636,6 +636,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen consoleAgent->didFailLoading(identifier, error); // This should come AFTER resource notification, front-end relies on this. } @@ -2937,7 +2950,7 @@ index c121523071a026888cbd608031ad15dc85af1719..c8557a307178db00b79e7e1c4156242b void InspectorInstrumentation::willLoadXHRSynchronouslyImpl(InstrumentingAgents& instrumentingAgents) { if (auto* networkAgent = instrumentingAgents.enabledNetworkAgent()) -@@ -673,20 +679,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents& +@@ -668,20 +674,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents& void InspectorInstrumentation::domContentLoadedEventFiredImpl(InstrumentingAgents& instrumentingAgents, Frame& frame) { @@ -2961,7 +2974,7 @@ index c121523071a026888cbd608031ad15dc85af1719..c8557a307178db00b79e7e1c4156242b } void InspectorInstrumentation::frameDetachedFromParentImpl(InstrumentingAgents& instrumentingAgents, Frame& frame) -@@ -767,12 +770,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins +@@ -762,12 +765,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins pageDOMDebuggerAgent->frameDocumentUpdated(frame); } @@ -2974,7 +2987,7 @@ index c121523071a026888cbd608031ad15dc85af1719..c8557a307178db00b79e7e1c4156242b void InspectorInstrumentation::frameStartedLoadingImpl(InstrumentingAgents& instrumentingAgents, Frame& frame) { if (frame.isMainFrame()) { -@@ -809,6 +806,12 @@ void InspectorInstrumentation::frameClearedScheduledNavigationImpl(Instrumenting +@@ -804,6 +801,12 @@ void InspectorInstrumentation::frameClearedScheduledNavigationImpl(Instrumenting inspectorPageAgent->frameClearedScheduledNavigation(frame); } @@ -2987,7 +3000,7 @@ index c121523071a026888cbd608031ad15dc85af1719..c8557a307178db00b79e7e1c4156242b #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT) void InspectorInstrumentation::defaultAppearanceDidChangeImpl(InstrumentingAgents& instrumentingAgents, bool useDarkAppearance) { -@@ -861,6 +864,24 @@ void InspectorInstrumentation::interceptResponseImpl(InstrumentingAgents& instru +@@ -856,6 +859,24 @@ void InspectorInstrumentation::interceptResponseImpl(InstrumentingAgents& instru networkAgent->interceptResponse(response, identifier, WTFMove(handler)); } @@ -3012,7 +3025,7 @@ index c121523071a026888cbd608031ad15dc85af1719..c8557a307178db00b79e7e1c4156242b // JavaScriptCore InspectorDebuggerAgent should know Console MessageTypes. static bool isConsoleAssertMessage(MessageSource source, MessageType type) { -@@ -1328,6 +1349,36 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins +@@ -1286,6 +1307,36 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins layerTreeAgent->renderLayerDestroyed(renderLayer); } @@ -3049,7 +3062,7 @@ index c121523071a026888cbd608031ad15dc85af1719..c8557a307178db00b79e7e1c4156242b InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(WorkerOrWorkletGlobalScope& globalScope) { return globalScope.inspectorController().m_instrumentingAgents; -@@ -1339,6 +1390,13 @@ InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(Page& page) +@@ -1297,6 +1348,13 @@ InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(Page& page) return page.inspectorController().m_instrumentingAgents.get(); } @@ -3064,7 +3077,7 @@ index c121523071a026888cbd608031ad15dc85af1719..c8557a307178db00b79e7e1c4156242b { if (is(context)) diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h -index 7d5e7d57bf911fddf90ed400a225afa083e6c871..f217152b91bdd208556d125ea3b013e9a30882a4 100644 +index 31f05c50f805db579b8c930bc90b9f61a92fac68..b37c6d9fde914a858005af501e6b11b5f253e442 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.h +++ b/Source/WebCore/inspector/InspectorInstrumentation.h @@ -31,6 +31,7 @@ @@ -3075,7 +3088,7 @@ index 7d5e7d57bf911fddf90ed400a225afa083e6c871..f217152b91bdd208556d125ea3b013e9 #include "CSSSelector.h" #include "CanvasBase.h" #include "CanvasRenderingContext.h" -@@ -79,6 +80,7 @@ class DOMWrapperWorld; +@@ -74,6 +75,7 @@ class DOMWrapperWorld; class Document; class DocumentLoader; class EventListener; @@ -3083,7 +3096,7 @@ index 7d5e7d57bf911fddf90ed400a225afa083e6c871..f217152b91bdd208556d125ea3b013e9 class HTTPHeaderMap; class InspectorTimelineAgent; class InstrumentingAgents; -@@ -201,6 +203,7 @@ public: +@@ -191,6 +193,7 @@ public: static void didReceiveData(Frame*, unsigned long identifier, const uint8_t* data, int dataLength, int encodedDataLength); static void didFinishLoading(Frame*, DocumentLoader*, unsigned long identifier, const NetworkLoadMetrics&, ResourceLoader*); static void didFailLoading(Frame*, DocumentLoader*, unsigned long identifier, const ResourceError&); @@ -3091,7 +3104,7 @@ index 7d5e7d57bf911fddf90ed400a225afa083e6c871..f217152b91bdd208556d125ea3b013e9 static void willSendRequest(WorkerOrWorkletGlobalScope&, unsigned long identifier, ResourceRequest&); static void didReceiveResourceResponse(WorkerOrWorkletGlobalScope&, unsigned long identifier, const ResourceResponse&); -@@ -227,11 +230,11 @@ public: +@@ -217,11 +220,11 @@ public: static void frameDetachedFromParent(Frame&); static void didCommitLoad(Frame&, DocumentLoader*); static void frameDocumentUpdated(Frame&); @@ -3104,7 +3117,7 @@ index 7d5e7d57bf911fddf90ed400a225afa083e6c871..f217152b91bdd208556d125ea3b013e9 #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT) static void defaultAppearanceDidChange(Page&, bool useDarkAppearance); #endif -@@ -242,6 +245,9 @@ public: +@@ -232,6 +235,9 @@ public: static bool shouldInterceptResponse(const Frame&, const ResourceResponse&); static void interceptRequest(ResourceLoader&, Function&&); static void interceptResponse(const Frame&, const ResourceResponse&, unsigned long identifier, CompletionHandler)>&&); @@ -3114,7 +3127,7 @@ index 7d5e7d57bf911fddf90ed400a225afa083e6c871..f217152b91bdd208556d125ea3b013e9 static void addMessageToConsole(Page&, std::unique_ptr); static void addMessageToConsole(WorkerOrWorkletGlobalScope&, std::unique_ptr); -@@ -325,6 +331,12 @@ public: +@@ -308,6 +314,12 @@ public: static void layerTreeDidChange(Page*); static void renderLayerDestroyed(Page*, const RenderLayer&); @@ -3127,7 +3140,7 @@ index 7d5e7d57bf911fddf90ed400a225afa083e6c871..f217152b91bdd208556d125ea3b013e9 static void frontendCreated(); static void frontendDeleted(); static bool hasFrontends() { return InspectorInstrumentationPublic::hasFrontends(); } -@@ -341,6 +353,8 @@ public: +@@ -324,6 +336,8 @@ public: static void registerInstrumentingAgents(InstrumentingAgents&); static void unregisterInstrumentingAgents(InstrumentingAgents&); @@ -3136,7 +3149,7 @@ index 7d5e7d57bf911fddf90ed400a225afa083e6c871..f217152b91bdd208556d125ea3b013e9 private: static void didClearWindowObjectInWorldImpl(InstrumentingAgents&, Frame&, DOMWrapperWorld&); static bool isDebuggerPausedImpl(InstrumentingAgents&); -@@ -429,6 +443,7 @@ private: +@@ -412,6 +426,7 @@ private: static void didReceiveDataImpl(InstrumentingAgents&, unsigned long identifier, const uint8_t* data, int dataLength, int encodedDataLength); static void didFinishLoadingImpl(InstrumentingAgents&, unsigned long identifier, DocumentLoader*, const NetworkLoadMetrics&, ResourceLoader*); static void didFailLoadingImpl(InstrumentingAgents&, unsigned long identifier, DocumentLoader*, const ResourceError&); @@ -3144,7 +3157,7 @@ index 7d5e7d57bf911fddf90ed400a225afa083e6c871..f217152b91bdd208556d125ea3b013e9 static void willLoadXHRSynchronouslyImpl(InstrumentingAgents&); static void didLoadXHRSynchronouslyImpl(InstrumentingAgents&); static void scriptImportedImpl(InstrumentingAgents&, unsigned long identifier, const String& sourceString); -@@ -439,11 +454,11 @@ private: +@@ -422,11 +437,11 @@ private: static void frameDetachedFromParentImpl(InstrumentingAgents&, Frame&); static void didCommitLoadImpl(InstrumentingAgents&, Frame&, DocumentLoader*); static void frameDocumentUpdatedImpl(InstrumentingAgents&, Frame&); @@ -3157,7 +3170,7 @@ index 7d5e7d57bf911fddf90ed400a225afa083e6c871..f217152b91bdd208556d125ea3b013e9 #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT) static void defaultAppearanceDidChangeImpl(InstrumentingAgents&, bool useDarkAppearance); #endif -@@ -454,6 +469,9 @@ private: +@@ -437,6 +452,9 @@ private: static bool shouldInterceptResponseImpl(InstrumentingAgents&, const ResourceResponse&); static void interceptRequestImpl(InstrumentingAgents&, ResourceLoader&, Function&&); static void interceptResponseImpl(InstrumentingAgents&, const ResourceResponse&, unsigned long identifier, CompletionHandler)>&&); @@ -3167,7 +3180,7 @@ index 7d5e7d57bf911fddf90ed400a225afa083e6c871..f217152b91bdd208556d125ea3b013e9 static void addMessageToConsoleImpl(InstrumentingAgents&, std::unique_ptr); -@@ -533,6 +551,12 @@ private: +@@ -508,6 +526,12 @@ private: static void layerTreeDidChangeImpl(InstrumentingAgents&); static void renderLayerDestroyedImpl(InstrumentingAgents&, const RenderLayer&); @@ -3180,7 +3193,7 @@ index 7d5e7d57bf911fddf90ed400a225afa083e6c871..f217152b91bdd208556d125ea3b013e9 static InstrumentingAgents& instrumentingAgents(Page&); static InstrumentingAgents& instrumentingAgents(WorkerOrWorkletGlobalScope&); -@@ -1134,6 +1158,13 @@ inline void InspectorInstrumentation::didFailLoading(Frame* frame, DocumentLoade +@@ -1109,6 +1133,13 @@ inline void InspectorInstrumentation::didFailLoading(Frame* frame, DocumentLoade didFailLoadingImpl(*agents, identifier, loader, error); } @@ -3194,7 +3207,7 @@ index 7d5e7d57bf911fddf90ed400a225afa083e6c871..f217152b91bdd208556d125ea3b013e9 inline void InspectorInstrumentation::didFailLoading(WorkerOrWorkletGlobalScope& globalScope, unsigned long identifier, const ResourceError& error) { didFailLoadingImpl(instrumentingAgents(globalScope), identifier, nullptr, error); -@@ -1229,13 +1260,6 @@ inline void InspectorInstrumentation::frameDocumentUpdated(Frame& frame) +@@ -1204,13 +1235,6 @@ inline void InspectorInstrumentation::frameDocumentUpdated(Frame& frame) frameDocumentUpdatedImpl(*agents, frame); } @@ -3208,7 +3221,7 @@ index 7d5e7d57bf911fddf90ed400a225afa083e6c871..f217152b91bdd208556d125ea3b013e9 inline void InspectorInstrumentation::frameStartedLoading(Frame& frame) { FAST_RETURN_IF_NO_FRONTENDS(void()); -@@ -1264,6 +1288,13 @@ inline void InspectorInstrumentation::frameClearedScheduledNavigation(Frame& fra +@@ -1239,6 +1263,13 @@ inline void InspectorInstrumentation::frameClearedScheduledNavigation(Frame& fra frameClearedScheduledNavigationImpl(*agents, frame); } @@ -3222,7 +3235,7 @@ index 7d5e7d57bf911fddf90ed400a225afa083e6c871..f217152b91bdd208556d125ea3b013e9 #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT) inline void InspectorInstrumentation::defaultAppearanceDidChange(Page& page, bool useDarkAppearance) { -@@ -1316,6 +1347,22 @@ inline void InspectorInstrumentation::interceptResponse(const Frame& frame, cons +@@ -1291,6 +1322,22 @@ inline void InspectorInstrumentation::interceptResponse(const Frame& frame, cons interceptResponseImpl(*agents, response, identifier, WTFMove(handler)); } @@ -3245,7 +3258,7 @@ index 7d5e7d57bf911fddf90ed400a225afa083e6c871..f217152b91bdd208556d125ea3b013e9 inline void InspectorInstrumentation::didOpenDatabase(Database& database) { FAST_RETURN_IF_NO_FRONTENDS(void()); -@@ -1731,6 +1778,42 @@ inline void InspectorInstrumentation::renderLayerDestroyed(Page* page, const Ren +@@ -1669,6 +1716,42 @@ inline void InspectorInstrumentation::renderLayerDestroyed(Page* page, const Ren renderLayerDestroyedImpl(*agents, renderLayer); } @@ -5484,10 +5497,10 @@ index 982691dd2dfe2f65201370a12302b5086703c126..4af72beb3b1405ffac78e89e7fbb2b14 protected: static SameSiteInfo sameSiteInfo(const Document&, IsForDOMCookieAccess = IsForDOMCookieAccess::No); diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp -index 367675741089a498870aa9e16a20b419bee0eef9..b15bf5fd318862fd50aa2f5cf26cd29d75618aa2 100644 +index e8901564479748ea469aa9dc937b9ff24f1e9865..10c93913dc905fefc2a28a131b61929b9b5badb9 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp -@@ -1408,8 +1408,6 @@ void DocumentLoader::detachFromFrame() +@@ -1508,8 +1508,6 @@ void DocumentLoader::detachFromFrame() if (!m_frame) return; @@ -5497,10 +5510,10 @@ index 367675741089a498870aa9e16a20b419bee0eef9..b15bf5fd318862fd50aa2f5cf26cd29d } diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h -index 39eb06299e570c4759aecf0ef0971824eb505624..2f23d3e02f50ef08a761c783409979d7b4b01ae0 100644 +index d8ff1da3bd6406c5d764876aad49bbd004ac1770..efe4f7d87993dcfbae3734b2cfbf0402c34168a8 100644 --- a/Source/WebCore/loader/DocumentLoader.h +++ b/Source/WebCore/loader/DocumentLoader.h -@@ -166,9 +166,13 @@ public: +@@ -167,9 +167,13 @@ public: WEBCORE_EXPORT virtual void detachFromFrame(); @@ -5515,10 +5528,10 @@ index 39eb06299e570c4759aecf0ef0971824eb505624..2f23d3e02f50ef08a761c783409979d7 DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index bec297934002bb0e89e5f4b38c59281969b0f0af..0cb95e8dbc403bf72bc044c9daf1d5e525bc8650 100644 +index 83983c6a3053bf7c4ee3737bcbcd189101918682..913f9b2e7c87549fae98c717d28439aa3c19315f 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp -@@ -1153,6 +1153,7 @@ void FrameLoader::loadInSameDocument(const URL& url, SerializedScriptValue* stat +@@ -1158,6 +1158,7 @@ void FrameLoader::loadInSameDocument(const URL& url, SerializedScriptValue* stat } m_client->dispatchDidNavigateWithinPage(); @@ -5526,7 +5539,7 @@ index bec297934002bb0e89e5f4b38c59281969b0f0af..0cb95e8dbc403bf72bc044c9daf1d5e5 m_frame.document()->statePopped(stateObject ? Ref { *stateObject } : SerializedScriptValue::nullValue()); m_client->dispatchDidPopStateWithinPage(); -@@ -1471,6 +1472,7 @@ void FrameLoader::load(FrameLoadRequest&& request) +@@ -1483,6 +1484,7 @@ void FrameLoader::load(FrameLoadRequest&& request) void FrameLoader::loadWithNavigationAction(const ResourceRequest& request, NavigationAction&& action, FrameLoadType type, RefPtr&& formState, AllowNavigationToInvalidURL allowNavigationToInvalidURL, CompletionHandler&& completionHandler) { @@ -5534,7 +5547,7 @@ index bec297934002bb0e89e5f4b38c59281969b0f0af..0cb95e8dbc403bf72bc044c9daf1d5e5 FRAMELOADER_RELEASE_LOG(ResourceLoading, "loadWithNavigationAction: frame load started"); Ref loader = m_client->createDocumentLoader(request, defaultSubstituteDataForURL(request.url())); -@@ -1574,6 +1576,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t +@@ -1586,6 +1588,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t const String& httpMethod = loader->request().httpMethod(); if (shouldPerformFragmentNavigation(isFormSubmission, httpMethod, policyChecker().loadType(), newURL)) { @@ -5543,7 +5556,7 @@ index bec297934002bb0e89e5f4b38c59281969b0f0af..0cb95e8dbc403bf72bc044c9daf1d5e5 RefPtr oldDocumentLoader = m_documentLoader; NavigationAction action { *m_frame.document(), loader->request(), InitiatedByMainFrame::Unknown, policyChecker().loadType(), isFormSubmission }; -@@ -3171,6 +3175,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) +@@ -3189,6 +3193,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) checkCompleted(); if (m_frame.page()) checkLoadComplete(); @@ -5552,7 +5565,7 @@ index bec297934002bb0e89e5f4b38c59281969b0f0af..0cb95e8dbc403bf72bc044c9daf1d5e5 } void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, bool shouldContinue) -@@ -3932,9 +3938,6 @@ String FrameLoader::referrer() const +@@ -3950,9 +3956,6 @@ String FrameLoader::referrer() const void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() { @@ -5562,7 +5575,7 @@ index bec297934002bb0e89e5f4b38c59281969b0f0af..0cb95e8dbc403bf72bc044c9daf1d5e5 Vector> worlds; ScriptController::getAllWorlds(worlds); for (auto& world : worlds) -@@ -3943,13 +3946,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() +@@ -3961,13 +3964,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world) { @@ -5676,7 +5689,7 @@ index 3931498518012bbc719d2e14eecd6ae44cba87ba..606ba8c8ec8639a3fe21a018dead8534 #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index eaef0b555afb4949f54991dc47c3de4e23b55a6f..864f17614346ade3c18982ef3be6433f978b72a4 100644 +index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..111daec076f3808e307ccfb591b098c5433cde90 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -126,6 +126,7 @@ @@ -5763,7 +5776,7 @@ index eaef0b555afb4949f54991dc47c3de4e23b55a6f..864f17614346ade3c18982ef3be6433f && m_frame.selection().isRange() && event.event().button() != RightButton) { VisibleSelection newSelection; -@@ -2030,10 +2032,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE +@@ -2036,10 +2038,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE swallowEvent = !dispatchMouseEvent(eventNames().mousemoveEvent, mouseEvent.targetNode(), 0, platformMouseEvent, FireMouseOverOut::Yes); @@ -5774,7 +5787,7 @@ index eaef0b555afb4949f54991dc47c3de4e23b55a6f..864f17614346ade3c18982ef3be6433f return swallowEvent; } -@@ -4040,7 +4040,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr +@@ -4052,7 +4052,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr if (!m_frame.document()) return false; @@ -5790,7 +5803,7 @@ index eaef0b555afb4949f54991dc47c3de4e23b55a6f..864f17614346ade3c18982ef3be6433f auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; if (dragState().shouldDispatchEvents) { -@@ -4479,7 +4486,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4457,7 +4464,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) allTouchReleased = false; } @@ -5800,7 +5813,7 @@ index eaef0b555afb4949f54991dc47c3de4e23b55a6f..864f17614346ade3c18982ef3be6433f PlatformTouchPoint::State pointState = point.state(); LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); -@@ -4606,6 +4614,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4584,6 +4592,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) changedTouches[pointState].m_touches->append(WTFMove(touch)); changedTouches[pointState].m_targets.add(touchTarget); } @@ -5811,7 +5824,7 @@ index eaef0b555afb4949f54991dc47c3de4e23b55a6f..864f17614346ade3c18982ef3be6433f m_touchPressed = touches->length() > 0; if (allTouchReleased) diff --git a/Source/WebCore/page/EventHandler.h b/Source/WebCore/page/EventHandler.h -index d5caa65b1fe2650c02a90e132b283981529011e5..e24ed229d880b83774db100e9e41453e4909f55c 100644 +index df9d6c7074206ff832fa68d93371283cc8ec3b63..86d0f7dd12956f41e53ecbf53955bf4941f33a52 100644 --- a/Source/WebCore/page/EventHandler.h +++ b/Source/WebCore/page/EventHandler.h @@ -136,9 +136,7 @@ public: @@ -5824,9 +5837,9 @@ index d5caa65b1fe2650c02a90e132b283981529011e5..e24ed229d880b83774db100e9e41453e #if ENABLE(PAN_SCROLLING) void didPanScrollStart(); -@@ -379,10 +377,8 @@ private: - float scrollDistance(ScrollDirection, ScrollGranularity); - bool handleKeyboardScrolling(KeyboardEvent&); +@@ -380,10 +378,8 @@ private: + bool startKeyboardScrolling(KeyboardEvent&); + void stopKeyboardScrolling(); -#if ENABLE(DRAG_SUPPORT) bool handleMouseDraggedEvent(const MouseEventWithHitTestResults&, CheckDragHysteresis = ShouldCheckDragHysteresis); @@ -5835,7 +5848,7 @@ index d5caa65b1fe2650c02a90e132b283981529011e5..e24ed229d880b83774db100e9e41453e WEBCORE_EXPORT bool handleMouseReleaseEvent(const MouseEventWithHitTestResults&); -@@ -483,10 +479,8 @@ private: +@@ -484,10 +480,8 @@ private: void defaultTabEventHandler(KeyboardEvent&); void defaultArrowEventHandler(FocusDirection, KeyboardEvent&); @@ -5846,7 +5859,7 @@ index d5caa65b1fe2650c02a90e132b283981529011e5..e24ed229d880b83774db100e9e41453e // The following are called at the beginning of handleMouseUp and handleDrag. // If they return true it indicates that they have consumed the event. -@@ -494,9 +488,10 @@ private: +@@ -495,9 +489,10 @@ private: #if ENABLE(DRAG_SUPPORT) bool eventLoopHandleMouseDragged(const MouseEventWithHitTestResults&); @@ -5858,7 +5871,7 @@ index d5caa65b1fe2650c02a90e132b283981529011e5..e24ed229d880b83774db100e9e41453e enum class SetOrClearLastScrollbar { Clear, Set }; void updateLastScrollbarUnderMouse(Scrollbar*, SetOrClearLastScrollbar); -@@ -588,8 +583,8 @@ private: +@@ -589,8 +584,8 @@ private: Timer m_autoHideCursorTimer; #endif @@ -5889,7 +5902,7 @@ index 7b77e407ee5d08ab3784d0899cfa33f0177f0648..0060ebfb1128cc5eb28baa5ecf4538a2 request.setHTTPHeaderField(HTTPHeaderName::Accept, "text/event-stream"); request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache"); diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp -index 7054acc90214eb817bd784298ce77f76d32c5dee..9f6a77a76ba4ef1eff10a6a61f1d7c48a1c389b0 100644 +index d5eb425530475957eab064bc94461908a4b94649..70bf07e9d5ca25be120cfeae2b5310ce8dfbfb4b 100644 --- a/Source/WebCore/page/Frame.cpp +++ b/Source/WebCore/page/Frame.cpp @@ -39,6 +39,7 @@ @@ -5925,7 +5938,7 @@ index 7054acc90214eb817bd784298ce77f76d32c5dee..9f6a77a76ba4ef1eff10a6a61f1d7c48 return 0; } #endif // ENABLE(ORIENTATION_EVENTS) -@@ -1139,6 +1142,362 @@ DataDetectionResultsStorage& Frame::dataDetectionResults() +@@ -1145,6 +1148,362 @@ DataDetectionResultsStorage& Frame::dataDetectionResults() #endif @@ -6289,7 +6302,7 @@ index 7054acc90214eb817bd784298ce77f76d32c5dee..9f6a77a76ba4ef1eff10a6a61f1d7c48 #undef FRAME_RELEASE_LOG_ERROR diff --git a/Source/WebCore/page/Frame.h b/Source/WebCore/page/Frame.h -index f0743e939757f672a7276fabe3b6596e3179ae2b..f1863e330e7ff386bfbf664df1c798436c1dd57e 100644 +index f0f9a8a424c460cd930ad5b56deff5db098495f0..659572b08985aea7b0f01957af7417cde4cae3b7 100644 --- a/Source/WebCore/page/Frame.h +++ b/Source/WebCore/page/Frame.h @@ -110,8 +110,8 @@ enum { @@ -6302,7 +6315,7 @@ index f0743e939757f672a7276fabe3b6596e3179ae2b..f1863e330e7ff386bfbf664df1c79843 enum { LayerTreeFlagsIncludeDebugInfo = 1 << 0, -@@ -229,10 +229,6 @@ public: +@@ -230,10 +230,6 @@ public: WEBCORE_EXPORT DataDetectionResultsStorage& dataDetectionResults(); #endif @@ -6313,7 +6326,7 @@ index f0743e939757f672a7276fabe3b6596e3179ae2b..f1863e330e7ff386bfbf664df1c79843 WEBCORE_EXPORT Node* deepestNodeAtLocation(const FloatPoint& viewportLocation); WEBCORE_EXPORT Node* nodeRespondingToClickEvents(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation, SecurityOrigin* = nullptr); WEBCORE_EXPORT Node* nodeRespondingToDoubleClickEvent(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation); -@@ -240,6 +236,10 @@ public: +@@ -241,6 +237,10 @@ public: WEBCORE_EXPORT Node* nodeRespondingToScrollWheelEvents(const FloatPoint& viewportLocation); WEBCORE_EXPORT Node* approximateNodeAtViewportLocationLegacy(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation); @@ -6324,7 +6337,7 @@ index f0743e939757f672a7276fabe3b6596e3179ae2b..f1863e330e7ff386bfbf664df1c79843 WEBCORE_EXPORT NSArray *wordsInCurrentParagraph() const; WEBCORE_EXPORT CGRect renderRectForPoint(CGPoint, bool* isReplaced, float* fontSize) const; -@@ -311,6 +311,7 @@ public: +@@ -312,6 +312,7 @@ public: WEBCORE_EXPORT FloatSize screenSize() const; void setOverrideScreenSize(FloatSize&&); @@ -6332,7 +6345,7 @@ index f0743e939757f672a7276fabe3b6596e3179ae2b..f1863e330e7ff386bfbf664df1c79843 void selfOnlyRef(); void selfOnlyDeref(); -@@ -349,7 +350,6 @@ private: +@@ -350,7 +351,6 @@ private: #if ENABLE(DATA_DETECTION) std::unique_ptr m_dataDetectionResults; #endif @@ -6340,7 +6353,7 @@ index f0743e939757f672a7276fabe3b6596e3179ae2b..f1863e330e7ff386bfbf664df1c79843 void betterApproximateNode(const IntPoint& testPoint, const NodeQualifier&, Node*& best, Node* failedNode, IntPoint& bestPoint, IntRect& bestRect, const IntRect& testRect); bool hitTestResultAtViewportLocation(const FloatPoint& viewportLocation, HitTestResult&, IntPoint& center); -@@ -357,6 +357,7 @@ private: +@@ -358,6 +358,7 @@ private: enum class ShouldFindRootEditableElement : bool { No, Yes }; Node* qualifyingNodeAtViewportLocation(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation, const NodeQualifier&, ShouldApproximate, ShouldFindRootEditableElement = ShouldFindRootEditableElement::Yes); @@ -6399,10 +6412,10 @@ index 1b77026f51092001cda86e32480890395b145b2e..6026bc23508016454f331b06c9f071a8 struct SnapshotOptions { diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp -index 4dec390678b6b76ceb314a403ca7fde12cce0d01..6f1f2f13c8b5a31820b52cfd44ca768de140c553 100644 +index 5147dd7c97fd263b0d6bb6837705a511e2ced617..a3fd517ec836a05abac2f8ea4fb6cfda7c56d22c 100644 --- a/Source/WebCore/page/FrameView.cpp +++ b/Source/WebCore/page/FrameView.cpp -@@ -3026,7 +3026,7 @@ void FrameView::setBaseBackgroundColor(const Color& backgroundColor) +@@ -3028,7 +3028,7 @@ void FrameView::setBaseBackgroundColor(const Color& backgroundColor) void FrameView::updateBackgroundRecursively(const std::optional& backgroundColor) { @@ -6503,7 +6516,7 @@ index f778077a290539c1a16b1721bb082ba79950ee1f..8251f8ee42743dca41338dfd9c4f9138 { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index 7dab09a21dcb300f5e9eae73cf4c5096f9d92ddf..fd9d68b8beeed480ca65f004ef9ef46c877dd71c 100644 +index 487c9b2b5ef4946c9cbe989f3e7761f08e61d80e..0099e4256518ba7fe4e3460c54456a7a4514639d 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h @@ -258,6 +258,9 @@ public: @@ -6640,7 +6653,7 @@ index 40c2ebaa2f7acad478c9e5abe2e49b1f4b585202..ba7edc32330d314c0e4ad1c9422a356b #endif diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h -index a0d3cea79d7e0ae0748240dd22eee2d5575044a6..d58ef313d23be11420fb069ef5add8be1bb8aacc 100644 +index 685a0a2ad75472699aebf219fa0c251521beb0b9..a9451bb36e18a00c504e2d08e5020fc01554959c 100644 --- a/Source/WebCore/page/RuntimeEnabledFeatures.h +++ b/Source/WebCore/page/RuntimeEnabledFeatures.h @@ -202,6 +202,7 @@ public: @@ -6705,7 +6718,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 fc85fffa9b20cf5d3a2cff89b7d38ecf84aa0ff6..1070a1973d0ea23c6781df4269fc43498ce18608 100644 +index 873765f6085c3130365e45e82462d50978f4efaa..5d4b146ecabb4367c6f0a375e58d3d6f11cf9ca9 100644 --- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp @@ -281,6 +281,8 @@ bool ContentSecurityPolicy::protocolMatchesSelf(const URL& url) const @@ -7121,10 +7134,10 @@ index 0000000000000000000000000000000000000000..f0c3a183e5bc44bdfa4201e0db2067b4 + +#endif // ENABLE(SPEECH_SYNTHESIS) diff --git a/Source/WebCore/platform/graphics/FontCascade.h b/Source/WebCore/platform/graphics/FontCascade.h -index 6eca247ea9c8a91d72817a5123cb734502d732b7..a3ec9c074ab3256319b71cc0bae7379fbbb68d77 100644 +index 6c50657b193df95b8e4d031ea3d89f5eb529b046..50ac94ac6bed1c66fca0f9b9b1a58247938ad805 100644 --- a/Source/WebCore/platform/graphics/FontCascade.h +++ b/Source/WebCore/platform/graphics/FontCascade.h -@@ -283,7 +283,8 @@ private: +@@ -293,7 +293,8 @@ private: return true; if (textRenderingMode == TextRenderingMode::OptimizeSpeed) return false; @@ -8845,10 +8858,10 @@ 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 5fae58964efcb32c85c2e3f6483f09d22f8def8d..bd6653c4fda816076594936543be88c9486b03bc 100644 +index 63c2431513b8f71a5d8de96394c14be8d2d3fce5..0199dbb61392764feeae35388c61d517a7c17292 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp -@@ -75,6 +75,11 @@ +@@ -76,6 +76,11 @@ #include #include @@ -8860,7 +8873,7 @@ index 5fae58964efcb32c85c2e3f6483f09d22f8def8d..bd6653c4fda816076594936543be88c9 #if ENABLE(APPLE_PAY_REMOTE_UI) #include "WebPaymentCoordinatorProxyMessages.h" #endif -@@ -913,6 +918,15 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) +@@ -914,6 +919,15 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) #endif } @@ -8903,7 +8916,7 @@ index 9b32896810619ba19dc5bf437b368a7ca7fa431b..a026b8ae7024f914e78f3f5137bc2031 RemoveStorageAccessForFrame(WebCore::FrameIdentifier frameID, WebCore::PageIdentifier pageID); LogUserInteraction(WebCore::RegistrableDomain domain) diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp -index 4360502d106179f6728959cce32cf6076d119073..6f2c4d6cbb52443983a6d10ea21f0e1552151a92 100644 +index a38b2e27f39821f04b0754d180bcf46cac19759e..98304a3675c36b8ac7cfc3b251da491ccd132d40 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -26,7 +26,6 @@ @@ -8975,7 +8988,7 @@ index 4360502d106179f6728959cce32cf6076d119073..6f2c4d6cbb52443983a6d10ea21f0e15 void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index f06dad4729bdfbea753ff8c93aa3e75a9ad88b03..5b78bd56ee80c5173e52097709838b642fa0ddd2 100644 +index 8a7084bcaac50a0b9275802a8f4b5be4dab5064b..ae5d84597cf94aabccca70c0affcc454e1523c39 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h @@ -35,6 +35,7 @@ @@ -8994,7 +9007,7 @@ index f06dad4729bdfbea753ff8c93aa3e75a9ad88b03..5b78bd56ee80c5173e52097709838b64 class CurlProxySettings; class ProtectionSpace; class StorageQuotaManager; -@@ -210,6 +212,14 @@ public: +@@ -211,6 +213,14 @@ public: void addWebsiteDataStore(WebsiteDataStoreParameters&&); @@ -9010,10 +9023,10 @@ index f06dad4729bdfbea753ff8c93aa3e75a9ad88b03..5b78bd56ee80c5173e52097709838b64 void clearPrevalentResource(PAL::SessionID, const RegistrableDomain&, CompletionHandler&&); void clearUserInteraction(PAL::SessionID, const RegistrableDomain&, CompletionHandler&&); diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in -index e05f2e320584737b347fab21bf6a2e6979a8c8ce..ffb950331439ac81cf408a51897d3df178568d42 100644 +index 2fc719e347fa005066ae3987132fde8292792e1c..ba0733078be37806e32f423cea0e277ed01bc5be 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in -@@ -79,6 +79,14 @@ messages -> NetworkProcess LegacyReceiver { +@@ -76,6 +76,14 @@ messages -> NetworkProcess LegacyReceiver { PreconnectTo(PAL::SessionID sessionID, WebKit::WebPageProxyIdentifier webPageProxyID, WebCore::PageIdentifier webPageID, URL url, String userAgent, enum:uint8_t WebCore::StoredCredentialsPolicy storedCredentialsPolicy, enum:bool std::optional isNavigatingToAppBoundDomain, enum:bool WebKit::LastNavigationWasAppInitiated lastNavigationWasAppInitiated); @@ -9029,7 +9042,7 @@ index e05f2e320584737b347fab21bf6a2e6979a8c8ce..ffb950331439ac81cf408a51897d3df1 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 0dcfb27cc2fa85d24fb3b520a751591ee30120e7..3d644dba5f6b6d389d2fd94b64939208372a8cfb 100644 +index 7da95e970be953cfbeeddbb79d149643e3a2e88b..7d15b3bb34ff50aa7458d282e4048f32360778cd 100644 --- a/Source/WebKit/NetworkProcess/NetworkSession.h +++ b/Source/WebKit/NetworkProcess/NetworkSession.h @@ -156,6 +156,9 @@ public: @@ -9042,7 +9055,7 @@ index 0dcfb27cc2fa85d24fb3b520a751591ee30120e7..3d644dba5f6b6d389d2fd94b64939208 #if ENABLE(SERVICE_WORKER) void addSoftUpdateLoader(std::unique_ptr&& loader) { m_softUpdateLoaders.add(WTFMove(loader)); } void removeSoftUpdateLoader(ServiceWorkerSoftUpdateLoader* loader) { m_softUpdateLoaders.remove(loader); } -@@ -204,6 +207,7 @@ protected: +@@ -206,6 +209,7 @@ protected: #endif bool m_isStaleWhileRevalidateEnabled { false }; std::unique_ptr m_privateClickMeasurement; @@ -9342,7 +9355,7 @@ index 6870851925288571bd6c763b3e60313d9260e98c..a7462761a3d6ce0a2a74d84b80f3db29 + } diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index c837ee5aeee86f648a3c766387e2588e49eaf822..115e695d4e3fc6b18bf2eddaa5e1f7b314827ee2 100644 +index 9e46464051a45b8b2e170e0e927e28cdc8cee95b..2c0b37e7ea5d6bb18a7b35e3e52b84ed8522f2ef 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm @@ -704,7 +704,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se @@ -9624,10 +9637,10 @@ index 3a8e5bd6ba097d3d56414b863e332b12f92cd59a..0eacc59cc507d8909879cf5d02f2d346 } return makeUnique(channel, request, soupSession(), soupMessage.get(), protocol); diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index 88f0a606152ff29304c621ffe4e53f66797a8cbf..4fcf4c16c13de179446c03a0a9dd4467907dacaa 100644 +index 48ab7c3a3523a2be6077664ef65e6ec30f14691e..6afc278b3efaf83945ad861266514c205835b7b4 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake -@@ -452,6 +452,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES +@@ -467,6 +467,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES ${GSTREAMER_PBUTILS_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} ${LIBSOUP_INCLUDE_DIRS} @@ -9637,7 +9650,7 @@ index 88f0a606152ff29304c621ffe4e53f66797a8cbf..4fcf4c16c13de179446c03a0a9dd4467 ) if (USE_WPE_RENDERER) -@@ -505,6 +508,9 @@ if (USE_LIBWEBRTC) +@@ -520,6 +523,9 @@ if (USE_LIBWEBRTC) list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/libwebrtc/Source/" "${THIRDPARTY_DIR}/libwebrtc/Source/webrtc" @@ -9647,7 +9660,7 @@ index 88f0a606152ff29304c621ffe4e53f66797a8cbf..4fcf4c16c13de179446c03a0a9dd4467 ) endif () -@@ -519,6 +525,12 @@ if (ENABLE_MEDIA_STREAM) +@@ -534,6 +540,12 @@ if (ENABLE_MEDIA_STREAM) ) endif () @@ -9661,10 +9674,10 @@ index 88f0a606152ff29304c621ffe4e53f66797a8cbf..4fcf4c16c13de179446c03a0a9dd4467 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 86724c67e8871a940a4f93f65cff2548a4c1f327..616ab800c4faa2d6715bc32de8cd384d22d55e8c 100644 +index 5df2fe1b1168806f83c5b4cb566af7943fb16887..5a3eaf926233e5360108478f59d8aedebce2510e 100644 --- a/Source/WebKit/PlatformWPE.cmake +++ b/Source/WebKit/PlatformWPE.cmake -@@ -155,6 +155,7 @@ set(WPE_API_INSTALLED_HEADERS +@@ -168,6 +168,7 @@ set(WPE_API_INSTALLED_HEADERS ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitOptionMenuItem.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPermissionRequest.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPlugin.h @@ -9672,7 +9685,7 @@ index 86724c67e8871a940a4f93f65cff2548a4c1f327..616ab800c4faa2d6715bc32de8cd384d ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPolicyDecision.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitRectangle.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitResponsePolicyDecision.h -@@ -279,6 +280,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES +@@ -292,6 +293,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES "${WEBKIT_DIR}/UIProcess/API/wpe" "${WEBKIT_DIR}/UIProcess/CoordinatedGraphics" "${WEBKIT_DIR}/UIProcess/geoclue" @@ -9680,7 +9693,7 @@ index 86724c67e8871a940a4f93f65cff2548a4c1f327..616ab800c4faa2d6715bc32de8cd384d "${WEBKIT_DIR}/UIProcess/gstreamer" "${WEBKIT_DIR}/UIProcess/linux" "${WEBKIT_DIR}/UIProcess/soup" -@@ -301,8 +303,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES +@@ -314,8 +316,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES ${GIO_UNIX_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} ${LIBSOUP_INCLUDE_DIRS} @@ -10499,7 +10512,7 @@ index f3031e792beb453f167d8813e88abecbc2b5cb7b..9b843cf1c0a975258e12f4f1e9d14fd9 UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 29f7fe07db66bde30a715b59f71e4f13ba553383..6a256aae5d79c1db984bd25f28879e7326627819 100644 +index 78fb4241223b03275a966d9f75ac00fca49a7f6d..8f1651bbf29c1039b58a8a672fa113996ae72bbf 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt @@ -268,6 +268,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm @@ -17587,7 +17600,7 @@ index 8d41e4523f47f92105259c63060515ef4fc98c33..d2ee126380d814598fc2f2c37408732d // 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 afd192e2ce2cba86c43d7635b79e7b270fa11f1f..7fc75c905125b98f0f2322ab6c3e8e6c0b8c228c 100644 +index 1d80d33cc6cef968c9d61525ac916ae470041e09..34a89fef2395e5c2218cce39df5a7e7b0b128e42 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -38,6 +38,7 @@ @@ -17815,7 +17828,7 @@ index 2eab6bcb89b8b79a7dcf3cdcd49c06d5acd212b3..5db9888b36e24819dc85d15dc787f22b parameters.urlSchemesRegisteredAsEmptyDocument = copyToVector(m_schemesToRegisterAsEmptyDocument); parameters.urlSchemesRegisteredAsSecure = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsSecure()); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp -index 31d92c63d7cff130dfa0d40ec340734778888504..1bbba5772ba787b6042923f93804a9a237df3a29 100644 +index 1d6b9da0dfa3d848aaf5c2450ef3485b640f9621..b57addc8b37f396aa7059a3a87db13318a7be5f3 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp @@ -126,6 +126,11 @@ HashMap& WebProcessProxy::allProcesses() @@ -17831,7 +17844,7 @@ index 31d92c63d7cff130dfa0d40ec340734778888504..1bbba5772ba787b6042923f93804a9a2 { return allProcesses().get(identifier); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h -index 790d76594ec5fc5f43aefb3e224a492d4658e536..33f5868d33e897318f4828edf4c3a2fafa1763b1 100644 +index f41be30b7864412e227b7641289d2ec058cf7176..8658740764f75a5493e594d7239200511dc656d7 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.h +++ b/Source/WebKit/UIProcess/WebProcessProxy.h @@ -141,6 +141,7 @@ public: @@ -18377,7 +18390,7 @@ index 0000000000000000000000000000000000000000..8a86cc348bc210b71bb463dcb3057f57 + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/gtk/WebDateTimePickerGtk.cpp b/Source/WebKit/UIProcess/gtk/WebDateTimePickerGtk.cpp -index 2ac15c9d7f1f19947b449794862555e913e211b7..111cd5464a19b81e73ba1bd02a2d76918cb40612 100644 +index 40ebef5dc078f5933056a63c498bd6f8e7f1d857..82a1500bbe3e1fe24d2d0806e46b67f58bfe8067 100644 --- a/Source/WebKit/UIProcess/gtk/WebDateTimePickerGtk.cpp +++ b/Source/WebKit/UIProcess/gtk/WebDateTimePickerGtk.cpp @@ -34,6 +34,8 @@ @@ -19901,7 +19914,7 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 73eb0282fda7fd9229ed4fb5e13ec0262a115fbd..2110d04d0df9fa1144eda0210f7000d7fbb925df 100644 +index 3c586cb06360717b4a25da0452a059b877892c45..234f07130dc7e353cebc6ec898d5330d12797824 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj @@ -1958,6 +1958,18 @@ @@ -19984,7 +19997,7 @@ index 73eb0282fda7fd9229ed4fb5e13ec0262a115fbd..2110d04d0df9fa1144eda0210f7000d7 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -9085,6 +9123,7 @@ +@@ -9087,6 +9125,7 @@ isa = PBXGroup; children = ( 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -19992,7 +20005,7 @@ index 73eb0282fda7fd9229ed4fb5e13ec0262a115fbd..2110d04d0df9fa1144eda0210f7000d7 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, ); -@@ -9517,6 +9556,12 @@ +@@ -9519,6 +9558,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -20005,7 +20018,7 @@ index 73eb0282fda7fd9229ed4fb5e13ec0262a115fbd..2110d04d0df9fa1144eda0210f7000d7 ); path = Agents; sourceTree = ""; -@@ -9525,6 +9570,7 @@ +@@ -9527,6 +9572,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -20013,7 +20026,7 @@ index 73eb0282fda7fd9229ed4fb5e13ec0262a115fbd..2110d04d0df9fa1144eda0210f7000d7 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -10019,6 +10065,12 @@ +@@ -10021,6 +10067,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -20026,7 +20039,7 @@ index 73eb0282fda7fd9229ed4fb5e13ec0262a115fbd..2110d04d0df9fa1144eda0210f7000d7 BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -10318,6 +10370,7 @@ +@@ -10320,6 +10372,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -20573,20 +20586,18 @@ index 0000000000000000000000000000000000000000..9b413bb8150a1633d29b6e2606127c9c + +#endif // ENABLE(DRAG_SUPPORT) diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp -index 4a087235e7bcf915f6e9d4daf8ad48b748ce3b91..3ea0a7106906f4cda63f1b0ce7c595496326e1c3 100644 +index 62b37c497bb7947feab17d861a7f91b3ca6090e7..3ea0a7106906f4cda63f1b0ce7c595496326e1c3 100644 --- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp +++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp -@@ -36,7 +36,9 @@ - #include "WebPageCreationParameters.h" - #include "WebPreferencesKeys.h" +@@ -38,6 +38,7 @@ #include -+#include + #include #include +#include #include #include #include -@@ -123,6 +125,16 @@ void DrawingAreaCoordinatedGraphics::scroll(const IntRect& scrollRect, const Int +@@ -124,6 +125,16 @@ void DrawingAreaCoordinatedGraphics::scroll(const IntRect& scrollRect, const Int ASSERT(m_scrollRect.isEmpty()); ASSERT(m_scrollOffset.isEmpty()); ASSERT(m_dirtyRegion.isEmpty()); @@ -20603,7 +20614,7 @@ index 4a087235e7bcf915f6e9d4daf8ad48b748ce3b91..3ea0a7106906f4cda63f1b0ce7c59549 m_layerTreeHost->scrollNonCompositedContents(scrollRect); return; } -@@ -253,6 +265,7 @@ void DrawingAreaCoordinatedGraphics::updatePreferences(const WebPreferencesStore +@@ -254,6 +265,7 @@ void DrawingAreaCoordinatedGraphics::updatePreferences(const WebPreferencesStore settings.setAcceleratedCompositingEnabled(false); } #endif @@ -20611,7 +20622,7 @@ index 4a087235e7bcf915f6e9d4daf8ad48b748ce3b91..3ea0a7106906f4cda63f1b0ce7c59549 settings.setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey())); // Fixed position elements need to be composited and create stacking contexts // in order to be scrolled by the ScrollingCoordinator. -@@ -666,6 +679,11 @@ void DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode(GraphicsLay +@@ -667,6 +679,11 @@ void DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode(GraphicsLay m_scrollOffset = IntSize(); m_displayTimer.stop(); m_isWaitingForDidUpdate = false; @@ -20623,7 +20634,7 @@ index 4a087235e7bcf915f6e9d4daf8ad48b748ce3b91..3ea0a7106906f4cda63f1b0ce7c59549 } void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode() -@@ -715,6 +733,11 @@ void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode() +@@ -716,6 +733,11 @@ void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode() // UI process, we still need to let it know about the new contents, so send an Update message. send(Messages::DrawingAreaProxy::Update(m_backingStoreStateID, updateInfo)); } @@ -20636,7 +20647,7 @@ index 4a087235e7bcf915f6e9d4daf8ad48b748ce3b91..3ea0a7106906f4cda63f1b0ce7c59549 void DrawingAreaCoordinatedGraphics::scheduleDisplay() diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp -index 91226dd76b3f18b1eb5aabd99cd840509bf309f4..71db76c7fa649de2dd19e2c6e7f307cb9810049b 100644 +index f3304d10f728128652c33426558e4dc4f6b659b5..79dbf60f6db0d45f84f5a4576be6f68aa7797e72 100644 --- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp +++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp @@ -183,8 +183,16 @@ void LayerTreeHost::setViewOverlayRootLayer(GraphicsLayer* viewOverlayRootLayer) @@ -20832,7 +20843,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 11beee97f7eb12b27f17de7e03fd4215a2d6a668..d300e79b88f3bf494e68af70119ba8c8bf632f74 100644 +index 4d873e6bb2d08c37a57986b35ead605fd607379b..756d782d3ca490aaea400485fb35a5c4139e6af2 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp @@ -885,6 +885,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) @@ -20868,7 +20879,7 @@ index 11beee97f7eb12b27f17de7e03fd4215a2d6a668..d300e79b88f3bf494e68af70119ba8c8 void WebPage::loadRequest(LoadParameters&& loadParameters) { setLastNavigationWasAppInitiated(loadParameters.request.isAppInitiated()); -@@ -1922,17 +1941,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1919,17 +1938,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -20887,7 +20898,7 @@ index 11beee97f7eb12b27f17de7e03fd4215a2d6a668..d300e79b88f3bf494e68af70119ba8c8 // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -1949,20 +1964,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1946,20 +1961,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -20915,7 +20926,7 @@ index 11beee97f7eb12b27f17de7e03fd4215a2d6a668..d300e79b88f3bf494e68af70119ba8c8 #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -1970,7 +1983,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1967,7 +1980,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -20923,7 +20934,7 @@ index 11beee97f7eb12b27f17de7e03fd4215a2d6a668..d300e79b88f3bf494e68af70119ba8c8 void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2265,6 +2277,7 @@ void WebPage::scaleView(double scale) +@@ -2262,6 +2274,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -20931,7 +20942,7 @@ index 11beee97f7eb12b27f17de7e03fd4215a2d6a668..d300e79b88f3bf494e68af70119ba8c8 scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2369,17 +2382,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2366,17 +2379,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -20950,7 +20961,7 @@ index 11beee97f7eb12b27f17de7e03fd4215a2d6a668..d300e79b88f3bf494e68af70119ba8c8 } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3261,6 +3270,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3258,6 +3267,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -21055,7 +21066,7 @@ index 11beee97f7eb12b27f17de7e03fd4215a2d6a668..d300e79b88f3bf494e68af70119ba8c8 #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3337,6 +3444,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3334,6 +3441,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -21067,7 +21078,7 @@ index 11beee97f7eb12b27f17de7e03fd4215a2d6a668..d300e79b88f3bf494e68af70119ba8c8 void WebPage::insertNewlineInQuotedContent() { Frame& frame = m_page->focusController().focusedOrMainFrame(); -@@ -3574,6 +3686,7 @@ void WebPage::didCompletePageTransition() +@@ -3571,6 +3683,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -21075,7 +21086,7 @@ index 11beee97f7eb12b27f17de7e03fd4215a2d6a668..d300e79b88f3bf494e68af70119ba8c8 } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4328,7 +4441,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4325,7 +4438,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -21084,7 +21095,7 @@ index 11beee97f7eb12b27f17de7e03fd4215a2d6a668..d300e79b88f3bf494e68af70119ba8c8 void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6663,6 +6776,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6660,6 +6773,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -21095,7 +21106,7 @@ index 11beee97f7eb12b27f17de7e03fd4215a2d6a668..d300e79b88f3bf494e68af70119ba8c8 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index 0aae4b01fe5022bf8e7b300508259a72a19010ff..00bad158f41c985befefd63fd5d2ba6b13aabfa0 100644 +index 49a3641190a5810679d9dfbfff37307ed67a06ee..d0425ca065af5922a4eac8f27c1920ef02b7d528 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -112,6 +112,10 @@ typedef struct _AtkObject AtkObject; @@ -21176,7 +21187,7 @@ index 0aae4b01fe5022bf8e7b300508259a72a19010ff..00bad158f41c985befefd63fd5d2ba6b bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index d88ef0ebb5baa14d44e0e9c19926b6365efe1095..59768805ec4e90fa23b700ff87f70353cc84bbf2 100644 +index 93e99df600ef73e8947bb85e5aec57e7a2c741f9..ef554ed7091d837ace5ecdc6c24844dd6d70037d 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in @@ -133,6 +133,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType @@ -21270,7 +21281,7 @@ index 375e5e97370d73edce1afe1dc704a851921427f8..3ce7528d64a3695e6c87b78df3e219b8 } diff --git a/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp b/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp -index 8e9454597bb23b22c506f929020fc3c37ffaa71a..9730e673e85da143a3acdda03fb9fa3fb4fb1119 100644 +index 0cf4707d44fb20a2cb125aaf9465d1282bf84651..59a6c108a4be8ef05ae01cb594898357b385a8fb 100644 --- a/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp +++ b/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp @@ -43,6 +43,7 @@ @@ -21422,7 +21433,7 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index b7290da447b86358d16978005af222354e71010c..9c04c048476eddf008e4572c42138a16451fcd47 100644 +index 47660cb3c855b52e285c3cd3d609578467f18d62..8eee0dbb2cd15ea617dee180bf6d14bfdb6d4219 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -5,6 +5,8 @@ WEBKIT_OPTION_BEGIN() @@ -21499,7 +21510,7 @@ index b7290da447b86358d16978005af222354e71010c..9c04c048476eddf008e4572c42138a16 # 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 4469f0aee0f55a362108454928dd50bc7425390c..1257bf58bba7ea0001f081fa4d9211ef6689bdb9 100644 +index d56deb89621c555915bd63aafe89f1938de1d920..278ea0e7abeac6d42734ab946b7c57bb8f661112 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -3,6 +3,7 @@ include(VersioningUtils) @@ -21611,10 +21622,10 @@ index ae2ab4d10367dbf6bc38f9a0246cab2485b6fb67..7629d6711783694d963c89685d03cfe0 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) else () diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake -index 512392e6424ea64ff65fffc14df30344ce6cbe99..90b7c9614333868ff8c157f5bd938da98be4871d 100644 +index 5b567ef79f608d4a0b35091de0748fdf00b791d2..3aca60271e085f7c271518c5dd9d44c7b6f93381 100644 --- a/Source/cmake/OptionsWinCairo.cmake +++ b/Source/cmake/OptionsWinCairo.cmake -@@ -32,15 +32,36 @@ if (OpenJPEG_FOUND) +@@ -27,15 +27,36 @@ if (OpenJPEG_FOUND) endif () find_package(WOFF2 1.0.2 COMPONENTS dec) @@ -21760,10 +21771,10 @@ index 62629b4c1c25ae82bd797b39bbf9de0331f8eed2..5de7900a29b0e629f1ac404bbb0dc5b4 typedef struct _BrowserWindow BrowserWindow; diff --git a/Tools/MiniBrowser/gtk/main.c b/Tools/MiniBrowser/gtk/main.c -index 241ac28e0d59d93c81bad88bcddcb197620b3f2a..6554de7369b99556ff558a0340dd580bf9420393 100644 +index 9e7863b61b3e9db76e04e14f45116684dae44e37..1ed236613cfd8d45b2faa13ee0ea3bbe494baa19 100644 --- a/Tools/MiniBrowser/gtk/main.c +++ b/Tools/MiniBrowser/gtk/main.c -@@ -55,7 +55,12 @@ static gboolean enableITP; +@@ -56,7 +56,12 @@ static gboolean enableITP; static gboolean enableSandbox; static gboolean exitAfterLoad; static gboolean webProcessCrashed; @@ -21776,7 +21787,7 @@ index 241ac28e0d59d93c81bad88bcddcb197620b3f2a..6554de7369b99556ff558a0340dd580b typedef enum { MINI_BROWSER_ERROR_INVALID_ABOUT_PATH -@@ -149,6 +154,10 @@ static const GOptionEntry commandLineOptions[] = +@@ -150,6 +155,10 @@ static const GOptionEntry commandLineOptions[] = { "enable-sandbox", 0, 0, G_OPTION_ARG_NONE, &enableSandbox, "Enable web process sandbox support", NULL }, { "exit-after-load", 0, 0, G_OPTION_ARG_NONE, &exitAfterLoad, "Quit the browser after the load finishes", NULL }, { "version", 'v', 0, G_OPTION_ARG_NONE, &printVersion, "Print the WebKitGTK version", NULL }, @@ -21787,7 +21798,7 @@ index 241ac28e0d59d93c81bad88bcddcb197620b3f2a..6554de7369b99556ff558a0340dd580b { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, 0, "[URL…]" }, { 0, 0, 0, 0, 0, 0, 0 } }; -@@ -617,6 +626,48 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul +@@ -618,6 +627,48 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul g_main_loop_quit(data->mainLoop); } @@ -21836,7 +21847,7 @@ index 241ac28e0d59d93c81bad88bcddcb197620b3f2a..6554de7369b99556ff558a0340dd580b static void startup(GApplication *application) { const char *actionAccels[] = { -@@ -647,10 +698,22 @@ static void startup(GApplication *application) +@@ -648,10 +699,22 @@ static void startup(GApplication *application) static void activate(GApplication *application, WebKitSettings *webkitSettings) { @@ -21861,7 +21872,7 @@ index 241ac28e0d59d93c81bad88bcddcb197620b3f2a..6554de7369b99556ff558a0340dd580b char *dataDirectory = g_build_filename(g_get_user_data_dir(), "webkitgtk-" WEBKITGTK_API_VERSION_STRING, "MiniBrowser", NULL); char *cacheDirectory = g_build_filename(g_get_user_cache_dir(), "webkitgtk-" WEBKITGTK_API_VERSION_STRING, "MiniBrowser", NULL); manager = webkit_website_data_manager_new("base-data-directory", dataDirectory, "base-cache-directory", cacheDirectory, NULL); -@@ -674,6 +737,7 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings) +@@ -675,6 +738,7 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings) "use-system-appearance-for-scrollbars", FALSE, #endif NULL); @@ -21869,7 +21880,7 @@ index 241ac28e0d59d93c81bad88bcddcb197620b3f2a..6554de7369b99556ff558a0340dd580b g_object_unref(manager); if (enableSandbox) -@@ -755,9 +819,7 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings) +@@ -756,9 +820,7 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings) if (exitAfterLoad) exitAfterWebViewLoadFinishes(webView, application); } @@ -21880,7 +21891,7 @@ index 241ac28e0d59d93c81bad88bcddcb197620b3f2a..6554de7369b99556ff558a0340dd580b } } else { WebKitWebView *webView = createBrowserTab(mainWindow, webkitSettings, userContentManager, defaultWebsitePolicies); -@@ -833,9 +895,11 @@ int main(int argc, char *argv[]) +@@ -834,9 +896,11 @@ int main(int argc, char *argv[]) } GtkApplication *application = gtk_application_new("org.webkitgtk.MiniBrowser", G_APPLICATION_NON_UNIQUE); @@ -21893,10 +21904,10 @@ index 241ac28e0d59d93c81bad88bcddcb197620b3f2a..6554de7369b99556ff558a0340dd580b return exitAfterLoad && webProcessCrashed ? 1 : 0; diff --git a/Tools/MiniBrowser/wpe/main.cpp b/Tools/MiniBrowser/wpe/main.cpp -index 2e5c76219de1a60dccae1c8088ceabd8b12c95d0..cf6650a4fda1516b2adf578fc263ad874b200c01 100644 +index e01baba8002a4f6478e681f15aadaa1880e0214b..87fab30d048a6209ccc9b1c0f4fbd3f04f8a2d36 100644 --- a/Tools/MiniBrowser/wpe/main.cpp +++ b/Tools/MiniBrowser/wpe/main.cpp -@@ -40,6 +40,9 @@ static gboolean headlessMode; +@@ -41,6 +41,9 @@ static gboolean headlessMode; static gboolean privateMode; static gboolean automationMode; static gboolean ignoreTLSErrors; @@ -21906,7 +21917,7 @@ index 2e5c76219de1a60dccae1c8088ceabd8b12c95d0..cf6650a4fda1516b2adf578fc263ad87 static const char* contentFilter; static const char* cookiesFile; static const char* cookiesPolicy; -@@ -63,6 +66,9 @@ static const GOptionEntry commandLineOptions[] = +@@ -64,6 +67,9 @@ static const GOptionEntry commandLineOptions[] = { "bg-color", 0, 0, G_OPTION_ARG_STRING, &bgColor, "Window background color. Default: white", "COLOR" }, { "enable-itp", 0, 0, G_OPTION_ARG_NONE, &enableITP, "Enable Intelligent Tracking Prevention (ITP)", nullptr }, { "version", 'v', 0, G_OPTION_ARG_NONE, &printVersion, "Print the WPE version", nullptr }, @@ -21916,7 +21927,7 @@ index 2e5c76219de1a60dccae1c8088ceabd8b12c95d0..cf6650a4fda1516b2adf578fc263ad87 { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, nullptr, "[URL]" }, { nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr } }; -@@ -147,13 +153,34 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul +@@ -148,13 +154,34 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul g_main_loop_quit(data->mainLoop); } @@ -21952,7 +21963,7 @@ index 2e5c76219de1a60dccae1c8088ceabd8b12c95d0..cf6650a4fda1516b2adf578fc263ad87 { auto backend = createViewBackend(1280, 720); struct wpe_view_backend* wpeBackend = backend->backend(); -@@ -165,17 +192,66 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi +@@ -166,17 +193,66 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi delete static_cast(data); }, backend.release()); @@ -22021,7 +22032,7 @@ index 2e5c76219de1a60dccae1c8088ceabd8b12c95d0..cf6650a4fda1516b2adf578fc263ad87 int main(int argc, char *argv[]) { #if ENABLE_DEVELOPER_MODE -@@ -207,6 +283,16 @@ int main(int argc, char *argv[]) +@@ -208,6 +284,16 @@ int main(int argc, char *argv[]) } auto* loop = g_main_loop_new(nullptr, FALSE); @@ -22038,7 +22049,7 @@ index 2e5c76219de1a60dccae1c8088ceabd8b12c95d0..cf6650a4fda1516b2adf578fc263ad87 auto backend = createViewBackend(1280, 720); struct wpe_view_backend* wpeBackend = backend->backend(); -@@ -216,7 +302,15 @@ int main(int argc, char *argv[]) +@@ -217,7 +303,15 @@ int main(int argc, char *argv[]) return 1; } @@ -22055,7 +22066,7 @@ index 2e5c76219de1a60dccae1c8088ceabd8b12c95d0..cf6650a4fda1516b2adf578fc263ad87 webkit_website_data_manager_set_itp_enabled(manager, enableITP); if (proxy) { -@@ -228,7 +322,8 @@ int main(int argc, char *argv[]) +@@ -229,7 +323,8 @@ int main(int argc, char *argv[]) if (ignoreTLSErrors) webkit_website_data_manager_set_tls_errors_policy(manager, WEBKIT_TLS_ERRORS_POLICY_IGNORE); @@ -22065,7 +22076,7 @@ index 2e5c76219de1a60dccae1c8088ceabd8b12c95d0..cf6650a4fda1516b2adf578fc263ad87 g_object_unref(manager); if (cookiesPolicy) { -@@ -287,7 +382,14 @@ int main(int argc, char *argv[]) +@@ -288,7 +383,14 @@ int main(int argc, char *argv[]) auto* viewBackend = webkit_web_view_backend_new(wpeBackend, [](gpointer data) { delete static_cast(data); }, backend.release()); @@ -22081,7 +22092,7 @@ index 2e5c76219de1a60dccae1c8088ceabd8b12c95d0..cf6650a4fda1516b2adf578fc263ad87 auto* webView = WEBKIT_WEB_VIEW(g_object_new(WEBKIT_TYPE_WEB_VIEW, "backend", viewBackend, "web-context", webContext, -@@ -304,8 +406,6 @@ int main(int argc, char *argv[]) +@@ -305,8 +407,6 @@ int main(int argc, char *argv[]) backendPtr->setAccessibleChild(ATK_OBJECT(accessible)); #endif @@ -22090,7 +22101,7 @@ index 2e5c76219de1a60dccae1c8088ceabd8b12c95d0..cf6650a4fda1516b2adf578fc263ad87 webkit_web_context_set_automation_allowed(webContext, automationMode); g_signal_connect(webContext, "automation-started", G_CALLBACK(automationStartedCallback), webView); g_signal_connect(webView, "permission-request", G_CALLBACK(decidePermissionRequest), nullptr); -@@ -318,16 +418,9 @@ int main(int argc, char *argv[]) +@@ -319,16 +419,9 @@ int main(int argc, char *argv[]) webkit_web_view_set_background_color(webView, &color); if (uriArguments) { @@ -22110,7 +22121,7 @@ index 2e5c76219de1a60dccae1c8088ceabd8b12c95d0..cf6650a4fda1516b2adf578fc263ad87 webkit_web_view_load_uri(webView, "about:blank"); else webkit_web_view_load_uri(webView, "https://wpewebkit.org"); -@@ -337,8 +430,7 @@ int main(int argc, char *argv[]) +@@ -338,8 +431,7 @@ int main(int argc, char *argv[]) g_hash_table_destroy(openViews);