From fb88b32926012518f0f394e8fd4b43b1fce4c156 Mon Sep 17 00:00:00 2001 From: Diego Pino Date: Thu, 25 Aug 2022 23:27:04 +0800 Subject: [PATCH] browser(webkit): rebase to 08/25/22 (253769@main) (#16835) --- browser_patches/webkit/BUILD_NUMBER | 4 +- browser_patches/webkit/UPSTREAM_CONFIG.sh | 2 +- browser_patches/webkit/patches/bootstrap.diff | 317 +++++++++--------- 3 files changed, 162 insertions(+), 161 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 8982cac0c0..b0a1e8f199 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1708 -Changed: dpino@igalia.com Tue Aug 23 13:42:36 UTC 2022 +1709 +Changed: dpino@igalia.com Thu Aug 25 23:18:05 HKT 2022 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 62f14fb421..a83035ec31 100644 --- a/browser_patches/webkit/UPSTREAM_CONFIG.sh +++ b/browser_patches/webkit/UPSTREAM_CONFIG.sh @@ -1,3 +1,3 @@ REMOTE_URL="https://github.com/WebKit/WebKit.git" BASE_BRANCH="main" -BASE_REVISION="115d9297ff1ae8ce0d01358d42d3f7bc8b33e577" +BASE_REVISION="c888c485b787e204057b56d69536aae567ab8b3a" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 8beb6ef4c3..f3aa2a9041 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -541,7 +541,7 @@ index e81573fd0fffaaf6fd2af36635c78fcdf8608c69..c8cde6cfcde9612624f12e21bd9fa56b // FrontendChannel FrontendChannel::ConnectionType connectionType() const; diff --git a/Source/JavaScriptCore/inspector/protocol/DOM.json b/Source/JavaScriptCore/inspector/protocol/DOM.json -index 6b283d7f5f1804b921a0ffd175ddf5e66eed9fd1..e1a2a96bfed11a3186d59871132b3c7993e8fd4d 100644 +index 4c067acbce3e95883082561e24b2fe6febd9f61e..7923364429b32dbc1851177119201601ec200107 100644 --- a/Source/JavaScriptCore/inspector/protocol/DOM.json +++ b/Source/JavaScriptCore/inspector/protocol/DOM.json @@ -80,6 +80,16 @@ @@ -578,7 +578,7 @@ index 6b283d7f5f1804b921a0ffd175ddf5e66eed9fd1..e1a2a96bfed11a3186d59871132b3c79 } ], "commands": [ -@@ -559,7 +579,9 @@ +@@ -560,7 +580,9 @@ "description": "Resolves JavaScript node object for given node id.", "targetTypes": ["page"], "parameters": [ @@ -589,7 +589,7 @@ index 6b283d7f5f1804b921a0ffd175ddf5e66eed9fd1..e1a2a96bfed11a3186d59871132b3c79 { "name": "objectGroup", "type": "string", "optional": true, "description": "Symbolic group name that can be used to release multiple objects." } ], "returns": [ -@@ -626,6 +648,46 @@ +@@ -627,6 +649,46 @@ "parameters": [ { "name": "allow", "type": "boolean" } ] @@ -2124,10 +2124,10 @@ index 909094b0ff2cc7273f3d4ac96cf4498f0d0c6e50..51958e6eba239952f834978515b6a3c7 type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index e0889ff9d0885654a812cc7a36805dab1ace6331..4cfa2d20ecea9965c8c6d02b478dcfd9f192a6cd 100644 +index 3b939d4dc4783e89183439a8a245b0311f0957d1..1258e9d46afb9e008009dd60f23f1f74ec79159c 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -@@ -527,7 +527,7 @@ CrossOriginOpenerPolicyEnabled: +@@ -539,7 +539,7 @@ CrossOriginOpenerPolicyEnabled: WebKitLegacy: default: false WebKit: @@ -2136,7 +2136,7 @@ index e0889ff9d0885654a812cc7a36805dab1ace6331..4cfa2d20ecea9965c8c6d02b478dcfd9 WebCore: default: false -@@ -860,6 +860,7 @@ IsThirdPartyCookieBlockingDisabled: +@@ -872,6 +872,7 @@ IsThirdPartyCookieBlockingDisabled: WebCore: default: false @@ -2144,7 +2144,7 @@ index e0889ff9d0885654a812cc7a36805dab1ace6331..4cfa2d20ecea9965c8c6d02b478dcfd9 LazyIframeLoadingEnabled: type: bool humanReadableName: "Lazy iframe loading" -@@ -868,9 +869,9 @@ LazyIframeLoadingEnabled: +@@ -880,9 +881,9 @@ LazyIframeLoadingEnabled: WebKitLegacy: default: true WebKit: @@ -2156,7 +2156,7 @@ index e0889ff9d0885654a812cc7a36805dab1ace6331..4cfa2d20ecea9965c8c6d02b478dcfd9 LazyImageLoadingEnabled: type: bool -@@ -929,9 +930,9 @@ MaskWebGLStringsEnabled: +@@ -941,9 +942,9 @@ MaskWebGLStringsEnabled: WebKitLegacy: default: true WebKit: @@ -2168,7 +2168,7 @@ index e0889ff9d0885654a812cc7a36805dab1ace6331..4cfa2d20ecea9965c8c6d02b478dcfd9 # FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well. MediaCapabilitiesExtensionsEnabled: -@@ -1450,7 +1451,7 @@ SpeechRecognitionEnabled: +@@ -1462,7 +1463,7 @@ SpeechRecognitionEnabled: WebKitLegacy: default: false WebKit: @@ -2177,7 +2177,7 @@ index e0889ff9d0885654a812cc7a36805dab1ace6331..4cfa2d20ecea9965c8c6d02b478dcfd9 default: false WebCore: default: false -@@ -1565,6 +1566,7 @@ UseGPUProcessForDisplayCapture: +@@ -1577,6 +1578,7 @@ UseGPUProcessForDisplayCapture: WebKit: default: true @@ -2185,7 +2185,7 @@ index e0889ff9d0885654a812cc7a36805dab1ace6331..4cfa2d20ecea9965c8c6d02b478dcfd9 UseGPUProcessForWebGLEnabled: type: bool humanReadableName: "GPU Process: WebGL" -@@ -1575,7 +1577,7 @@ UseGPUProcessForWebGLEnabled: +@@ -1587,7 +1589,7 @@ UseGPUProcessForWebGLEnabled: default: false WebKit: "ENABLE(GPU_PROCESS_BY_DEFAULT) && PLATFORM(IOS_FAMILY) && !HAVE(UIKIT_WEBKIT_INTERNALS)": true @@ -2238,7 +2238,7 @@ index 8863f57db1e6a6c21b61fe7598a39806d1be4028..30ebe6a4609540551c64fd0d7ec49a6a #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index 938499ea858b75528c3aada69c22d7892f9377d2..81821ffcf9095e66f002b2441fbfb1382f14f8dd 100644 +index 37a6ac6ffce784d6663dcbe08b948eb63e22e572..c7921895e3700e28a4d625647f5beb825877a265 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h @@ -255,7 +255,7 @@ @@ -2251,7 +2251,7 @@ index 938499ea858b75528c3aada69c22d7892f9377d2..81821ffcf9095e66f002b2441fbfb138 #endif diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 17ef2b99a00c53e854210ad488369ad232944c5e..59a4dfb0b80a6f8d30ec361b2dbde8e5e2bf3c3d 100644 +index 19d254d65173b8d0c373bb800cd0d09dae119c9f..27e9d7283d9250643c55a27a80cb0ca851d45ae5 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -422,7 +422,7 @@ @@ -2263,7 +2263,7 @@ index 17ef2b99a00c53e854210ad488369ad232944c5e..59a4dfb0b80a6f8d30ec361b2dbde8e5 #define HAVE_OS_DARK_MODE_SUPPORT 1 #endif -@@ -1301,7 +1301,8 @@ +@@ -1302,7 +1302,8 @@ #endif #if PLATFORM(MAC) @@ -2362,7 +2362,7 @@ index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d [self sendSpeechEndIfNeeded]; diff --git a/Source/WebCore/PlatformWPE.cmake b/Source/WebCore/PlatformWPE.cmake -index 9604d21ceb51ab8d20a337c8dbe52c4059043d2c..86a9eec09c4ac457bdd4567eeab570210c1beec3 100644 +index 7fc5555344b50da4ca98634b93afda82d27723fb..1557731c79df84aecc9d17297dc0107fe96c02a7 100644 --- a/Source/WebCore/PlatformWPE.cmake +++ b/Source/WebCore/PlatformWPE.cmake @@ -49,6 +49,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS @@ -2403,7 +2403,7 @@ index a2504495796d1d625afd0092ffd21739be30470f..64be77d2ed6ef550e1f7d6779516187b +JSSpeechSynthesisEventInit.cpp +// Playwright: end. diff --git a/Source/WebCore/SourcesWPE.txt b/Source/WebCore/SourcesWPE.txt -index 3351067102d0e96e185ec0e6ac01bf7273346de3..4ba7934bb5ec781525bb732dbe0736ee67d415be 100644 +index fe289785470b37d3bb774c1891a829f5fffa7562..8ef19ee128531a523f72cb6fe5f7b386200a5497 100644 --- a/Source/WebCore/SourcesWPE.txt +++ b/Source/WebCore/SourcesWPE.txt @@ -43,6 +43,8 @@ editing/libwpe/EditorLibWPE.cpp @@ -2415,7 +2415,7 @@ index 3351067102d0e96e185ec0e6ac01bf7273346de3..4ba7934bb5ec781525bb732dbe0736ee page/linux/ResourceUsageOverlayLinux.cpp page/linux/ResourceUsageThreadLinux.cpp -@@ -93,8 +95,19 @@ platform/text/LocaleICU.cpp +@@ -96,8 +98,19 @@ platform/text/LocaleICU.cpp platform/unix/LoggingUnix.cpp @@ -2448,10 +2448,10 @@ index a5938677622935e2c6ca3ed76c3a12d0eb7e04a7..cea2a0e330cfdf01b172b3f6acc60acb __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 53b2ecdecc9274eef5bcd28861965038f9826e73..a9e908d8944b2de4d731ca22324d928a24a07a51 100644 +index 92762a6dca95eb30c8f9ff80201b909f610d5559..2a34779040a21f18ee125fd83a7901c98e71c64e 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5598,6 +5598,13 @@ +@@ -5599,6 +5599,13 @@ EDE3A5000C7A430600956A37 /* ColorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE3A4FF0C7A430600956A37 /* ColorMac.h */; settings = {ATTRIBUTES = (Private, ); }; }; EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEC98020AED7E170059137F /* WebCorePrefix.h */; }; EFCC6C8F20FE914400A2321B /* CanvasActivityRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -2465,7 +2465,7 @@ index 53b2ecdecc9274eef5bcd28861965038f9826e73..a9e908d8944b2de4d731ca22324d928a 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, ); }; }; -@@ -18109,6 +18116,14 @@ +@@ -18111,6 +18118,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 = ""; }; @@ -2480,7 +2480,7 @@ index 53b2ecdecc9274eef5bcd28861965038f9826e73..a9e908d8944b2de4d731ca22324d928a 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 = ""; }; -@@ -24854,6 +24869,11 @@ +@@ -24856,6 +24871,11 @@ BC4A5324256055590028C592 /* TextDirectionSubmenuInclusionBehavior.h */, 2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */, 2D4F96F21A1ECC240098BF88 /* TextIndicator.h */, @@ -2492,7 +2492,7 @@ index 53b2ecdecc9274eef5bcd28861965038f9826e73..a9e908d8944b2de4d731ca22324d928a F48570A42644C76D00C05F71 /* TranslationContextMenuInfo.h */, F4E1965F21F26E4E00285078 /* UndoItem.cpp */, 2ECDBAD521D8906300F00ECD /* UndoItem.h */, -@@ -30709,6 +30729,8 @@ +@@ -30712,6 +30732,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2501,7 +2501,7 @@ index 53b2ecdecc9274eef5bcd28861965038f9826e73..a9e908d8944b2de4d731ca22324d928a 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -33069,6 +33091,7 @@ +@@ -33072,6 +33094,7 @@ AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, @@ -2509,7 +2509,7 @@ index 53b2ecdecc9274eef5bcd28861965038f9826e73..a9e908d8944b2de4d731ca22324d928a 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, 7CE7FA591EF882300060C9D6 /* DocumentTouch.h */, A8185F3209765765005826D9 /* DocumentType.cpp */, -@@ -37389,6 +37412,8 @@ +@@ -37393,6 +37416,8 @@ 1AD8F81B11CAB9E900E93E54 /* PlatformStrategies.h in Headers */, 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, @@ -2518,7 +2518,7 @@ index 53b2ecdecc9274eef5bcd28861965038f9826e73..a9e908d8944b2de4d731ca22324d928a CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, -@@ -38542,6 +38567,7 @@ +@@ -38546,6 +38571,7 @@ 0F54DD081881D5F5003EEDBB /* Touch.h in Headers */, 71B7EE0D21B5C6870031C1EF /* TouchAction.h in Headers */, 0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */, @@ -2526,7 +2526,7 @@ index 53b2ecdecc9274eef5bcd28861965038f9826e73..a9e908d8944b2de4d731ca22324d928a 0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */, 070334D71459FFD5008D8D45 /* TrackBase.h in Headers */, BE88E0C21715CE2600658D98 /* TrackListBase.h in Headers */, -@@ -39487,6 +39513,7 @@ +@@ -39491,6 +39517,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2534,7 +2534,7 @@ index 53b2ecdecc9274eef5bcd28861965038f9826e73..a9e908d8944b2de4d731ca22324d928a 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */, -@@ -39564,6 +39591,9 @@ +@@ -39568,6 +39595,9 @@ C1692DD223D23ABD006E88F7 /* SystemBattery.mm in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2982,10 +2982,10 @@ index 4d5a3859ec6a46d07d45c80a3b5870ee2ef13d36..75eb55a024a6ae3892a4fedc535bf6a6 } // namespace WebCore diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp -index 3fe459d4ee185f9c1ab157c61d651fe2ed6ebedf..82ec00871a74db0fc0cb898c77aab32fb0407fc0 100644 +index 0d5cb92ec4cbb0e7ad8b755b3b8f684996bbc40f..45d9f9d236bce99be5fd2f77253db90855ee7a6d 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.cpp +++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp -@@ -572,6 +572,13 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents& i +@@ -576,6 +576,13 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents& i pageAgent->applyUserAgentOverride(userAgent); } @@ -2999,7 +2999,7 @@ index 3fe459d4ee185f9c1ab157c61d651fe2ed6ebedf..82ec00871a74db0fc0cb898c77aab32f void InspectorInstrumentation::applyEmulatedMediaImpl(InstrumentingAgents& instrumentingAgents, String& media) { if (auto* pageAgent = instrumentingAgents.enabledPageAgent()) -@@ -651,6 +658,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen +@@ -655,6 +662,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen consoleAgent->didFailLoading(identifier, error); // This should come AFTER resource notification, front-end relies on this. } @@ -3012,7 +3012,7 @@ index 3fe459d4ee185f9c1ab157c61d651fe2ed6ebedf..82ec00871a74db0fc0cb898c77aab32f void InspectorInstrumentation::willLoadXHRSynchronouslyImpl(InstrumentingAgents& instrumentingAgents) { if (auto* networkAgent = instrumentingAgents.enabledNetworkAgent()) -@@ -683,20 +696,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents& +@@ -687,20 +700,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents& void InspectorInstrumentation::domContentLoadedEventFiredImpl(InstrumentingAgents& instrumentingAgents, Frame& frame) { @@ -3036,7 +3036,7 @@ index 3fe459d4ee185f9c1ab157c61d651fe2ed6ebedf..82ec00871a74db0fc0cb898c77aab32f } void InspectorInstrumentation::frameDetachedFromParentImpl(InstrumentingAgents& instrumentingAgents, Frame& frame) -@@ -777,12 +787,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins +@@ -781,12 +791,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins pageDOMDebuggerAgent->frameDocumentUpdated(frame); } @@ -3049,7 +3049,7 @@ index 3fe459d4ee185f9c1ab157c61d651fe2ed6ebedf..82ec00871a74db0fc0cb898c77aab32f void InspectorInstrumentation::frameStartedLoadingImpl(InstrumentingAgents& instrumentingAgents, Frame& frame) { if (frame.isMainFrame()) { -@@ -819,6 +823,12 @@ void InspectorInstrumentation::frameClearedScheduledNavigationImpl(Instrumenting +@@ -823,6 +827,12 @@ void InspectorInstrumentation::frameClearedScheduledNavigationImpl(Instrumenting inspectorPageAgent->frameClearedScheduledNavigation(frame); } @@ -3062,7 +3062,7 @@ index 3fe459d4ee185f9c1ab157c61d651fe2ed6ebedf..82ec00871a74db0fc0cb898c77aab32f #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT) void InspectorInstrumentation::defaultAppearanceDidChangeImpl(InstrumentingAgents& instrumentingAgents, bool useDarkAppearance) { -@@ -1001,6 +1011,12 @@ void InspectorInstrumentation::consoleStopRecordingCanvasImpl(InstrumentingAgent +@@ -1005,6 +1015,12 @@ void InspectorInstrumentation::consoleStopRecordingCanvasImpl(InstrumentingAgent canvasAgent->consoleStopRecordingCanvas(context); } @@ -3075,7 +3075,7 @@ index 3fe459d4ee185f9c1ab157c61d651fe2ed6ebedf..82ec00871a74db0fc0cb898c77aab32f void InspectorInstrumentation::didOpenDatabaseImpl(InstrumentingAgents& instrumentingAgents, Database& database) { if (auto* databaseAgent = instrumentingAgents.enabledDatabaseAgent()) -@@ -1301,6 +1317,36 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins +@@ -1305,6 +1321,36 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins layerTreeAgent->renderLayerDestroyed(renderLayer); } @@ -3112,7 +3112,7 @@ index 3fe459d4ee185f9c1ab157c61d651fe2ed6ebedf..82ec00871a74db0fc0cb898c77aab32f InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(WorkerOrWorkletGlobalScope& globalScope) { return globalScope.inspectorController().m_instrumentingAgents; -@@ -1312,6 +1358,13 @@ InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(Page& page) +@@ -1316,6 +1362,13 @@ InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(Page& page) return page.inspectorController().m_instrumentingAgents.get(); } @@ -3387,7 +3387,7 @@ index 07103c35e0a9193a010a85cf2ea8017b2ad59212..338d158be5a6f35adc6817dc94d6084b class UserGestureEmulationScope { WTF_MAKE_NONCOPYABLE(UserGestureEmulationScope); diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp -index 169f443ebf6139b8c48e700d73d11053ef443b86..505c79042cf9fa238277979304f13183f954f35b 100644 +index d86256ff04f0eda3d9ed4d23ff8f66f2db26f742..af198fa8d839eb9a2af9b1a0cefec056383d5750 100644 --- a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp @@ -62,12 +62,16 @@ @@ -3483,7 +3483,7 @@ index 169f443ebf6139b8c48e700d73d11053ef443b86..505c79042cf9fa238277979304f13183 Document* InspectorDOMAgent::assertDocument(Protocol::ErrorString& errorString, Protocol::DOM::NodeId nodeId) { Node* node = assertNode(errorString, nodeId); -@@ -1442,16 +1477,7 @@ Protocol::ErrorStringOr InspectorDOMAgent::highlightSelector(Ref InspectorDOMAgent::highlightSelector(Ref InspectorDOMAgent::highlightNode(Ref&& highlightInspectorObject, std::optional&& nodeId, const Protocol::Runtime::RemoteObjectId& objectId) { Protocol::ErrorString errorString; @@ -3501,7 +3501,7 @@ index 169f443ebf6139b8c48e700d73d11053ef443b86..505c79042cf9fa238277979304f13183 if (!node) return makeUnexpected(errorString); -@@ -1689,15 +1715,141 @@ Protocol::ErrorStringOr InspectorDOMAgent::setInspectedNode(Protocol::DOM: +@@ -1691,15 +1717,141 @@ Protocol::ErrorStringOr InspectorDOMAgent::setInspectedNode(Protocol::DOM: return { }; } @@ -3647,7 +3647,7 @@ index 169f443ebf6139b8c48e700d73d11053ef443b86..505c79042cf9fa238277979304f13183 if (!object) return makeUnexpected("Missing injected script for given nodeId"_s); -@@ -2952,7 +3104,7 @@ Protocol::ErrorStringOr InspectorDOMAgent::pushNodeByPath +@@ -2956,7 +3108,7 @@ Protocol::ErrorStringOr InspectorDOMAgent::pushNodeByPath return makeUnexpected("Missing node for given path"_s); } @@ -3656,7 +3656,7 @@ index 169f443ebf6139b8c48e700d73d11053ef443b86..505c79042cf9fa238277979304f13183 { Document* document = &node->document(); if (auto* templateHost = document->templateDocumentHost()) -@@ -2961,12 +3113,18 @@ RefPtr InspectorDOMAgent::resolveNode(Node* nod +@@ -2965,12 +3117,18 @@ RefPtr InspectorDOMAgent::resolveNode(Node* nod if (!frame) return nullptr; @@ -3678,7 +3678,7 @@ index 169f443ebf6139b8c48e700d73d11053ef443b86..505c79042cf9fa238277979304f13183 } Node* InspectorDOMAgent::scriptValueAsNode(JSC::JSValue value) -@@ -2989,4 +3147,57 @@ Protocol::ErrorStringOr InspectorDOMAgent::setAllowEditingUserAgentShadowT +@@ -2993,4 +3151,57 @@ Protocol::ErrorStringOr InspectorDOMAgent::setAllowEditingUserAgentShadowT return { }; } @@ -3737,7 +3737,7 @@ index 169f443ebf6139b8c48e700d73d11053ef443b86..505c79042cf9fa238277979304f13183 + } // namespace WebCore diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.h b/Source/WebCore/inspector/agents/InspectorDOMAgent.h -index 262829afb3c7151464de876368db47bf733e7f2e..fdcc8c44f3d24f13003b3eed3f2af79c9746896f 100644 +index 14dd53be7d293dfde8826724fa73d74ef00c03c4..7a63a353015c85ad72db824bf62657d5904de6e9 100644 --- a/Source/WebCore/inspector/agents/InspectorDOMAgent.h +++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.h @@ -57,6 +57,7 @@ namespace WebCore { @@ -5510,7 +5510,7 @@ index e601aa9c6d3b04df2e9ffb341626013778e4c9d7..bb1f35d83d64500eb70e16e9bcd31490 } diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h -index 4287ac055edca73b3ca4c2d58b53a34a59f255e2..6f38d54ef3b333b5935ffd7484e10da91788fed4 100644 +index 74431bab05725f9673833ea4a37938013ffa578e..ccf7fb599d98d64f599ca0d750abbaf879efc7b2 100644 --- a/Source/WebCore/loader/DocumentLoader.h +++ b/Source/WebCore/loader/DocumentLoader.h @@ -181,9 +181,13 @@ public: @@ -5706,7 +5706,7 @@ index 58fbc5e15aff1ab5c04952f056d48575c9c68498..2a638ab7da4557ec9be2c5e655f0666d static bool pageAtRuleSupportEnabled() { return shared().m_pageAtRuleSupportEnabled; } diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 0a4a28511d418ed7d5f5b0125527829ae5d902fc..5b4d54c29ae8937539aab0f4748327370e411875 100644 +index 2bf547f813052776110c63bc11bb0226c7973bed..a2f4332b8237fe68d980383ac75f825afd7af986 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -142,6 +142,7 @@ @@ -5793,7 +5793,7 @@ index 0a4a28511d418ed7d5f5b0125527829ae5d902fc..5b4d54c29ae8937539aab0f474832737 && m_frame.selection().isRange() && event.event().button() != RightButton) { VisibleSelection newSelection; -@@ -2054,10 +2056,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE +@@ -2052,10 +2054,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE swallowEvent = !dispatchMouseEvent(eventNames().mousemoveEvent, mouseEvent.targetNode(), 0, platformMouseEvent, FireMouseOverOut::Yes); @@ -5804,7 +5804,7 @@ index 0a4a28511d418ed7d5f5b0125527829ae5d902fc..5b4d54c29ae8937539aab0f474832737 return swallowEvent; } -@@ -4142,7 +4142,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr +@@ -4140,7 +4140,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr if (!m_frame.document()) return false; @@ -5820,7 +5820,7 @@ index 0a4a28511d418ed7d5f5b0125527829ae5d902fc..5b4d54c29ae8937539aab0f474832737 auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; if (dragState().shouldDispatchEvents) { -@@ -4619,7 +4626,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4617,7 +4624,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) allTouchReleased = false; } @@ -5830,7 +5830,7 @@ index 0a4a28511d418ed7d5f5b0125527829ae5d902fc..5b4d54c29ae8937539aab0f474832737 PlatformTouchPoint::State pointState = point.state(); LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); -@@ -4746,6 +4754,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4744,6 +4752,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) changedTouches[pointState].m_touches->append(WTFMove(touch)); changedTouches[pointState].m_targets.add(touchTarget); } @@ -5841,7 +5841,7 @@ index 0a4a28511d418ed7d5f5b0125527829ae5d902fc..5b4d54c29ae8937539aab0f474832737 m_touchPressed = touches->length() > 0; if (allTouchReleased) diff --git a/Source/WebCore/page/EventHandler.h b/Source/WebCore/page/EventHandler.h -index 556cab9e978d31d23563fd5d5325bdb2470c2213..a232efeaf334b58301154dd93eb406d89f8995d2 100644 +index e3c31cf0b58886e9081b44612aa44476cf9fd0cc..5d0d3444f16953a50b7d3f3a1ca494f3a0dfde7c 100644 --- a/Source/WebCore/page/EventHandler.h +++ b/Source/WebCore/page/EventHandler.h @@ -136,9 +136,7 @@ public: @@ -6439,10 +6439,10 @@ index a782c3be51ca113a52482c5a10583c8fa64724ef..1d82dff81be5c5492efb3bfe77d2f259 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 d633760e91b4074533a1a33109cb470ae654f66a..9cb7150d8a9af8105da6fb7360044ad9658d44e7 100644 +index 0e42a6dcd65bbb96e163a7508849145d3332be83..447ab395d74072b5a7bf47a6f830d27abd2decbf 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp -@@ -484,6 +484,37 @@ void Page::setOverrideViewportArguments(const std::optional& +@@ -486,6 +486,37 @@ void Page::setOverrideViewportArguments(const std::optional& document->updateViewportArguments(); } @@ -6480,7 +6480,7 @@ index d633760e91b4074533a1a33109cb470ae654f66a..9cb7150d8a9af8105da6fb7360044ad9 ScrollingCoordinator* Page::scrollingCoordinator() { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { -@@ -1373,10 +1404,6 @@ void Page::didCommitLoad() +@@ -1375,10 +1406,6 @@ void Page::didCommitLoad() m_isEditableRegionEnabled = false; #endif @@ -6491,7 +6491,7 @@ index d633760e91b4074533a1a33109cb470ae654f66a..9cb7150d8a9af8105da6fb7360044ad9 resetSeenPlugins(); resetSeenMediaEngines(); -@@ -3430,6 +3457,26 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3420,6 +3447,26 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -6519,7 +6519,7 @@ index d633760e91b4074533a1a33109cb470ae654f66a..9cb7150d8a9af8105da6fb7360044ad9 { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index fcb1b65103388ab6ed15b38e1bb4a91472f37d57..8dd537ef148e7aa0adb94ad8811c0ae5406dfe68 100644 +index 680b1008ce574f1f50f61940a6647a74019063d5..7a252304e48e522b5c082494b22f447f3a0092c6 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h @@ -285,6 +285,9 @@ public: @@ -6554,7 +6554,7 @@ index fcb1b65103388ab6ed15b38e1bb4a91472f37d57..8dd537ef148e7aa0adb94ad8811c0ae5 #if ENABLE(TEXT_AUTOSIZING) float textAutosizingWidth() const { return m_textAutosizingWidth; } -@@ -916,6 +927,11 @@ public: +@@ -913,6 +924,11 @@ public: WEBCORE_EXPORT void setInteractionRegionsEnabled(bool); #endif @@ -6566,7 +6566,7 @@ index fcb1b65103388ab6ed15b38e1bb4a91472f37d57..8dd537ef148e7aa0adb94ad8811c0ae5 #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -1037,6 +1053,9 @@ private: +@@ -1034,6 +1050,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -6576,7 +6576,7 @@ index fcb1b65103388ab6ed15b38e1bb4a91472f37d57..8dd537ef148e7aa0adb94ad8811c0ae5 #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1116,6 +1135,8 @@ private: +@@ -1113,6 +1132,8 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6585,7 +6585,7 @@ index fcb1b65103388ab6ed15b38e1bb4a91472f37d57..8dd537ef148e7aa0adb94ad8811c0ae5 #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1293,6 +1314,11 @@ private: +@@ -1288,6 +1309,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -7260,10 +7260,10 @@ index b60f9a64bacc8282860da6de299b75aeb295b9b5..55bd017c03c6478ca334bd5ef164160f namespace WebCore { diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp -index f9553d70a966d479e908920f0317b3136eb7bb27..dd6f060c636947b23d593c3eaedc79014444e176 100644 +index 761a1b18570e48c1769d894781475d2771bb9173..396b72f62a027210582e2b53df4d5606952f781d 100644 --- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp +++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp -@@ -104,6 +104,55 @@ void webkitGstVideoFormatInfoComponent(const GstVideoFormatInfo* info, guint pla +@@ -108,6 +108,55 @@ void webkitGstVideoFormatInfoComponent(const GstVideoFormatInfo* info, guint pla } #endif @@ -9090,7 +9090,7 @@ index 2081154f90fac8f7b9f7c6061cf5dc6da1af44b5..e7c6071a6f2e05e76e0fd1cb4661ebd3 void SetHTTPCookieAcceptPolicy(enum:uint8_t WebCore::HTTPCookieAcceptPolicy policy) -> () diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp -index 24e9d0eecb5730ad96c625b114b9c7360adcac52..e0b0218bbf37222fc581d19d6ec3f688445aa9c5 100644 +index 82af7442b68c025cdcc75674f6e579ff91b96847..ad576043d7c156efc03a6e0f1489be6b2b41c976 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp @@ -83,6 +83,11 @@ @@ -9132,7 +9132,7 @@ index 24e9d0eecb5730ad96c625b114b9c7360adcac52..e0b0218bbf37222fc581d19d6ec3f688 void NetworkConnectionToWebProcess::removeStorageAccessForFrame(FrameIdentifier frameID, PageIdentifier pageID) { diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -index 35deb0171bee03d36acd1abad195e9450a54d6fc..90c118158c336763c98132abdded326d9339d8ff 100644 +index aee16bae32d2fc033f6bbc152c481189591b7a10..0970fdde3709f68e424b532bc25bd8ba193706ff 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h @@ -312,6 +312,8 @@ private: @@ -9145,7 +9145,7 @@ index 35deb0171bee03d36acd1abad195e9450a54d6fc..90c118158c336763c98132abdded326d void removeStorageAccessForFrame(WebCore::FrameIdentifier, WebCore::PageIdentifier); diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in -index 77597632a0e3f5dbac4ed45312c401496cf2387d..c3861e47242b15234101ca02a83f2766c8220de2 100644 +index 8323aa8c7a6a488ad651528eecd7a1fa3eae9610..6a620d6ffdc7812b638a299dcaf1b3b0d3a7e014 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in @@ -66,6 +66,8 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver { @@ -9217,7 +9217,7 @@ index 72b4a17928321402f4234e0fa60f92659d6617a1..fd0a7b05935a13caf102b69ee9ac3548 ClearPrevalentResource(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () ClearUserInteraction(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () diff --git a/Source/WebKit/NetworkProcess/NetworkSession.h b/Source/WebKit/NetworkProcess/NetworkSession.h -index b60aeda86f298c1501a659af54a6416c04d66afc..ec6a7eeefc50d7fb6a3e32d235546eb5994b0b8c 100644 +index 95d1403c8368d6409ce67559164218c2877884c4..e09bfcacefef60e42fbe386e35e501de9a4a2548 100644 --- a/Source/WebKit/NetworkProcess/NetworkSession.h +++ b/Source/WebKit/NetworkProcess/NetworkSession.h @@ -192,6 +192,9 @@ public: @@ -9239,7 +9239,7 @@ index b60aeda86f298c1501a659af54a6416c04d66afc..ec6a7eeefc50d7fb6a3e32d235546eb5 HashSet> m_keptAliveLoads; diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index d8eeb6c27a92134728ffada573a1f140e303c727..9ddddb0796cc00d7eea060b11919711446a39586 100644 +index 2b18ee764e7a00159de3f64028a48021c3988a8a..e8461857b83572c42246b99b255389115d58afba 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm @@ -720,7 +720,7 @@ void NetworkSessionCocoa::setClientAuditToken(const WebCore::AuthenticationChall @@ -9296,12 +9296,12 @@ index d1fac29ff7fb628b8994642eb9b7a35cad9ad37f..5f2068c1d6deff4792d974714d75b204 if (m_state != State::Suspended) { diff --git a/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp -index 892d1b2541e218047c33e88a207aa56e36b7e6bc..04bf128418cce29926d53c1af682485f4162ba03 100644 +index 80d8eada3319bec0d8c359af1db319bef87683cf..c71439dee81dc379e827f92de1ff12fa9118684a 100644 --- a/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp +++ b/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp @@ -61,7 +61,7 @@ NetworkSessionCurl::~NetworkSessionCurl() - std::unique_ptr NetworkSessionCurl::createWebSocketTask(WebPageProxyIdentifier, NetworkSocketChannel& channel, const WebCore::ResourceRequest& request, const String& protocol, const WebCore::ClientOrigin&, bool) + std::unique_ptr NetworkSessionCurl::createWebSocketTask(WebPageProxyIdentifier, NetworkSocketChannel& channel, const WebCore::ResourceRequest& request, const String& protocol, const WebCore::ClientOrigin&, bool, bool) { - return makeUnique(channel, request, protocol); + return makeUnique(channel, request, protocol, ignoreCertificateErrors()); @@ -9366,7 +9366,7 @@ index fb70fe2e30abc45508eac1ff7b6fa5b576c22917..6d6404a9fdacf1f5c5f108b860e0e577 if (!error) return true; diff --git a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp -index ddb157400854dd30878a15879cd3b8c2c13f436f..9e952998a139b84ccb80f7e756343e4b1a49efcc 100644 +index 8893772d3dd02b38124e8eefae5199274b3b9148..76939e34e7f9d69814fed6b5eb320f57313dc03c 100644 --- a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp +++ b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp @@ -109,6 +109,11 @@ static gboolean webSocketAcceptCertificateCallback(GTlsConnection* connection, G @@ -9394,7 +9394,7 @@ index ddb157400854dd30878a15879cd3b8c2c13f436f..9e952998a139b84ccb80f7e756343e4b + g_signal_connect(connection, "accept-certificate", G_CALLBACK(webSocketAcceptCertificateCallbackIgnoreTLSErrors), soupMessage); +} + - std::unique_ptr NetworkSessionSoup::createWebSocketTask(WebPageProxyIdentifier, NetworkSocketChannel& channel, const ResourceRequest& request, const String& protocol, const ClientOrigin&, bool) + std::unique_ptr NetworkSessionSoup::createWebSocketTask(WebPageProxyIdentifier, NetworkSocketChannel& channel, const ResourceRequest& request, const String& protocol, const ClientOrigin&, bool, bool) { GRefPtr soupMessage = request.createSoupMessage(blobRegistry()); @@ -127,14 +141,21 @@ std::unique_ptr NetworkSessionSoup::createWebSocketTask(WebPagePr @@ -9698,7 +9698,7 @@ index f2f3979fcac9dfd97d0e0ead600fe35eb8defd40..ac91412e1a96bdf521b1890a66e465dc NSEvent* nativeEvent() const { return m_nativeEvent.get(); } #elif PLATFORM(GTK) diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -index 736417923a0bdf499836bb2622fb97f1ba34e78a..a7b8293ef3b85e765f0f5b6323d2dd08ae489251 100644 +index 39baefe9fd496ea8a4943612c5df57a09ec3b34c..feee88d36c6d6604e69125780c73fbe11931fcf6 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp @@ -125,6 +125,10 @@ @@ -10259,10 +10259,10 @@ index 90df093a49c09dc670dfea55077c77d889dd1c1b..6ffd51532e29b941b8dc10f545b7f5b8 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index b2ac77880db8d99cec811f1127a201c6f7fb7c52..ff0b26a6ffb398d634964ea2b6e312c89b86432d 100644 +index 69195152333b0deb19654ea685ef86b313bbb192..d7521c5e0fa48a7bc9facad0895f7debebc674ad 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -374,11 +374,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -399,11 +399,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -10277,7 +10277,7 @@ index b2ac77880db8d99cec811f1127a201c6f7fb7c52..ff0b26a6ffb398d634964ea2b6e312c8 UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -388,6 +391,7 @@ UIProcess/PageLoadState.cpp +@@ -413,6 +416,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -10285,7 +10285,7 @@ index b2ac77880db8d99cec811f1127a201c6f7fb7c52..ff0b26a6ffb398d634964ea2b6e312c8 UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -429,6 +433,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -454,6 +458,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -10294,7 +10294,7 @@ index b2ac77880db8d99cec811f1127a201c6f7fb7c52..ff0b26a6ffb398d634964ea2b6e312c8 UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPermissionControllerProxy.cpp -@@ -555,7 +561,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -580,7 +586,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -10307,10 +10307,10 @@ index b2ac77880db8d99cec811f1127a201c6f7fb7c52..ff0b26a6ffb398d634964ea2b6e312c8 UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 5296abc26c97d11aa67843ca25b38681ceeac602..6f8712fee94d2d56f5e52c119f69d8a488f8bbd6 100644 +index 42fb8d187014366a1e54a0658d3005c5444ae754..ec4b0b9642f64ea2bc04ca29d3941624ef555e3b 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -262,6 +262,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm +@@ -283,6 +283,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -10318,7 +10318,7 @@ index 5296abc26c97d11aa67843ca25b38681ceeac602..6f8712fee94d2d56f5e52c119f69d8a4 UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -438,6 +439,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -461,6 +462,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -10364,7 +10364,7 @@ index 1ce5369aaedcfe904f2a02d7ca9492b34cfa05e1..ff8cec3c01b41e8ec328c9b55fe98bd9 UIProcess/gtk/WebPasteboardProxyGtk.cpp UIProcess/gtk/WebPopupMenuProxyGtk.cpp diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt -index 8e8b62ef78bd6e1a8549bbec98b861eafe7da09c..064075236324e703e2575e3b2ac024c73707a506 100644 +index 79fa705d8250c9cfe487502e6aaa6ecb08a326d3..7624ff72a451b9892da3c883e12333f1a75ddf3a 100644 --- a/Source/WebKit/SourcesWPE.txt +++ b/Source/WebKit/SourcesWPE.txt @@ -87,6 +87,7 @@ Shared/glib/ProcessExecutablePathGLib.cpp @@ -10399,7 +10399,7 @@ index 8e8b62ef78bd6e1a8549bbec98b861eafe7da09c..064075236324e703e2575e3b2ac024c7 UIProcess/API/wpe/WebKitInputMethodContextWPE.cpp @no-unify UIProcess/API/wpe/WebKitPopupMenu.cpp @no-unify UIProcess/API/wpe/WebKitRectangle.cpp @no-unify -@@ -206,6 +210,7 @@ UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp +@@ -208,6 +212,7 @@ UIProcess/Gamepad/wpe/UIGamepadProviderWPE.cpp UIProcess/geoclue/GeoclueGeolocationProvider.cpp @@ -10407,7 +10407,7 @@ index 8e8b62ef78bd6e1a8549bbec98b861eafe7da09c..064075236324e703e2575e3b2ac024c7 UIProcess/glib/WebPageProxyGLib.cpp UIProcess/glib/WebProcessPoolGLib.cpp UIProcess/glib/WebProcessProxyGLib.cpp -@@ -233,6 +238,11 @@ UIProcess/linux/MemoryPressureMonitor.cpp +@@ -235,6 +240,11 @@ UIProcess/linux/MemoryPressureMonitor.cpp UIProcess/soup/WebProcessPoolSoup.cpp @@ -10419,7 +10419,7 @@ index 8e8b62ef78bd6e1a8549bbec98b861eafe7da09c..064075236324e703e2575e3b2ac024c7 UIProcess/wpe/WebPageProxyWPE.cpp WebProcess/GPU/graphics/gbm/RemoteGraphicsContextGLProxyGBM.cpp -@@ -263,6 +273,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp +@@ -265,6 +275,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp @@ -11483,10 +11483,10 @@ index 7c08a13e10c75677452b74f52be2b447a5edaa13..56cf11581d453e8234f0957828083ee7 }; diff --git a/Source/WebKit/UIProcess/API/wpe/WPEView.cpp b/Source/WebKit/UIProcess/API/wpe/WPEView.cpp -index 2e034517065800329d351bc0dd911a8d99f0eca5..4c4dc72c124e8af0a9f62914de8636a2ff95b936 100644 +index fb4ca2944d6b71834f6bd7b2707af451950cdad5..f8f0b07f1f5593be7ed0a1b040b3fa71b8aed3f0 100644 --- a/Source/WebKit/UIProcess/API/wpe/WPEView.cpp +++ b/Source/WebKit/UIProcess/API/wpe/WPEView.cpp -@@ -64,7 +64,9 @@ View::View(struct wpe_view_backend* backend, const API::PageConfiguration& baseC +@@ -74,7 +74,9 @@ View::View(struct wpe_view_backend* backend, const API::PageConfiguration& baseC if (preferences) { preferences->setAcceleratedCompositingEnabled(true); preferences->setForceCompositingMode(true); @@ -11859,7 +11859,7 @@ index c2221efc00618c2ec4d20a88c59840767bd52ff5..71f1cd7e07c705a7c830ff5c4f7d7f98 #include #include diff --git a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp -index e660f7ef5f3a4395180284ea7788a8cdaf00cb8e..3fa42bad166933b032478650add698ead0220148 100644 +index 27b741df36e254eb0c65e353b3d716f0c69fcc8d..a8ae9bae269b4bbf13cff5f2fc8f669aca78b8cf 100644 --- a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp +++ b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp @@ -123,7 +123,11 @@ void AuxiliaryProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& lau @@ -11875,7 +11875,7 @@ index e660f7ef5f3a4395180284ea7788a8cdaf00cb8e..3fa42bad166933b032478650add698ea platformGetLaunchOptions(launchOptions); } diff --git a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h -index ed26655cceb69694641c4a3a81fb082b7067180f..2d557296f0a1667c5e8fed0b2ff06d9fe33a7012 100644 +index 876b7fd4e1c1abcfa55fe0942506d4f0fc79bb41..f6fb35b10bcfbaf5278b89a96159432e3bb33f20 100644 --- a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h +++ b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h @@ -181,12 +181,15 @@ protected: @@ -11892,9 +11892,9 @@ index ed26655cceb69694641c4a3a81fb082b7067180f..2d557296f0a1667c5e8fed0b2ff06d9f void populateOverrideLanguagesLaunchOptions(ProcessLauncher::LaunchOptions&) const; - Vector platformOverrideLanguages() const; + void platformStartConnectionTerminationWatchdog(); ResponsivenessTimer m_responsivenessTimer; - Vector m_pendingMessages; diff --git a/Source/WebKit/UIProcess/BackingStore.h b/Source/WebKit/UIProcess/BackingStore.h index d3a707a6b440421565144a56e586fa2723fe41c3..6e2492539efdf476452873f069bdaa34163f4a30 100644 --- a/Source/WebKit/UIProcess/BackingStore.h @@ -12116,7 +12116,7 @@ index a0a646412aa6ab10cb6b505cd35164dfa3a56200..e7ab24857b612bd48bba044bb43c6d93 { if (!m_uiDelegate) diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -index 2859ca0b2f7df0c162e4060cd0d60a7829c9f048..81af89730d8033481728f657f6fbdcb99c17fbba 100644 +index 0674c7d1d8d468d4450c1331f58961492e4764c3..1d944382049ceb41414bce54bf5b9d0754e8f67e 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm @@ -37,6 +37,7 @@ @@ -16833,7 +16833,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index cbb1f2333982a4816e2ae5745e6a44c2ef2b1dfc..921baa7d749af67094f13b2400c887f98028a23a 100644 +index f114801f439bb4b8362d27ec656c57d8c2f0770b..8c428f1e44f26bfd7414588e610d9e6e2e630be1 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -246,6 +246,9 @@ @@ -17352,7 +17352,7 @@ index cbb1f2333982a4816e2ae5745e6a44c2ef2b1dfc..921baa7d749af67094f13b2400c887f9 // 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 4998e6d8ee4b6610d89348d1e75e0d65c92e18a8..5370d17a063214bb76a98acf06653b3c3d38c970 100644 +index fb40ca2963e67f3e39fbc552f9d5c45ce01b6cc0..ffafbe89a52870233cce27da61ab66bcb745cf23 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17451,8 +17451,8 @@ index 4998e6d8ee4b6610d89348d1e75e0d65c92e18a8..5370d17a063214bb76a98acf06653b3c + bool cancelDragIfNeeded(); #if PLATFORM(COCOA) void startDrag(const WebCore::DragItem&, const ShareableBitmap::Handle& dragImageHandle); - void setPromisedDataForImage(const String& pasteboardName, const SharedMemory::IPCHandle& imageHandle, const String& filename, const String& extension, - const String& title, const String& url, const String& visibleURL, const SharedMemory::IPCHandle& archiveHandle, const String& originIdentifier); + void setPromisedDataForImage(const String& pasteboardName, const SharedMemory::Handle& imageHandle, const String& filename, const String& extension, + const String& title, const String& url, const String& visibleURL, const SharedMemory::Handle& archiveHandle, const String& originIdentifier); + void releaseInspectorDragPasteboard(); #endif -#if PLATFORM(GTK) @@ -17514,7 +17514,7 @@ index 4998e6d8ee4b6610d89348d1e75e0d65c92e18a8..5370d17a063214bb76a98acf06653b3c #if PLATFORM(IOS_FAMILY) && ENABLE(DEVICE_ORIENTATION) std::unique_ptr m_webDeviceOrientationUpdateProviderProxy; diff --git a/Source/WebKit/UIProcess/WebPageProxy.messages.in b/Source/WebKit/UIProcess/WebPageProxy.messages.in -index 6b4cad75a01dbc8056e6143efff5453e1414eaef..5bfc79e6794615420358fc2c886a1afb6a395878 100644 +index 941f874a3f7be45275d18cf9495d91800839d32b..37ceecb165f5b568d4d4b1a4974c96b072c492cc 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -17535,7 +17535,7 @@ index 6b4cad75a01dbc8056e6143efff5453e1414eaef..5bfc79e6794615420358fc2c886a1afb @@ -305,10 +307,12 @@ messages -> WebPageProxy { StartDrag(struct WebCore::DragItem dragItem, WebKit::ShareableBitmap::Handle dragImage) - SetPromisedDataForImage(String pasteboardName, WebKit::SharedMemory::IPCHandle imageHandle, String filename, String extension, String title, String url, String visibleURL, WebKit::SharedMemory::IPCHandle archiveHandle, String originIdentifier) + SetPromisedDataForImage(String pasteboardName, WebKit::SharedMemory::Handle imageHandle, String filename, String extension, String title, String url, String visibleURL, WebKit::SharedMemory::Handle archiveHandle, String originIdentifier) #endif -#if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT) +#if (PLATFORM(GTK) || PLATFORM(WPE)) && ENABLE(DRAG_SUPPORT) @@ -17615,7 +17615,7 @@ index 7f9db2b972eef69cbbb7ed9185381bf2a3dcffe5..ab985444d3485303f5226883c7b2e890 parameters.urlSchemesRegisteredAsEmptyDocument = copyToVector(m_schemesToRegisterAsEmptyDocument); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp -index 2a208a926eb50fbe096368f6c79d3a5e1471cf5d..c5e98598a6e97c39b12e0d563e31c6fa8f2fbca2 100644 +index 331ee8054f7c8a8ddccd2b3aa7a8e67c285abf38..46d70ced9730a4a62f55ae833049e27a9356ec0a 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp @@ -148,6 +148,11 @@ HashMap& WebProcessProxy::allProcesses() @@ -17658,7 +17658,7 @@ index 2a208a926eb50fbe096368f6c79d3a5e1471cf5d..c5e98598a6e97c39b12e0d563e31c6fa if (isPrewarmed()) diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h -index 85de56c9a40c1389c10d6cad3d5dd5953d969b9f..5736d72bf2c2e064567b9df041095fa562b85134 100644 +index f59e7a215781099f804acfe44f406375057b758f..a699aba91f5cbf35702f2109b01065881202bf30 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.h +++ b/Source/WebKit/UIProcess/WebProcessProxy.h @@ -147,6 +147,7 @@ public: @@ -18766,7 +18766,7 @@ index 0ff5b643de021c6c959412fe25c293fac673fb9b..39bd77283931909133ef9834b40aabae void getContextMenuItem(const WebContextMenuItemData&, CompletionHandler&&); void getContextMenuFromItems(const Vector&, CompletionHandler&&); diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm -index 2291f987a7ebf6702d55ed69b3efee1f94a9ddfa..d4a81ba2b7cdf698c7f60eeec3395c7242f763ed 100644 +index 941292c53d9a136c3f5d8f64bd7d18ea24e13067..00b0366cd82d5891ae2e5560417ad9bdea777517 100644 --- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm +++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm @@ -465,6 +465,12 @@ void WebContextMenuProxyMac::getShareMenuItem(CompletionHandlerdidFail(error); }); @@ -20090,7 +20090,7 @@ index a9b58676edfe1774b6e40585b1bb77f12fd225cd..e31e74fbe3828006932b05f3d3f3f96f } } -@@ -350,7 +356,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -357,7 +363,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be scheduled with the NetworkProcess with priority %d, storedCredentialsPolicy %i", resourceLoader.url().string().latin1().data(), static_cast(resourceLoader.request().priority()), (int)storedCredentialsPolicy); @@ -20098,7 +20098,7 @@ index a9b58676edfe1774b6e40585b1bb77f12fd225cd..e31e74fbe3828006932b05f3d3f3f96f loadParameters.identifier = identifier; loadParameters.webPageProxyID = trackingParameters.webPageProxyID; loadParameters.webPageID = trackingParameters.pageID; -@@ -435,14 +440,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -442,14 +447,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL if (loadParameters.options.mode != FetchOptions::Mode::Navigate) { ASSERT(loadParameters.sourceOrigin); @@ -20116,7 +20116,7 @@ index a9b58676edfe1774b6e40585b1bb77f12fd225cd..e31e74fbe3828006932b05f3d3f3f96f loadParameters.isMainFrameNavigation = resourceLoader.frame() && resourceLoader.frame()->isMainFrame() && resourceLoader.options().mode == FetchOptions::Mode::Navigate; if (loadParameters.isMainFrameNavigation && document) -@@ -474,6 +476,17 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -481,6 +483,17 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL } ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == ClientCredentialPolicy::CannotAskClientForCredentials); @@ -20134,7 +20134,7 @@ index a9b58676edfe1774b6e40585b1bb77f12fd225cd..e31e74fbe3828006932b05f3d3f3f96f std::optional existingNetworkResourceLoadIdentifierToResume; if (loadParameters.isMainFrameNavigation) -@@ -488,7 +501,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -495,7 +508,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL } auto loader = WebResourceLoader::create(resourceLoader, trackingParameters); @@ -20143,7 +20143,7 @@ index a9b58676edfe1774b6e40585b1bb77f12fd225cd..e31e74fbe3828006932b05f3d3f3f96f } void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader) -@@ -895,7 +908,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier +@@ -902,7 +915,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier bool WebLoaderStrategy::isOnLine() const { @@ -20152,7 +20152,7 @@ index a9b58676edfe1774b6e40585b1bb77f12fd225cd..e31e74fbe3828006932b05f3d3f3f96f } void WebLoaderStrategy::addOnlineStateChangeListener(Function&& listener) -@@ -915,6 +928,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet +@@ -922,6 +935,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet void WebLoaderStrategy::setOnLineState(bool isOnLine) { @@ -20164,7 +20164,7 @@ index a9b58676edfe1774b6e40585b1bb77f12fd225cd..e31e74fbe3828006932b05f3d3f3f96f if (m_isOnLine == isOnLine) return; -@@ -923,6 +941,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) +@@ -930,6 +948,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) listener(isOnLine); } @@ -20302,7 +20302,7 @@ index 72cd56ea4c03966283a24b77ac8a754fff98723a..2e181bcb2e151bbf0153d66aa3093ce9 void WebFrameLoaderClient::didRestoreFromBackForwardCache() diff --git a/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm b/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm -index f8f925e1d72b6b64a9c5530073b0dc0ad675a4da..fefe472498045a872b344fb3ad73d736c5e7f2f3 100644 +index cf573ccd65a64982e3dccd4a4e81a50d69310891..722b0aa00685d5e3865370c0d6170ba4115d2ad6 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm +++ b/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm @@ -126,7 +126,8 @@ static WebCore::CachedImage* cachedImage(Element& element) @@ -20664,10 +20664,10 @@ index f127d64d005ab7b93875591b94a5899205e91579..df0de26e4dc449a0fbf93e7037444df4 uint64_t m_navigationID; }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -index d854de6b4429e5750198844fd51ec7d45ecc7eb9..b4ab364c56affe61085c50b3c0ed4e8b17c0db09 100644 +index bcfd5062b0ee4077f18c69eb31a70384700ba093..47cfbc5171198c0c046427e957d4dc472765ca5c 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -@@ -946,6 +946,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) +@@ -948,6 +948,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) ProcessCapabilities::setCanUseAcceleratedBuffers(false); } @@ -20677,7 +20677,7 @@ index d854de6b4429e5750198844fd51ec7d45ecc7eb9..b4ab364c56affe61085c50b3c0ed4e8b updateThrottleState(); } -@@ -1721,6 +1724,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet +@@ -1725,6 +1728,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet } #endif @@ -20700,7 +20700,7 @@ index d854de6b4429e5750198844fd51ec7d45ecc7eb9..b4ab364c56affe61085c50b3c0ed4e8b void WebPage::loadRequest(LoadParameters&& loadParameters) { WEBPAGE_RELEASE_LOG(Loading, "loadRequest: navigationID=%" PRIu64 ", shouldTreatAsContinuingLoad=%u, lastNavigationWasAppInitiated=%d, existingNetworkResourceLoadIdentifierToResume=%" PRIu64, loadParameters.navigationID, static_cast(loadParameters.shouldTreatAsContinuingLoad), loadParameters.request.isAppInitiated(), valueOrDefault(loadParameters.existingNetworkResourceLoadIdentifierToResume).toUInt64()); -@@ -1997,17 +2016,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -2001,17 +2020,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -20719,7 +20719,7 @@ index d854de6b4429e5750198844fd51ec7d45ecc7eb9..b4ab364c56affe61085c50b3c0ed4e8b // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -2024,20 +2039,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -2028,20 +2043,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -20747,7 +20747,7 @@ index d854de6b4429e5750198844fd51ec7d45ecc7eb9..b4ab364c56affe61085c50b3c0ed4e8b #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -2045,7 +2058,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -2049,7 +2062,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -20755,7 +20755,7 @@ index d854de6b4429e5750198844fd51ec7d45ecc7eb9..b4ab364c56affe61085c50b3c0ed4e8b void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2330,6 +2342,7 @@ void WebPage::scaleView(double scale) +@@ -2334,6 +2346,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -20763,7 +20763,7 @@ index d854de6b4429e5750198844fd51ec7d45ecc7eb9..b4ab364c56affe61085c50b3c0ed4e8b scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2509,17 +2522,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2513,17 +2526,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -20782,7 +20782,7 @@ index d854de6b4429e5750198844fd51ec7d45ecc7eb9..b4ab364c56affe61085c50b3c0ed4e8b } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3408,6 +3417,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3412,6 +3421,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -20887,7 +20887,7 @@ index d854de6b4429e5750198844fd51ec7d45ecc7eb9..b4ab364c56affe61085c50b3c0ed4e8b #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3484,6 +3591,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3488,6 +3595,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -20899,7 +20899,7 @@ index d854de6b4429e5750198844fd51ec7d45ecc7eb9..b4ab364c56affe61085c50b3c0ed4e8b void WebPage::insertNewlineInQuotedContent() { Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame(); -@@ -3724,6 +3836,7 @@ void WebPage::didCompletePageTransition() +@@ -3728,6 +3840,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -20907,7 +20907,7 @@ index d854de6b4429e5750198844fd51ec7d45ecc7eb9..b4ab364c56affe61085c50b3c0ed4e8b } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4611,7 +4724,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4615,7 +4728,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -20916,7 +20916,7 @@ index d854de6b4429e5750198844fd51ec7d45ecc7eb9..b4ab364c56affe61085c50b3c0ed4e8b void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -7033,6 +7146,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -7037,6 +7150,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -20927,7 +20927,7 @@ index d854de6b4429e5750198844fd51ec7d45ecc7eb9..b4ab364c56affe61085c50b3c0ed4e8b return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index efb6d1c6316dcafbc61ed911345ac1bf9316cbb5..e634d7812650517e44fbd481ec96f6cd62c73b18 100644 +index a8d6317c7628f3fe499ef7708da81f48a0b4988c..76f57f4cf23838ef85c11fb6e9b12ded0a9f18cf 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -118,6 +118,10 @@ @@ -21008,7 +21008,7 @@ index efb6d1c6316dcafbc61ed911345ac1bf9316cbb5..e634d7812650517e44fbd481ec96f6cd bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 243231cce1bb7068445c8ac18e440f992cca23d6..da81a297660bc2cded1429c2d98a90f37117a1bc 100644 +index 74ee4497373c9b9cca4b5894a31efffe777177d8..7cf743d4738b5993c8951caea2ccfc21804e9709 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in @@ -144,6 +144,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType @@ -21360,7 +21360,7 @@ index 6279a0d3435db9ac91f7705be3f8d40a6b3187a1..a77f548e0c421607f7c20cddfb7c9fe2 SET_AND_EXPOSE_TO_BUILD(HAVE_OS_DARK_MODE_SUPPORT 1) diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake -index 82831d950b260f8bb92828ceae8b3b30cc697fe8..1d0966ea7f6300164317c32c9872678d0a83c1b5 100644 +index 88d2a536009f74c54d74717819e94adf5c316089..15a022fa1cca72d482beec584313e2cea6b1680d 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -9,8 +9,13 @@ if (${CMAKE_VERSION} VERSION_LESS "3.20" AND NOT ${CMAKE_GENERATOR} STREQUAL "Ni @@ -21399,7 +21399,7 @@ index 82831d950b260f8bb92828ceae8b3b30cc697fe8..1d0966ea7f6300164317c32c9872678d WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MODERN_MEDIA_CONTROLS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) -@@ -78,25 +83,43 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS_IN_WORKERS PRIVATE ${EN +@@ -78,7 +83,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS_IN_WORKERS PRIVATE ${EN WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PERIODIC_MEMORY_MONITOR PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) @@ -21408,7 +21408,9 @@ index 82831d950b260f8bb92828ceae8b3b30cc697fe8..1d0966ea7f6300164317c32c9872678d WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE ON) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBXR PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) +@@ -88,19 +93,36 @@ if (WPE_VERSION VERSION_GREATER_EQUAL 1.13.90) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PUBLIC ON) + endif () +# Playwright +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLICATION_MANIFEST PRIVATE ON) @@ -21418,7 +21420,6 @@ index 82831d950b260f8bb92828ceae8b3b30cc697fe8..1d0966ea7f6300164317c32c9872678d +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PRIVATE ON) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PRIVATE ON) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PRIVATE ON) -+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PRIVATE ON) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE ON) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATE PRIVATE ON) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATETIMELOCAL PRIVATE ON)