From f8bc2cf41e03ae53e0c663e26be7d8672ececd27 Mon Sep 17 00:00:00 2001 From: Pavel Feldman Date: Wed, 14 Jul 2021 13:39:13 -0700 Subject: [PATCH] browser(webkit): roll to ToT 7/14/2021 (#7617) --- browser_patches/webkit/BUILD_NUMBER | 4 +- browser_patches/webkit/UPSTREAM_CONFIG.sh | 2 +- browser_patches/webkit/patches/bootstrap.diff | 372 +++++++++--------- 3 files changed, 183 insertions(+), 195 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 2b37f24270..3f1e841bb3 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1514 -Changed: pavel.feldman@gmail.com Wed Jul 14 09:10:18 PDT 2021 +1515 +Changed: pavel.feldman@gmail.com Wed 14 Jul 2021 01:36:27 PM PDT diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 471f742423..f66a908ad7 100644 --- a/browser_patches/webkit/UPSTREAM_CONFIG.sh +++ b/browser_patches/webkit/UPSTREAM_CONFIG.sh @@ -1,3 +1,3 @@ REMOTE_URL="https://git.webkit.org/git/WebKit.git" BASE_BRANCH="master" -BASE_REVISION="4671d85764736751654f6f10e0372732415a7ee3" +BASE_REVISION="bf8523d11fc7a9fd8cbcc6f85dd31df3ceb2b138" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index dce8a3e2e0..63588848e2 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -1,5 +1,5 @@ diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt -index d0c56839b9671ac0e8ffc59edfbe37b3d5a1c338..6a292724bcccfc574ee611ec5b97d4b7f3adada3 100644 +index 873792881735b3f81ceb2fae6fcee4696781b44f..70efec93324024c107cd6af545dc39aeef233db5 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt @@ -1243,22 +1243,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS @@ -1936,10 +1936,10 @@ index d8677555342ee0168223a0bc3ef54603b1a23460..b9ee7198a702cbc0241de3a33b65a694 41323A1D2665288B00B38623 /* packet_sequencer.cc in Sources */, 4131BF2D234B88200028A615 /* rtc_stats_collector.cc in Sources */, diff --git a/Source/WTF/Scripts/Preferences/WebPreferences.yaml b/Source/WTF/Scripts/Preferences/WebPreferences.yaml -index e7331574bbfe695080432c506a393ed218d0e651..8333ecf890ba03175aa5fa9afe89217f6a377f4c 100644 +index 9b681a741c311ec2246f5b6de5df46e6f713d90c..1e3c9c43e2c7ef31e364ca056bf107e537325768 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferences.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferences.yaml -@@ -1010,7 +1010,7 @@ InspectorStartsAttached: +@@ -1020,7 +1020,7 @@ InspectorStartsAttached: exposed: [ WebKit ] defaultValue: WebKit: @@ -2155,7 +2155,7 @@ index 9bd5fde5bc38355e25bc09d05a045df31efaa259..3f3be653fef9930a7ac8a348c8b9f9a2 if (Systemd_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 1456b7717e8f75c28f841da6d728f9a7e2518b24..468ede9b8a2e14857281b456dd8832407fd09e12 100644 +index 31e768e7e0ff681de8ba1b23e368f061e072a4fa..382649c414898b829fea1779f9fa6b38a993944a 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -391,7 +391,7 @@ @@ -2342,7 +2342,7 @@ index ef168b76819216d984b7a2d0f760005fb9d24de8..2d6cf51f3b45191ad84106429d4f108f __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 4400180f792059769c250476e0b1e5da164e6232..b03ad6d912bfbfc3e10d988832cecf62fecf2948 100644 +index 4a1d78654768bc284fd67d7466d89acbd60cce98..63e0cd23e6a8c82c5a7b2d80b2614d5c3a924b6b 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj @@ -5349,6 +5349,14 @@ @@ -2360,7 +2360,7 @@ index 4400180f792059769c250476e0b1e5da164e6232..b03ad6d912bfbfc3e10d988832cecf62 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, ); }; }; -@@ -16861,6 +16869,14 @@ +@@ -16854,6 +16862,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 = ""; }; @@ -2375,7 +2375,7 @@ index 4400180f792059769c250476e0b1e5da164e6232..b03ad6d912bfbfc3e10d988832cecf62 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 = ""; }; -@@ -22481,7 +22497,12 @@ +@@ -22474,7 +22490,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2388,7 +2388,7 @@ index 4400180f792059769c250476e0b1e5da164e6232..b03ad6d912bfbfc3e10d988832cecf62 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -28199,6 +28220,8 @@ +@@ -28185,6 +28206,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2397,7 +2397,7 @@ index 4400180f792059769c250476e0b1e5da164e6232..b03ad6d912bfbfc3e10d988832cecf62 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -30633,6 +30656,7 @@ +@@ -30619,6 +30642,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2405,7 +2405,7 @@ index 4400180f792059769c250476e0b1e5da164e6232..b03ad6d912bfbfc3e10d988832cecf62 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -31641,6 +31665,7 @@ +@@ -31627,6 +31651,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2413,7 +2413,7 @@ index 4400180f792059769c250476e0b1e5da164e6232..b03ad6d912bfbfc3e10d988832cecf62 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -33677,6 +33702,7 @@ +@@ -33663,6 +33688,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2421,7 +2421,7 @@ index 4400180f792059769c250476e0b1e5da164e6232..b03ad6d912bfbfc3e10d988832cecf62 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -35741,9 +35767,11 @@ +@@ -35727,9 +35753,11 @@ B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */, @@ -2433,7 +2433,7 @@ index 4400180f792059769c250476e0b1e5da164e6232..b03ad6d912bfbfc3e10d988832cecf62 B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -36705,6 +36733,7 @@ +@@ -36691,6 +36719,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2441,7 +2441,7 @@ index 4400180f792059769c250476e0b1e5da164e6232..b03ad6d912bfbfc3e10d988832cecf62 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -36791,6 +36820,7 @@ +@@ -36777,6 +36806,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2449,7 +2449,7 @@ index 4400180f792059769c250476e0b1e5da164e6232..b03ad6d912bfbfc3e10d988832cecf62 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -36839,6 +36869,7 @@ +@@ -36825,6 +36855,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2457,7 +2457,7 @@ index 4400180f792059769c250476e0b1e5da164e6232..b03ad6d912bfbfc3e10d988832cecf62 DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -37371,6 +37402,7 @@ +@@ -37357,6 +37388,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2466,7 +2466,7 @@ index 4400180f792059769c250476e0b1e5da164e6232..b03ad6d912bfbfc3e10d988832cecf62 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 4436fd8ca990af2e5cc147047fc39c2470104e64..9ebf2f8e499066a5e7461cfa1f8287f54a12e60c 100644 +index 220b4a87f39b5df253e859126502fb3aa181c97c..bd5b0d39f09b21ef8ef4b3996e6f3ee0797130a0 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -59,6 +59,7 @@ @@ -2477,7 +2477,7 @@ index 4436fd8ca990af2e5cc147047fc39c2470104e64..9ebf2f8e499066a5e7461cfa1f8287f5 #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3271,10 +3272,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -3274,10 +3275,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (useParentData ? m_isIgnoredFromParentData.isPresentationalChildOfAriaRole : isPresentationalChildOfAriaRole()) return AccessibilityObjectInclusion::IgnoreObject; @@ -2497,7 +2497,7 @@ index 4436fd8ca990af2e5cc147047fc39c2470104e64..9ebf2f8e499066a5e7461cfa1f8287f5 { AXComputedObjectAttributeCache* attributeCache = nullptr; diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -index 7790e27189a050ff4a8c37e431b01632975d27a4..8660a68fcba1d3950305669a2cbb3f36771cc9c8 100644 +index b50c654427bbd629e00456bb63732099b96c5f6f..0c829c5da76bd24d152b5593387569d09e64494d 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h @@ -88,6 +88,8 @@ namespace WebCore { @@ -5338,7 +5338,7 @@ index 367675741089a498870aa9e16a20b419bee0eef9..b15bf5fd318862fd50aa2f5cf26cd29d } diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h -index e693532ebd64f5c042c7c37d839189597d6e6909..242829bb5200d6524978594cdc9061dc538c3cdd 100644 +index 39eb06299e570c4759aecf0ef0971824eb505624..2f23d3e02f50ef08a761c783409979d7b4b01ae0 100644 --- a/Source/WebCore/loader/DocumentLoader.h +++ b/Source/WebCore/loader/DocumentLoader.h @@ -166,9 +166,13 @@ public: @@ -5356,7 +5356,7 @@ index e693532ebd64f5c042c7c37d839189597d6e6909..242829bb5200d6524978594cdc9061dc DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index cf22e4f086a275725a943e4069e073e29067f16d..8d7bfb190c746a5dd0876ad4acd6571fe8f529ec 100644 +index 854c13ee4ae01e6c2b83c5111b480318913ae0c5..26dd26904988564d57a9f3f86b5e7d9768513092 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 @@ -5436,7 +5436,7 @@ index b018af04d05ce3ac38bb57d8e50a7b063ee51733..6929c01318f509ed560276168d18e011 virtual bool shouldPerformSecurityChecks() const { return false; } virtual bool havePerformedSecurityChecks(const ResourceResponse&) const { return false; } diff --git a/Source/WebCore/loader/PolicyChecker.cpp b/Source/WebCore/loader/PolicyChecker.cpp -index c082a981526d40408c85bb16683ab14ef6dd6e88..2f8eb1b0cabb23b230ea37254e7a18077335bc30 100644 +index 47147495fb4cf84cd0d2a6b68fc2f310be7c09e0..3d9403cc8609b73d83ec8350730619e15dce952b 100644 --- a/Source/WebCore/loader/PolicyChecker.cpp +++ b/Source/WebCore/loader/PolicyChecker.cpp @@ -46,6 +46,7 @@ @@ -5447,7 +5447,7 @@ index c082a981526d40408c85bb16683ab14ef6dd6e88..2f8eb1b0cabb23b230ea37254e7a1807 #include "Logging.h" #include "ThreadableBlobRegistry.h" #include -@@ -261,26 +262,32 @@ void FrameLoader::PolicyChecker::checkNewWindowPolicy(NavigationAction&& navigat +@@ -257,26 +258,32 @@ void FrameLoader::PolicyChecker::checkNewWindowPolicy(NavigationAction&& navigat auto blobURLLifetimeExtension = extendBlobURLLifetimeIfNecessary(request, nullptr); @@ -6269,10 +6269,10 @@ index 28d1fc3242174a680711027877d4153923790220..058b5309eed081fcc1e4158f66e80642 if (stateObjectType == StateObjectType::Push) { frame->loader().history().pushState(WTFMove(data), title, fullURL.string()); diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp -index f2f01ac8074e7208218ac3f749a27394b3cd1ba0..c6e857d2daa0b0141de6629e571ca82256e760f2 100644 +index ed9d8140eb704b12f32a87a28d85265543fbfa92..4028cad398fe50c1c771e1b386e08d5829d73892 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp -@@ -448,6 +448,37 @@ void Page::setOverrideViewportArguments(const std::optional& +@@ -453,6 +453,37 @@ void Page::setOverrideViewportArguments(const std::optional& document->updateViewportArguments(); } @@ -6310,7 +6310,7 @@ index f2f01ac8074e7208218ac3f749a27394b3cd1ba0..c6e857d2daa0b0141de6629e571ca822 ScrollingCoordinator* Page::scrollingCoordinator() { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { -@@ -1269,11 +1300,6 @@ void Page::didCommitLoad() +@@ -1274,11 +1305,6 @@ void Page::didCommitLoad() #if ENABLE(EDITABLE_REGION) m_isEditableRegionEnabled = false; #endif @@ -6322,7 +6322,7 @@ index f2f01ac8074e7208218ac3f749a27394b3cd1ba0..c6e857d2daa0b0141de6629e571ca822 resetSeenPlugins(); resetSeenMediaEngines(); -@@ -3251,6 +3277,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3256,6 +3282,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -6340,7 +6340,7 @@ index f2f01ac8074e7208218ac3f749a27394b3cd1ba0..c6e857d2daa0b0141de6629e571ca822 { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index 2079c5a54bb1084eaec1b5553a6115103b097c80..daeaece6c1bed4d37e19df2471b25e6ae3517d72 100644 +index 7b390cbac69380642210d75d4492838361481713..a1648323af19b106c6ed9bf5f442c19e42e292d6 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h @@ -256,6 +256,9 @@ public: @@ -6353,7 +6353,7 @@ index 2079c5a54bb1084eaec1b5553a6115103b097c80..daeaece6c1bed4d37e19df2471b25e6a static void refreshPlugins(bool reload); WEBCORE_EXPORT PluginData& pluginData(); void clearPluginData(); -@@ -302,6 +305,10 @@ public: +@@ -303,6 +306,10 @@ public: DragCaretController& dragCaretController() const { return *m_dragCaretController; } #if ENABLE(DRAG_SUPPORT) DragController& dragController() const { return *m_dragController; } @@ -6364,7 +6364,7 @@ index 2079c5a54bb1084eaec1b5553a6115103b097c80..daeaece6c1bed4d37e19df2471b25e6a #endif FocusController& focusController() const { return *m_focusController; } #if ENABLE(CONTEXT_MENUS) -@@ -460,6 +467,8 @@ public: +@@ -461,6 +468,8 @@ public: WEBCORE_EXPORT void effectiveAppearanceDidChange(bool useDarkAppearance, bool useElevatedUserInterfaceLevel); bool defaultUseDarkAppearance() const { return m_useDarkAppearance; } void setUseDarkAppearanceOverride(std::optional); @@ -6373,7 +6373,7 @@ index 2079c5a54bb1084eaec1b5553a6115103b097c80..daeaece6c1bed4d37e19df2471b25e6a #if ENABLE(TEXT_AUTOSIZING) float textAutosizingWidth() const { return m_textAutosizingWidth; } -@@ -836,6 +845,11 @@ public: +@@ -837,6 +846,11 @@ public: WEBCORE_EXPORT Vector> editableElementsInRect(const FloatRect&) const; @@ -6385,7 +6385,7 @@ index 2079c5a54bb1084eaec1b5553a6115103b097c80..daeaece6c1bed4d37e19df2471b25e6a #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -921,6 +935,9 @@ private: +@@ -922,6 +936,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -6395,7 +6395,7 @@ index 2079c5a54bb1084eaec1b5553a6115103b097c80..daeaece6c1bed4d37e19df2471b25e6a #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1000,6 +1017,7 @@ private: +@@ -1001,6 +1018,7 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6403,7 +6403,7 @@ index 2079c5a54bb1084eaec1b5553a6115103b097c80..daeaece6c1bed4d37e19df2471b25e6a #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1160,6 +1178,11 @@ private: +@@ -1161,6 +1179,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -6416,29 +6416,29 @@ index 2079c5a54bb1084eaec1b5553a6115103b097c80..daeaece6c1bed4d37e19df2471b25e6a #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) RefPtr m_deviceOrientationUpdateProvider; diff --git a/Source/WebCore/page/PointerCaptureController.cpp b/Source/WebCore/page/PointerCaptureController.cpp -index 2903e934ebf5cf0e755d817d778717fe01ae066b..8d644b579ebd02761a4f6ff7db5f526623bc376c 100644 +index a220d0dc9959a0dd3c3a1b2b67b6dca9d3267a56..2b20c565a61941908cf56bbe8a15da83002f084c 100644 --- a/Source/WebCore/page/PointerCaptureController.cpp +++ b/Source/WebCore/page/PointerCaptureController.cpp -@@ -202,7 +202,7 @@ bool PointerCaptureController::preventsCompatibilityMouseEventsForIdentifier(Poi - return iterator != m_activePointerIdsToCapturingData.end() && iterator->value.preventsCompatibilityMouseEvents; +@@ -196,7 +196,7 @@ bool PointerCaptureController::preventsCompatibilityMouseEventsForIdentifier(Poi + return capturingData && capturingData->preventsCompatibilityMouseEvents; } -#if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS_FAMILY) +#if ENABLE(TOUCH_EVENTS) static bool hierarchyHasCapturingEventListeners(Element* target, const AtomString& eventName) { - for (ContainerNode* curr = target; curr; curr = curr->parentInComposedTree()) { -@@ -489,7 +489,7 @@ void PointerCaptureController::cancelPointer(PointerID pointerId, const IntPoint - capturingData.pendingTargetOverride = nullptr; - capturingData.state = CapturingData::State::Cancelled; + for (RefPtr currentNode = target; currentNode; currentNode = currentNode->parentInComposedTree()) { +@@ -477,7 +477,7 @@ void PointerCaptureController::cancelPointer(PointerID pointerId, const IntPoint + capturingData->pendingTargetOverride = nullptr; + capturingData->state = CapturingData::State::Cancelled; -#if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS_FAMILY) +#if ENABLE(TOUCH_EVENTS) - capturingData.previousTarget = nullptr; + capturingData->previousTarget = nullptr; #endif diff --git a/Source/WebCore/page/PointerCaptureController.h b/Source/WebCore/page/PointerCaptureController.h -index 27ee794779152f113b49391e4e59614cb5794764..cad99479d44588710bb87dd1a6c6c367149c515a 100644 +index 49548142f6db6b245cf6ba234272615028aad1ae..ff1ed0ea25ff4f036763c5f381803cc303956b92 100644 --- a/Source/WebCore/page/PointerCaptureController.h +++ b/Source/WebCore/page/PointerCaptureController.h @@ -57,7 +57,7 @@ public: @@ -6450,8 +6450,8 @@ index 27ee794779152f113b49391e4e59614cb5794764..cad99479d44588710bb87dd1a6c6c367 void dispatchEventForTouchAtIndex(EventTarget&, const PlatformTouchEvent&, unsigned, bool isPrimary, WindowProxy&); #endif -@@ -72,7 +72,7 @@ private: - struct CapturingData { +@@ -77,7 +77,7 @@ private: + RefPtr pendingTargetOverride; RefPtr targetOverride; -#if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS_FAMILY) @@ -7317,7 +7317,7 @@ index 0000000000000000000000000000000000000000..f0c3a183e5bc44bdfa4201e0db2067b4 + +#endif // ENABLE(SPEECH_SYNTHESIS) diff --git a/Source/WebCore/platform/graphics/FontCascade.h b/Source/WebCore/platform/graphics/FontCascade.h -index 6dade9146fe99078ac1a58b28cf0c5dd0c351095..16a641f4237a8a3a7a40461e3429551f7ca96203 100644 +index 6eca247ea9c8a91d72817a5123cb734502d732b7..a3ec9c074ab3256319b71cc0bae7379fbbb68d77 100644 --- a/Source/WebCore/platform/graphics/FontCascade.h +++ b/Source/WebCore/platform/graphics/FontCascade.h @@ -283,7 +283,8 @@ private: @@ -9094,7 +9094,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 0374f5c47a819d6a68f76207db2f03ad8c21f48d..9ebc13d8c0854192e5de2a8e1ab3fe51b1170a32 100644 +index aea2faa58a1581f00bf56bceeed177b44a436096..58a9e01eaa818d684cc230962a4d6f49a567eb62 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -26,7 +26,6 @@ @@ -9166,10 +9166,10 @@ index 0374f5c47a819d6a68f76207db2f03ad8c21f48d..9ebc13d8c0854192e5de2a8e1ab3fe51 void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index 08da56f19779bc74d8f4a28d58a167ec89a02e4e..75068b7bfd10a580c1e1c242f4cb60f9a36dab8d 100644 +index 7948097aa3dc386a2fd41fad623b3cecdf8d7e4a..364575825d4adb9e9147d770207297601865cc18 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h -@@ -34,6 +34,7 @@ +@@ -35,6 +35,7 @@ #include "NetworkContentRuleListManager.h" #include "RTCDataChannelRemoteManagerProxy.h" #include "SandboxExtension.h" @@ -9177,7 +9177,7 @@ index 08da56f19779bc74d8f4a28d58a167ec89a02e4e..75068b7bfd10a580c1e1c242f4cb60f9 #include "WebIDBServer.h" #include "WebPageProxyIdentifier.h" #include "WebResourceLoadStatisticsStore.h" -@@ -79,6 +80,7 @@ class SessionID; +@@ -80,6 +81,7 @@ class SessionID; namespace WebCore { class CertificateInfo; @@ -9185,7 +9185,7 @@ index 08da56f19779bc74d8f4a28d58a167ec89a02e4e..75068b7bfd10a580c1e1c242f4cb60f9 class CurlProxySettings; class ProtectionSpace; class StorageQuotaManager; -@@ -209,6 +211,14 @@ public: +@@ -210,6 +212,14 @@ public: void addWebsiteDataStore(WebsiteDataStoreParameters&&); @@ -9201,12 +9201,12 @@ index 08da56f19779bc74d8f4a28d58a167ec89a02e4e..75068b7bfd10a580c1e1c242f4cb60f9 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 ae15ff0e12ca545178907d972a09ce6d2321a2d4..4ee782cbb1e4ce8228785f63fa1ca868276a2be9 100644 +index e05f2e320584737b347fab21bf6a2e6979a8c8ce..ffb950331439ac81cf408a51897d3df178568d42 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in @@ -79,6 +79,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::LastNavigationWasAppBound lastNavigationWasAppBound); + 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); + GetAllCookies(PAL::SessionID sessionID) -> (Vector cookies) Async + SetCookies(PAL::SessionID sessionID, Vector cookies) -> (bool success) Async @@ -9220,10 +9220,10 @@ index ae15ff0e12ca545178907d972a09ce6d2321a2d4..4ee782cbb1e4ce8228785f63fa1ca868 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 2bff182280c428e81b6c3684f5aaf928db897932..ba3b95d3863362e3926de2b8aa6b14e6fb668467 100644 +index c38dec1a13c5111ad4552457bc7f80e0901a28e7..594f95903b7b97e2970807f807a397591bddd345 100644 --- a/Source/WebKit/NetworkProcess/NetworkSession.h +++ b/Source/WebKit/NetworkProcess/NetworkSession.h -@@ -153,6 +153,9 @@ public: +@@ -154,6 +154,9 @@ public: bool isStaleWhileRevalidateEnabled() const { return m_isStaleWhileRevalidateEnabled; } @@ -9233,7 +9233,7 @@ index 2bff182280c428e81b6c3684f5aaf928db897932..ba3b95d3863362e3926de2b8aa6b14e6 #if ENABLE(SERVICE_WORKER) void addSoftUpdateLoader(std::unique_ptr&& loader) { m_softUpdateLoaders.add(WTFMove(loader)); } void removeSoftUpdateLoader(ServiceWorkerSoftUpdateLoader* loader) { m_softUpdateLoaders.remove(loader); } -@@ -201,6 +204,7 @@ protected: +@@ -202,6 +205,7 @@ protected: #endif bool m_isStaleWhileRevalidateEnabled { false }; std::unique_ptr m_privateClickMeasurement; @@ -9461,7 +9461,7 @@ index 4ebbd90cc645df5f9ddbb860d08aa3eb053c2ff6..3d5d56a5a1b407f27e533c9c71d3e4c4 NetworkDataTaskCocoa(NetworkSession&, NetworkDataTaskClient&, const NetworkLoadParameters&); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm -index f74b3129fe72bc9fce62360606d3b39b0712cf89..f2d20693b81f3a953102ab335f3744c28be4a0ea 100644 +index d3ff8ebeb67855247f4c2563c8209becc58d8bb1..2b4e99493bbc60b2f1209c114d3d4e9cd53a758d 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm @@ -42,6 +42,7 @@ @@ -9533,7 +9533,7 @@ index f74b3129fe72bc9fce62360606d3b39b0712cf89..f2d20693b81f3a953102ab335f3744c2 + } diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index fdce7681fe6f28872b422e63549192d519476729..2ba62f93a3c4dfe91f77097ad98748486f6d3471 100644 +index 64a7293b6fead1193501927b2a8b3dbe3d739d91..247bae68cca9672e820c5f9174041ec25d74f3be 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm @@ -700,7 +700,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se @@ -9733,10 +9733,10 @@ 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 dbdfe70ca4f50f2aaba4e9f51037b8a89aad69e8..5f5ef27c9bfd20c5006dac8741ead2579704d17b 100644 +index faf19632530172520e9705c9b1ccbe46b57738c3..b6e56166359d91ab00839ff64221c8c361bbbb6e 100644 --- a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp +++ b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp -@@ -491,6 +491,7 @@ void NetworkDataTaskSoup::didSendRequest(GRefPtr&& inputStream) +@@ -493,6 +493,7 @@ void NetworkDataTaskSoup::didSendRequest(GRefPtr&& inputStream) m_networkLoadMetrics.failsTAOCheck = !passesTimingAllowOriginCheck(m_response, *origin); } @@ -9744,7 +9744,7 @@ index dbdfe70ca4f50f2aaba4e9f51037b8a89aad69e8..5f5ef27c9bfd20c5006dac8741ead257 dispatchDidReceiveResponse(); } -@@ -588,6 +589,8 @@ bool NetworkDataTaskSoup::acceptCertificate(GTlsCertificate* certificate, GTlsCe +@@ -590,6 +591,8 @@ bool NetworkDataTaskSoup::acceptCertificate(GTlsCertificate* certificate, GTlsCe { ASSERT(m_soupMessage); URL url = soupURIToURL(soup_message_get_uri(m_soupMessage.get())); @@ -10064,7 +10064,7 @@ index 001558dd58f4d85f360d5711caa03db33889011e..1e0898f985f1d13036d31e3e284258a3 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 91d21d8f236bd18832b50d2cad311cc6f2488cee..6c4caa100f785aa896569f24539467693295746c 100644 +index 2749cd893a138c2a333404ec9d183e2a1891509f..9b1f41e78669abfd7f62d8102b398bbc477316a3 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp @@ -120,6 +120,10 @@ @@ -10087,7 +10087,7 @@ index 91d21d8f236bd18832b50d2cad311cc6f2488cee..6c4caa100f785aa896569f2453946769 void ArgumentCoder::encode(Encoder& encoder, const FloatSize& floatSize) { -@@ -1403,6 +1407,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature +@@ -1416,6 +1420,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature encoder << windowFeatures.resizable; encoder << windowFeatures.fullscreen; encoder << windowFeatures.dialog; @@ -10097,7 +10097,7 @@ index 91d21d8f236bd18832b50d2cad311cc6f2488cee..6c4caa100f785aa896569f2453946769 } bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& windowFeatures) -@@ -1431,6 +1438,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win +@@ -1444,6 +1451,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win return false; if (!decoder.decode(windowFeatures.dialog)) return false; @@ -10110,7 +10110,7 @@ index 91d21d8f236bd18832b50d2cad311cc6f2488cee..6c4caa100f785aa896569f2453946769 return true; } -@@ -1444,6 +1457,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) +@@ -1457,6 +1470,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) #if PLATFORM(COCOA) encoder << dragData.pasteboardName(); encoder << dragData.fileNames(); @@ -10122,7 +10122,7 @@ index 91d21d8f236bd18832b50d2cad311cc6f2488cee..6c4caa100f785aa896569f2453946769 #endif encoder << dragData.dragDestinationActionMask(); encoder << dragData.pageID(); -@@ -1467,9 +1485,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1480,9 +1498,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(applicationFlags)) return false; @@ -10140,7 +10140,7 @@ index 91d21d8f236bd18832b50d2cad311cc6f2488cee..6c4caa100f785aa896569f2453946769 if (!decoder.decode(pasteboardName)) return false; -@@ -1485,8 +1510,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1498,8 +1523,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(pageID)) return false; @@ -10281,7 +10281,7 @@ index 7a5893eb68ad24cf92c832070485489b7cfafa0c..a2d68a5eb59d8b7155c1e17b75a12e55 const String& text() const { return m_text; } diff --git a/Source/WebKit/Shared/WebPageCreationParameters.cpp b/Source/WebKit/Shared/WebPageCreationParameters.cpp -index 6a25231f6fc258c1e38aa05ce12aa444fd7096c8..b25472d15a30834997e39632144a44aa25103654 100644 +index 2baef06cacab3e515e7046d517a5356bf03c3c30..ffd8d0943845f727d96c6631e9d4a3ea4cf790ee 100644 --- a/Source/WebKit/Shared/WebPageCreationParameters.cpp +++ b/Source/WebKit/Shared/WebPageCreationParameters.cpp @@ -156,6 +156,8 @@ void WebPageCreationParameters::encode(IPC::Encoder& encoder) const @@ -10306,7 +10306,7 @@ index 6a25231f6fc258c1e38aa05ce12aa444fd7096c8..b25472d15a30834997e39632144a44aa return std::nullopt; diff --git a/Source/WebKit/Shared/WebPageCreationParameters.h b/Source/WebKit/Shared/WebPageCreationParameters.h -index c58e6c220b1a03766aae548472f16b783e0402ac..f2d004ec07037b483c3ff0ea20c7f38a07084ad5 100644 +index 6517892212c2399e1aac36ea6b6fc3b152fd589d..05d3087309da83166943fde7ee12296cb7b3c866 100644 --- a/Source/WebKit/Shared/WebPageCreationParameters.h +++ b/Source/WebKit/Shared/WebPageCreationParameters.h @@ -247,6 +247,8 @@ struct WebPageCreationParameters { @@ -10622,10 +10622,10 @@ index 85d6f74114f4e7f82d9502d1b99d69098d6a49b6..6896c9756edb233dda46c7031e1af699 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index d488a3d966ec641d8dcf652fa37b2b49d9cd45d7..aa66ba61048e23194fbd24e955ecd68e6a5031ba 100644 +index afd5a20f6eb79fef2fd2419e142b55a3acd9d00a..6f4fa9bb8658b0563ee921ef022bd657d3d02204 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -289,11 +289,14 @@ Shared/WebsiteData/WebsiteData.cpp +@@ -292,11 +292,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -10640,7 +10640,7 @@ index d488a3d966ec641d8dcf652fa37b2b49d9cd45d7..aa66ba61048e23194fbd24e955ecd68e UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -302,6 +305,7 @@ UIProcess/PageLoadState.cpp +@@ -305,6 +308,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -10648,7 +10648,7 @@ index d488a3d966ec641d8dcf652fa37b2b49d9cd45d7..aa66ba61048e23194fbd24e955ecd68e UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -342,6 +346,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -345,6 +349,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -10657,7 +10657,7 @@ index d488a3d966ec641d8dcf652fa37b2b49d9cd45d7..aa66ba61048e23194fbd24e955ecd68e UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPreferences.cpp -@@ -463,7 +469,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -466,7 +472,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -10670,10 +10670,10 @@ index d488a3d966ec641d8dcf652fa37b2b49d9cd45d7..aa66ba61048e23194fbd24e955ecd68e UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 4cfd09faad063bc1a0f27401927118a3a0165277..f728a8620dbb2d00e2113c9f49ca04751204034d 100644 +index c449bc5d99febc2c7712def84b8e21e864277dc5..c20873bc38fb1a0cef1a120e28a4488c8fa789cc 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -268,6 +268,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm +@@ -267,6 +267,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -11669,7 +11669,7 @@ index d7a43204be693f2a7ef86240eaf567fe70052a2c..0e247c48858522e55f65957fd0d1e147 bool webkitWebViewIsScriptDialogRunning(WebKitWebView*, WebKitScriptDialog*); String webkitWebViewGetCurrentScriptDialogMessage(WebKitWebView*); diff --git a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp -index 26340c991097a452783c8d4b31bb2cfdfe0bc71f..0becf018fa83c21f71ca59070f29337d35a1299b 100644 +index 20e88d38140b9e9f2d3bda417d07a0ce2645e598..00877780de472a23184febc9f18ed1076c5cff4b 100644 --- a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp +++ b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp @@ -245,6 +245,8 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool @@ -11769,10 +11769,10 @@ index 0000000000000000000000000000000000000000..9f1a0173a5641d6f158d815b8f7b9ea6 + +#endif diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp -index 5b077d94407877794a3e5913dbd9f87f71cc9586..ef311b312be7decd0f207de61ce35ea7d5b860d0 100644 +index a3d2057a83c538999c93d34aec113e0ff8550ec0..5e5c92ac489b65d630fd43409e6fe8531e976c9e 100644 --- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp +++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp -@@ -2489,6 +2489,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase) +@@ -2506,6 +2506,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase) #endif } @@ -11785,7 +11785,7 @@ index 5b077d94407877794a3e5913dbd9f87f71cc9586..ef311b312be7decd0f207de61ce35ea7 { ASSERT(webkitWebViewBase->priv->acceleratedBackingStore); diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h -index d28f9c69cabe96554daddfec77e6f007aa0987da..ece01f3d3e2f6aaca191975048320b6a91b946ea 100644 +index 187df5e92217097766a94ad21ec631273a9764fa..64720ed966eba1578fa0a869561dd7bab2e15e0e 100644 --- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h +++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h @@ -27,6 +27,7 @@ @@ -11796,7 +11796,7 @@ index d28f9c69cabe96554daddfec77e6f007aa0987da..ece01f3d3e2f6aaca191975048320b6a #include "APIPageConfiguration.h" #include "InputMethodState.h" #include "SameDocumentNavigationType.h" -@@ -117,3 +118,5 @@ void webkitWebViewBaseSynthesizeCompositionKeyPress(WebKitWebViewBase*, const St +@@ -119,3 +120,5 @@ void webkitWebViewBaseSynthesizeWheelEvent(WebKitWebViewBase*, const GdkEvent*, void webkitWebViewBaseMakeBlank(WebKitWebViewBase*, bool); void webkitWebViewBasePageGrabbedTouch(WebKitWebViewBase*); void webkitWebViewBaseSetShouldNotifyFocusEvents(WebKitWebViewBase*, bool); @@ -12142,7 +12142,7 @@ index e4b92ace1531090ae38a7aec3d3d4febf19aee84..43690f9ef4969a39084501613bfc00a7 + +cairo_surface_t* webkitWebViewBackendTakeScreenshot(WebKitWebViewBackend*); diff --git a/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt b/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt -index 8cf9d4ff38382b3d348a732d69d00e7720576777..052e75a649f49ca8704d013a03299fd4aca68fa1 100644 +index 4b66bb95f1326bd83832b68f429c21ef68808f38..14123cde138a053111ecc3aefa1b11a6b7176321 100644 --- a/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt +++ b/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt @@ -320,6 +320,8 @@ WEBKIT_TYPE_WEB_VIEW_BACKEND @@ -12324,7 +12324,7 @@ index 454c61ffdefecc476d1560c7c43f5b5d345f281d..6de7509037b7683ddd403ee247bdf284 class PopUpSOAuthorizationSession final : public SOAuthorizationSession { public: diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h -index 849900649a2c6ee11595d743de5a1e6f188f48e7..d202e9374ad408c6621a318111266e4e9a54dae8 100644 +index 578ac9494be5219f4c34fc49e4a4d537cce8d562..a46731f082202e18441defcec367096db187e2f2 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h @@ -94,6 +94,7 @@ private: @@ -12344,7 +12344,7 @@ index 849900649a2c6ee11595d743de5a1e6f188f48e7..d202e9374ad408c6621a318111266e4e bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRequestGeolocationPermissionForFrameDecisionHandler : 1; diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm -index 388429087a1a368a52d5983ed865b61373b33996..1eaaabd4ab0ce7c321c64e6ed55c73320f9f2d50 100644 +index 8d5342e6c0a51ede17dd9b89e1e85b214172118e..cc7d0d8f98282c23d2b5d8531078650a010c06f3 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm @@ -106,6 +106,7 @@ void UIDelegate::setDelegate(id delegate) @@ -12355,7 +12355,7 @@ index 388429087a1a368a52d5983ed865b61373b33996..1eaaabd4ab0ce7c321c64e6ed55c7332 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:)]; -@@ -378,6 +379,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St +@@ -377,6 +378,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St }).get()]; } @@ -12371,23 +12371,11 @@ index 388429087a1a368a52d5983ed865b61373b33996..1eaaabd4ab0ce7c321c64e6ed55c7332 void UIDelegate::UIClient::requestStorageAccessConfirm(WebPageProxy& webPageProxy, WebFrameProxy*, const WebCore::RegistrableDomain& requestingDomain, const WebCore::RegistrableDomain& currentDomain, CompletionHandler&& completionHandler) { if (!m_uiDelegate) -diff --git a/Source/WebKit/UIProcess/Cocoa/WKContactPicker.h b/Source/WebKit/UIProcess/Cocoa/WKContactPicker.h -index 7a18a6184a04aa37bb6d328a817b0a0a3e03cb50..92bb58f42cf5ff592b6d465f16ffcf283f381462 100644 ---- a/Source/WebKit/UIProcess/Cocoa/WKContactPicker.h -+++ b/Source/WebKit/UIProcess/Cocoa/WKContactPicker.h -@@ -27,6 +27,7 @@ - - #if HAVE(CONTACTSUI) - -+#include - #include - - @class WKWebView; diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -index cfa56853fe99116fbfefd5e33933c80967703de1..e0c81fdda03199d968a405cd91ae41665872aef7 100644 +index 6d5feb35c35ec077360624ed20e59bb5e74f122c..a3a802aee7f2bb7afa0caa0ec59cdd880190aeb2 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -@@ -34,6 +34,7 @@ +@@ -35,6 +35,7 @@ #import "InsertTextOptions.h" #import "LoadParameters.h" #import "PageClient.h" @@ -12395,7 +12383,7 @@ index cfa56853fe99116fbfefd5e33933c80967703de1..e0c81fdda03199d968a405cd91ae4166 #import "QuickLookThumbnailLoader.h" #import "SafeBrowsingSPI.h" #import "SafeBrowsingWarning.h" -@@ -224,9 +225,66 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting() +@@ -225,9 +226,66 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting() void WebPageProxy::startDrag(const DragItem& dragItem, const ShareableBitmap::Handle& dragImageHandle) { @@ -12463,7 +12451,7 @@ index cfa56853fe99116fbfefd5e33933c80967703de1..e0c81fdda03199d968a405cd91ae4166 #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index b05fc82bd0d7201418dd69ea47158954cf25f0f4..b5d4e6f170309ca2e687f067fae9aa309f27bec6 100644 +index 2e6b4c1376192aa6109c4a918f343f4433a2b1c3..2706af99e9a1d4ca8603bbfaf93054690c480f92 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm @@ -408,7 +408,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process @@ -17143,10 +17131,10 @@ index 0000000000000000000000000000000000000000..94e9f24353337169992724e2fcdf7086 + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e47892a7eb 100644 +index bac28b7b9db4e47d15f07c4382d0fdec68b59b5f..ba7c3600fab2ddc9389b58f23a4a9d0330d9d508 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp -@@ -241,7 +241,7 @@ +@@ -243,7 +243,7 @@ #include "ViewSnapshotStore.h" #endif @@ -17155,7 +17143,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 #include #endif -@@ -612,6 +612,10 @@ WebPageProxy::~WebPageProxy() +@@ -614,6 +614,10 @@ WebPageProxy::~WebPageProxy() #if ENABLE(MEDIA_SESSION_COORDINATOR) && HAVE(GROUP_ACTIVITIES) GroupActivitiesSessionNotifier::sharedNotifier().removeWebPage(*this); #endif @@ -17166,7 +17154,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 } // FIXME: Should return a const PageClient& and add a separate non-const -@@ -994,6 +998,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) +@@ -996,6 +1000,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) m_pageLoadState.didSwapWebProcesses(); if (reason != ProcessLaunchReason::InitialProcess) m_drawingArea->waitForBackingStoreUpdateOnNextPaint(); @@ -17174,7 +17162,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 } void WebPageProxy::didAttachToRunningProcess() -@@ -1323,6 +1328,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1325,6 +1330,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -17196,7 +17184,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1853,6 +1873,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1855,6 +1875,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -17228,7 +17216,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2043,6 +2088,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2045,6 +2090,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -17254,7 +17242,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2615,6 +2679,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2617,6 +2681,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -17263,7 +17251,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2625,6 +2691,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2627,6 +2693,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -17272,7 +17260,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2640,18 +2708,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2660,6 +2751,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2662,6 +2753,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -17342,7 +17330,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2672,8 +2781,18 @@ void WebPageProxy::didStartDrag() +@@ -2674,8 +2783,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17362,7 +17350,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2778,16 +2897,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2780,16 +2899,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17408,7 +17396,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3007,7 +3148,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3009,7 +3150,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17417,7 +17405,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -3040,7 +3181,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3042,7 +3183,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -17426,7 +17414,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3423,6 +3564,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3425,6 +3566,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -17435,7 +17423,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 receivedPolicyDecision(policyAction, navigation, WTFMove(policies), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3489,6 +3632,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3491,6 +3634,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, RefPtr&& websitePolicies, Variant, Ref>&& navigationActionOrResponse, Ref&& sender, std::optional sandboxExtensionHandle, WillContinueLoadInNewProcess willContinueLoadInNewProcess) { @@ -17443,7 +17431,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4227,6 +4371,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4229,6 +4373,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17455,7 +17443,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4559,6 +4708,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4562,6 +4711,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17463,7 +17451,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4781,6 +4931,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4784,6 +4934,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17472,7 +17460,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 // 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; -@@ -5223,7 +5375,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5236,7 +5388,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) { @@ -17488,7 +17476,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5736,6 +5895,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5749,6 +5908,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(); @@ -17496,7 +17484,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 auto completionHandler = [this, protectedThis = makeRef(*this), mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -5776,6 +5936,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5789,6 +5949,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17504,7 +17492,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 } void WebPageProxy::exitFullscreenImmediately() -@@ -5811,6 +5972,10 @@ void WebPageProxy::closePage() +@@ -5824,6 +5985,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17515,7 +17503,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -5847,6 +6012,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -5860,6 +6025,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 { @@ -17524,7 +17512,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -5868,6 +6035,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -5881,6 +6048,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17533,7 +17521,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 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 { -@@ -5891,6 +6060,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -5904,6 +6073,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17542,7 +17530,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 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 { -@@ -6051,6 +6222,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6064,6 +6235,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17551,7 +17539,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7258,6 +7431,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7271,6 +7444,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -17560,7 +17548,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 } break; } -@@ -7284,7 +7459,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7297,7 +7472,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()); @@ -17568,7 +17556,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7303,7 +7477,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7316,7 +7490,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); @@ -17576,7 +17564,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7312,6 +7485,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7325,6 +7498,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -17584,7 +17572,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 } break; } -@@ -7642,7 +7816,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7655,7 +7829,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%d", reason); @@ -17596,7 +17584,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8015,6 +8192,7 @@ static const Vector& mediaRelatedIOKitClasses() +@@ -8028,6 +8205,7 @@ static const Vector& mediaRelatedIOKitClasses() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -17604,7 +17592,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8207,6 +8385,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8220,6 +8398,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.shouldRelaxThirdPartyCookieBlocking = m_configuration->shouldRelaxThirdPartyCookieBlocking(); parameters.canUseCredentialStorage = m_canUseCredentialStorage; @@ -17613,7 +17601,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 #if PLATFORM(GTK) parameters.themeName = pageClient().themeName(); #endif -@@ -8283,6 +8463,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8296,6 +8476,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -17628,7 +17616,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = makeRef(*this), authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8376,6 +8564,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8389,6 +8577,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17645,7 +17633,7 @@ index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e4 // 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 a964e62763a1d964eee6f464aa2e3a06c0637640..9160f8b7430d9d9e8031b23bf2bb8c1df2879099 100644 +index 1dde2aa0ad646355e2906c6e3ffb08008d527365..f1bd5a0584135396b4e44dd1a131e3e23b6c5acb 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -38,6 +38,7 @@ @@ -17767,7 +17755,7 @@ index a964e62763a1d964eee6f464aa2e3a06c0637640..9160f8b7430d9d9e8031b23bf2bb8c1d #endif #if ENABLE(WEB_CRYPTO) -@@ -2568,6 +2597,7 @@ private: +@@ -2567,6 +2596,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17775,7 +17763,7 @@ index a964e62763a1d964eee6f464aa2e3a06c0637640..9160f8b7430d9d9e8031b23bf2bb8c1d #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2821,6 +2851,20 @@ private: +@@ -2819,6 +2849,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17796,7 +17784,7 @@ index a964e62763a1d964eee6f464aa2e3a06c0637640..9160f8b7430d9d9e8031b23bf2bb8c1d #endif PageLoadState m_pageLoadState; -@@ -3034,6 +3078,9 @@ private: +@@ -3032,6 +3076,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -19710,10 +19698,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8efa1ed49 100644 +index 927d6d0ab79369b0a412390b7e7e6ae286bd7bd2..02214d8db0c2c261cf15f2bd849d7c979244a84d 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1960,6 +1960,18 @@ +@@ -1956,6 +1956,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 */; }; @@ -19732,7 +19720,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 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 */; }; -@@ -2016,6 +2028,9 @@ +@@ -2012,6 +2024,9 @@ E5BEF6822130C48000F31111 /* WebDataListSuggestionsDropdownIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = E5BEF6802130C47F00F31111 /* WebDataListSuggestionsDropdownIOS.h */; }; E5CB07DC20E1678F0022C183 /* WKFormColorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */; }; ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -19742,7 +19730,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 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, ); }; }; -@@ -5862,6 +5877,19 @@ +@@ -5864,6 +5879,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 = ""; }; @@ -19762,7 +19750,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 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 = ""; }; -@@ -5980,6 +6008,14 @@ +@@ -5982,6 +6010,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 = ""; }; @@ -19777,7 +19765,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 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 = ""; }; -@@ -6094,6 +6130,7 @@ +@@ -6097,6 +6133,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -19785,7 +19773,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -7969,6 +8006,7 @@ +@@ -8007,6 +8044,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -19793,7 +19781,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -9034,6 +9072,7 @@ +@@ -9067,6 +9105,7 @@ isa = PBXGroup; children = ( 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -19801,7 +19789,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, ); -@@ -9469,6 +9508,12 @@ +@@ -9499,6 +9538,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -19814,7 +19802,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 ); path = Agents; sourceTree = ""; -@@ -9477,6 +9522,7 @@ +@@ -9507,6 +9552,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -19822,7 +19810,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -9968,6 +10014,12 @@ +@@ -9999,6 +10045,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -19835,7 +19823,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -10266,6 +10318,7 @@ +@@ -10298,6 +10350,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -19843,7 +19831,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -10861,6 +10914,11 @@ +@@ -10893,6 +10946,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -19855,7 +19843,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, C1817362205844A900DFDA65 /* DisplayLink.cpp */, -@@ -11710,6 +11768,7 @@ +@@ -11743,6 +11801,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -19863,7 +19851,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -12008,6 +12067,7 @@ +@@ -12042,6 +12101,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -19871,7 +19859,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -12023,6 +12083,7 @@ +@@ -12057,6 +12117,7 @@ 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, F40BBB41257FF46E0067463A /* GPUProcessWakeupMessageArguments.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -19879,7 +19867,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -12169,6 +12230,7 @@ +@@ -12203,6 +12264,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -19887,7 +19875,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, 5183247C26168C62003F239E /* NetworkURLSchemeHandler.h in Headers */, -@@ -12257,6 +12319,7 @@ +@@ -12289,6 +12351,7 @@ BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -19895,7 +19883,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */, -@@ -12278,6 +12341,7 @@ +@@ -12310,6 +12373,7 @@ CDAC20B423FB58F20021DEE3 /* RemoteCDMInstanceProxy.h in Headers */, CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, @@ -19903,7 +19891,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -12593,6 +12657,7 @@ +@@ -12626,6 +12690,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -19911,7 +19899,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -12722,6 +12787,7 @@ +@@ -12755,6 +12820,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -19919,7 +19907,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -12775,6 +12841,7 @@ +@@ -12808,6 +12874,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -19927,7 +19915,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -12931,6 +12998,7 @@ +@@ -12964,6 +13031,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -19935,7 +19923,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -14163,6 +14231,7 @@ +@@ -14193,6 +14261,7 @@ C1A152D724E5A29A00978C8B /* HandleXPCEndpointMessages.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -19943,7 +19931,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 9BF5EC642541145600984E77 /* JSIPCBinding.cpp in Sources */, 2D913441212CF9F000128AFD /* JSNPMethod.cpp in Sources */, 2D913442212CF9F000128AFD /* JSNPObject.cpp in Sources */, -@@ -14181,6 +14250,7 @@ +@@ -14211,6 +14280,7 @@ 2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */, 2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */, 2D92A77A212B6A6100F493FD /* Module.cpp in Sources */, @@ -19951,7 +19939,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 57B826452304F14000B72EB0 /* NearFieldSoftLink.mm in Sources */, 2D913443212CF9F000128AFD /* NetscapeBrowserFuncs.cpp in Sources */, 2D913444212CF9F000128AFD /* NetscapePlugin.cpp in Sources */, -@@ -14205,6 +14275,7 @@ +@@ -14235,6 +14305,7 @@ 1A2D8439127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp in Sources */, 2D92A792212B6AD400F493FD /* NPObjectProxy.cpp in Sources */, 2D92A793212B6AD400F493FD /* NPRemoteObjectMap.cpp in Sources */, @@ -19959,7 +19947,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 2D913447212CF9F000128AFD /* NPRuntimeObjectMap.cpp in Sources */, 2D913448212CF9F000128AFD /* NPRuntimeUtilities.cpp in Sources */, 2D92A794212B6AD400F493FD /* NPVariantData.cpp in Sources */, -@@ -14510,6 +14581,7 @@ +@@ -14540,6 +14611,7 @@ 2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -19968,7 +19956,7 @@ index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8 BCBD3914125BB1A800D2C29F /* WebPageProxyMessageReceiver.cpp in Sources */, 7CE9CE101FA0767A000177DE /* WebPageUpdatePreferences.cpp in Sources */, diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp -index c42d2c00f7982ea3fe19401cd076c24a0b649ebf..50da344e6bd20b85e122c3c36aebcab2b7765bc2 100644 +index 60e6a2b480fcad110f3dae84b05495653576f7e4..4ba4e31dd942d9f775deabfd150bad146a8a0dd3 100644 --- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp +++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp @@ -231,6 +231,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou @@ -20140,7 +20128,7 @@ index ecd4052eac038028255a786236e1969853afa1d8..2adc87a59c12d15c651909e67670ac35 if (m_coreLoader) didFailResourceLoad(error); diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -index 89f05d5cc7064acee45cf09a530143b5e3a2fe1d..0fc6b88966d9d9df624e65119224fd54dcdfc50b 100644 +index 30776a00db074f2d197d27a00089292b58807857..b1376717bd22b4f0e9348efce59c378ecef65f84 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp @@ -398,6 +398,8 @@ void WebChromeClient::setResizable(bool resizable) @@ -20194,7 +20182,7 @@ index 2eb0886f13ed035a53b8eaa60605de4dfe53fbe3..c46393209cb4f80704bbc9268fad4371 { } diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -index 6c904c9862dce939273e25063f1ac83ce6558cd0..4166ea3112a537257e976fa800266fdc4ddf2d15 100644 +index 40be61c20fcb8d3af7103facc373a20c91663309..ce751d6f054a3450d9262f3fa3baf783b389e284 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp @@ -1569,13 +1569,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() @@ -20612,7 +20600,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 af905408117bbd6239212d1d9e14aa2a97f41129..13a8d05a15f3b65f726a54ef47a9d8a3cb298eaa 100644 +index cd448c533b07f029bbb64b1ad4682bca8617b062..a58070c6cd53ec52a016bef673d4b8b341d7b351 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp @@ -882,6 +882,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) @@ -20647,8 +20635,8 @@ index af905408117bbd6239212d1d9e14aa2a97f41129..13a8d05a15f3b65f726a54ef47a9d8a3 + void WebPage::loadRequest(LoadParameters&& loadParameters) { - setLastNavigationWasAppBound(loadParameters.request.isAppBound()); -@@ -1908,17 +1927,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) + setLastNavigationWasAppInitiated(loadParameters.request.isAppInitiated()); +@@ -1909,17 +1928,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -20667,7 +20655,7 @@ index af905408117bbd6239212d1d9e14aa2a97f41129..13a8d05a15f3b65f726a54ef47a9d8a3 // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -1935,20 +1950,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1936,20 +1951,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -20695,7 +20683,7 @@ index af905408117bbd6239212d1d9e14aa2a97f41129..13a8d05a15f3b65f726a54ef47a9d8a3 #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -1956,7 +1969,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1957,7 +1970,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -20703,7 +20691,7 @@ index af905408117bbd6239212d1d9e14aa2a97f41129..13a8d05a15f3b65f726a54ef47a9d8a3 void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2251,6 +2263,7 @@ void WebPage::scaleView(double scale) +@@ -2252,6 +2264,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -20711,7 +20699,7 @@ index af905408117bbd6239212d1d9e14aa2a97f41129..13a8d05a15f3b65f726a54ef47a9d8a3 scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2355,17 +2368,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2356,17 +2369,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -20730,7 +20718,7 @@ index af905408117bbd6239212d1d9e14aa2a97f41129..13a8d05a15f3b65f726a54ef47a9d8a3 } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3233,6 +3242,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3234,6 +3243,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -20835,7 +20823,7 @@ index af905408117bbd6239212d1d9e14aa2a97f41129..13a8d05a15f3b65f726a54ef47a9d8a3 #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3309,6 +3416,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3310,6 +3417,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -20847,7 +20835,7 @@ index af905408117bbd6239212d1d9e14aa2a97f41129..13a8d05a15f3b65f726a54ef47a9d8a3 void WebPage::insertNewlineInQuotedContent() { Frame& frame = m_page->focusController().focusedOrMainFrame(); -@@ -3546,6 +3658,7 @@ void WebPage::didCompletePageTransition() +@@ -3547,6 +3659,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -20855,7 +20843,7 @@ index af905408117bbd6239212d1d9e14aa2a97f41129..13a8d05a15f3b65f726a54ef47a9d8a3 } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4286,7 +4399,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4287,7 +4400,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -20864,7 +20852,7 @@ index af905408117bbd6239212d1d9e14aa2a97f41129..13a8d05a15f3b65f726a54ef47a9d8a3 void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6608,6 +6721,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6609,6 +6722,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -20875,7 +20863,7 @@ index af905408117bbd6239212d1d9e14aa2a97f41129..13a8d05a15f3b65f726a54ef47a9d8a3 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index fe52fe347ea51e7ac6b85b5eea7f04b3c6eb3b6d..243c1f4a318e929d262f7810df3fd3ccd6aeb629 100644 +index 362335fdd78518a28e2fb7649839e32010c92db3..3211c0944eacf358046e7d641f103b220f801cc3 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -112,6 +112,10 @@ typedef struct _AtkObject AtkObject; @@ -20956,7 +20944,7 @@ index fe52fe347ea51e7ac6b85b5eea7f04b3c6eb3b6d..243c1f4a318e929d262f7810df3fd3cc bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 7afb98959e7e4eb865d08710706b14e5043cd0da..cb75ad8ee7f612a5c4b68cd952c5d935cb2142f5 100644 +index 1ceda7a7bcab2d80ae4c269b0fc0e7edb3151dd5..927bda0f8baa32cac68d55ea3ca249e44737bd0d 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 @@ -21202,7 +21190,7 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 7de2d6046a98839687ed277009bd9fd4eb5c2fe0..ca67eefec0f255c88122351d845f7daab88f6a16 100644 +index f3b1c1289c418436b6fa3a53be5058b3d4416ca5..84105378dc29c257e953d7d41fe76afb216f3abf 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -5,6 +5,8 @@ WEBKIT_OPTION_BEGIN() @@ -21278,7 +21266,7 @@ index 7de2d6046a98839687ed277009bd9fd4eb5c2fe0..ca67eefec0f255c88122351d845f7daa # 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 ed79aed95af5c7cf5525f8647258f4747a5b2553..9ddf39dabf46e4b405418cd4a02c418dcf90f6d7 100644 +index 76bf511f145a18684f1d7fe12e7a71766c00cef0..34a0f57040b32b5b380f5afa6e65b093c101d89b 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -3,6 +3,7 @@ include(VersioningUtils) @@ -21412,7 +21400,7 @@ index 512392e6424ea64ff65fffc14df30344ce6cbe99..90b7c9614333868ff8c157f5bd938da9 set(USE_ANGLE_WEBGL ON) diff --git a/Tools/MiniBrowser/gtk/BrowserTab.c b/Tools/MiniBrowser/gtk/BrowserTab.c -index ab75a69f64aadee2b22e0d8d114932db55aaa000..e82450546a7dba66155b26c3d841d0a74675c701 100644 +index 9b3662b224a6674ac2c25bd29feaa98610781e82..ce2d2f0847b4f0f41e2985c4b5ba4cc69990cb71 100644 --- a/Tools/MiniBrowser/gtk/BrowserTab.c +++ b/Tools/MiniBrowser/gtk/BrowserTab.c @@ -161,6 +161,11 @@ static void loadChanged(WebKitWebView *webView, WebKitLoadEvent loadEvent, Brows @@ -21427,7 +21415,7 @@ index ab75a69f64aadee2b22e0d8d114932db55aaa000..e82450546a7dba66155b26c3d841d0a7 static GtkWidget *createInfoBarQuestionMessage(const char *title, const char *text) { GtkWidget *dialog = gtk_info_bar_new_with_buttons("No", GTK_RESPONSE_NO, "Yes", GTK_RESPONSE_YES, NULL); -@@ -649,6 +654,7 @@ static void browserTabConstructed(GObject *gObject) +@@ -704,6 +709,7 @@ static void browserTabConstructed(GObject *gObject) g_signal_connect(tab->webView, "notify::is-loading", G_CALLBACK(isLoadingChanged), tab); g_signal_connect(tab->webView, "decide-policy", G_CALLBACK(decidePolicy), tab); g_signal_connect(tab->webView, "load-changed", G_CALLBACK(loadChanged), tab); @@ -21435,7 +21423,7 @@ index ab75a69f64aadee2b22e0d8d114932db55aaa000..e82450546a7dba66155b26c3d841d0a7 g_signal_connect(tab->webView, "load-failed-with-tls-errors", G_CALLBACK(loadFailedWithTLSerrors), tab); g_signal_connect(tab->webView, "permission-request", G_CALLBACK(decidePermissionRequest), tab); g_signal_connect(tab->webView, "run-color-chooser", G_CALLBACK(runColorChooserCallback), tab); -@@ -698,6 +704,9 @@ static char *getInternalURI(const char *uri) +@@ -754,6 +760,9 @@ static char *getInternalURI(const char *uri) if (g_str_has_prefix(uri, "about:") && !g_str_equal(uri, "about:blank")) return g_strconcat(BROWSER_ABOUT_SCHEME, uri + strlen ("about"), NULL); @@ -21925,7 +21913,7 @@ index 775b41868718ea6734efc9082f8161eee2e0015e..68a720c0cb01d534653a259536c48168 list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp -index 8b5d93545a606748f492f6b73cdbd1219596cc0f..f81ce7d529281b68cb674cb25c53844c1732c56e 100644 +index 407171facba6aad6cf0b4b4a64174884c33f5189..a0d506f7d7a2801e7e747fe47194810d2c3a9f9f 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp @@ -787,6 +787,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)