diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 7f5ea01f93..be32481ca6 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1654 -Changed: yurys@chromium.org Thu 02 Jun 2022 03:28:10 PM PDT +1655 +Changed: dpino@igalia.com Mon Jun 6 23:21:50 HKT 2022 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 5292dd9d6f..e6de6333bc 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="b443fbf87d8dcbaabdd9bde259a812a2e5622906" +BASE_REVISION="5fe7282725c8a286aa677909ee85b2360b17f8ca" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 302975d20f..63b1699642 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -2020,10 +2020,10 @@ index e4b94b59216277aae01696e6d4846abf8f287dce..86dd35168450f2d9ab91c2b2d0f6ca95 isa = XCConfigurationList; buildConfigurations = ( diff --git a/Source/WTF/Scripts/Preferences/WebPreferences.yaml b/Source/WTF/Scripts/Preferences/WebPreferences.yaml -index 2383d5b94b869e13a305571add135a730e15d5b1..9399a38171ba2ed87e10f0944138d1483957bb0a 100644 +index 182300f1eb59a8d32f793a86a69fbebe0432ee63..6ffe778c13805991d8d00778460d214f54aed654 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferences.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferences.yaml -@@ -976,7 +976,7 @@ InspectorStartsAttached: +@@ -965,7 +965,7 @@ InspectorStartsAttached: exposed: [ WebKit ] defaultValue: WebKit: @@ -2032,7 +2032,7 @@ index 2383d5b94b869e13a305571add135a730e15d5b1..9399a38171ba2ed87e10f0944138d148 InspectorWindowFrame: type: String -@@ -1735,6 +1735,17 @@ PluginsEnabled: +@@ -1724,6 +1724,17 @@ PluginsEnabled: WebCore: default: false @@ -2123,7 +2123,7 @@ index 78b806ade5ac37c3b4b075aa39a3962888a217da..de4f57b6e10141d78ad77ae5cd754740 UseGPUProcessForMediaEnabled: diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index 2af5d10c7741eb4b6b33dfcd3ac807f1d0c30461..1c681372cf061b6b14600fae8540f40ca1451d28 100644 +index cbe7cc165d6acba8370ad99dcbb6a0cf7ad781e2..4a0be1e230d47cc4663c96fc322f6414c1b16948 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h @@ -416,7 +416,7 @@ @@ -2170,7 +2170,7 @@ index bb01bfeeac63f854fa656ec6b8d262fafc4c9df5..f8376ea8aada69d2e53734ba8fd234c2 if (Journald_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index ba64118161e8fc6f9ef9334354dc057c020e9045..0e69cc066acf8afb12dfaa2ed81c76d55aafbdee 100644 +index d8e448baaac63ac241cc4720550608df123a3fc6..e66d82f36c32ed8d0dc8e3735a3ed09a2a1f295c 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -414,7 +414,7 @@ @@ -2195,7 +2195,7 @@ index 09d4af604a835c7c6be1e43c249565bd1053aff4..0d6112342480454ce41a6b56dd925e1d if (Journald_FOUND) diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index b8892d2a1791c0a01a0468eb9efb6d8aac08f26a..f90f1d42d6d8e07d6006cf5c0f033b2e03f0d121 100644 +index 3bf84fb312a1dee449355051364265decd71cda7..cef41d07443ff5e6f187ab2acd12b22de49f1b78 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make @@ -976,6 +976,10 @@ JS_BINDING_IDLS := \ @@ -2209,7 +2209,7 @@ index b8892d2a1791c0a01a0468eb9efb6d8aac08f26a..f90f1d42d6d8e07d6006cf5c0f033b2e $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1521,9 +1525,6 @@ JS_BINDING_IDLS := \ +@@ -1522,9 +1526,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -2238,7 +2238,7 @@ diff --git a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm b/So index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d768ace22 100644 --- a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm +++ b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm -@@ -198,6 +198,7 @@ - (void)sendEndIfNeeded +@@ -198,6 +198,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)speechRecognizer:(SFSpeechRecognizer *)speechRecognizer availabilityDidChange:(BOOL)available { @@ -2246,7 +2246,7 @@ index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d ASSERT(isMainThread()); if (available || !_task) -@@ -211,6 +212,7 @@ - (void)speechRecognizer:(SFSpeechRecognizer *)speechRecognizer availabilityDidC +@@ -211,6 +212,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didHypothesizeTranscription:(SFTranscription *)transcription { @@ -2254,7 +2254,7 @@ index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d ASSERT(isMainThread()); [self sendSpeechStartIfNeeded]; -@@ -219,6 +221,7 @@ - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didHypothesizeTran +@@ -219,6 +221,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didFinishRecognition:(SFSpeechRecognitionResult *)recognitionResult { @@ -2262,7 +2262,7 @@ index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d ASSERT(isMainThread()); [self callbackWithTranscriptions:recognitionResult.transcriptions isFinal:YES]; -@@ -230,6 +233,7 @@ - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didFinishRecogniti +@@ -230,6 +233,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)speechRecognitionTaskWasCancelled:(SFSpeechRecognitionTask *)task { @@ -2271,10 +2271,10 @@ index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d [self sendSpeechEndIfNeeded]; diff --git a/Source/WebCore/PlatformWPE.cmake b/Source/WebCore/PlatformWPE.cmake -index 9d021a1a887fb06779b063b525ac985f8f4ba37a..8378753eacb14e9fd34e906111352b5833032d38 100644 +index 9604d21ceb51ab8d20a337c8dbe52c4059043d2c..86a9eec09c4ac457bdd4567eeab570210c1beec3 100644 --- a/Source/WebCore/PlatformWPE.cmake +++ b/Source/WebCore/PlatformWPE.cmake -@@ -48,6 +48,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS +@@ -49,6 +49,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS platform/graphics/wayland/PlatformDisplayWayland.h platform/graphics/wayland/WlUniquePtr.h @@ -2363,7 +2363,7 @@ index 3c64bfd9e2a5ed56ffd61f6c0e1a42f78c9e726b..1e01d0a3f3d71021661f9b43238e9c1f +JSSpeechSynthesisEventInit.cpp +// Playwright: end. diff --git a/Source/WebCore/WebCore.order b/Source/WebCore/WebCore.order -index c4898d6db6bf06552f602c4b7f0a7267e64e44f4..7cf2e30729671a89c373870c5691d337ec3f8a59 100644 +index 82f617e0d496ee71ffc2f2ce4c00ddc0e640f0de..ad47858a0ba283ed44a486dbee29c10a54e97403 100644 --- a/Source/WebCore/WebCore.order +++ b/Source/WebCore/WebCore.order @@ -3090,7 +3090,6 @@ __ZN7WebCore14DocumentLoader23stopLoadingSubresourcesEv @@ -2375,10 +2375,10 @@ index c4898d6db6bf06552f602c4b7f0a7267e64e44f4..7cf2e30729671a89c373870c5691d337 __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index a08974f0a5d579995e18571c83c60c7a88a038a5..60819585f2ddb831509d3b6365875b062a0637c4 100644 +index 3146949567ab1532509cfe5297a3e54d1f6a80ca..b6606cfb7a951db76b019acda52f1bcc4ccb583a 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5537,6 +5537,13 @@ +@@ -5543,6 +5543,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, ); }; }; @@ -2392,7 +2392,7 @@ index a08974f0a5d579995e18571c83c60c7a88a038a5..60819585f2ddb831509d3b6365875b06 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, ); }; }; -@@ -17886,6 +17893,14 @@ +@@ -17906,6 +17913,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 = ""; }; @@ -2407,7 +2407,7 @@ index a08974f0a5d579995e18571c83c60c7a88a038a5..60819585f2ddb831509d3b6365875b06 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 = ""; }; -@@ -24315,7 +24330,12 @@ +@@ -24340,7 +24355,12 @@ 1AF326770D78B9440068F0C4 /* EditorClient.h */, E36D701E27B71F04006531B7 /* EmptyAttachmentElementClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2420,7 +2420,7 @@ index a08974f0a5d579995e18571c83c60c7a88a038a5..60819585f2ddb831509d3b6365875b06 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -30354,6 +30374,8 @@ +@@ -30387,6 +30407,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2429,7 +2429,7 @@ index a08974f0a5d579995e18571c83c60c7a88a038a5..60819585f2ddb831509d3b6365875b06 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -32662,6 +32684,7 @@ +@@ -32696,6 +32718,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2437,7 +2437,7 @@ index a08974f0a5d579995e18571c83c60c7a88a038a5..60819585f2ddb831509d3b6365875b06 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -33671,6 +33694,7 @@ +@@ -33705,6 +33728,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2445,7 +2445,7 @@ index a08974f0a5d579995e18571c83c60c7a88a038a5..60819585f2ddb831509d3b6365875b06 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -35823,6 +35847,7 @@ +@@ -35859,6 +35883,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2453,7 +2453,7 @@ index a08974f0a5d579995e18571c83c60c7a88a038a5..60819585f2ddb831509d3b6365875b06 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -36946,6 +36971,7 @@ +@@ -36983,6 +37008,7 @@ 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, @@ -2461,7 +2461,7 @@ index a08974f0a5d579995e18571c83c60c7a88a038a5..60819585f2ddb831509d3b6365875b06 CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, CD1F9B032700323D00617EB6 /* PlatformVideoMatrixCoefficients.h in Headers */, -@@ -39041,6 +39067,7 @@ +@@ -39081,6 +39107,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2469,7 +2469,7 @@ index a08974f0a5d579995e18571c83c60c7a88a038a5..60819585f2ddb831509d3b6365875b06 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */, -@@ -39117,6 +39144,7 @@ +@@ -39157,6 +39184,7 @@ C1692DD223D23ABD006E88F7 /* SystemBattery.mm in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2477,7 +2477,7 @@ index a08974f0a5d579995e18571c83c60c7a88a038a5..60819585f2ddb831509d3b6365875b06 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -39165,6 +39193,7 @@ +@@ -39205,6 +39233,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2485,7 +2485,7 @@ index a08974f0a5d579995e18571c83c60c7a88a038a5..60819585f2ddb831509d3b6365875b06 DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -39697,6 +39726,7 @@ +@@ -39737,6 +39766,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2494,7 +2494,7 @@ index a08974f0a5d579995e18571c83c60c7a88a038a5..60819585f2ddb831509d3b6365875b06 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 e7b992a4fa4a711639d7089c6508d782fb128fd5..e5c4ff499af4abcb6e3877844ae74df5760a102b 100644 +index f54be5414e003305257b29abe2e2ac38b9191dc2..6b3cfe10bc504b8a598f04feb0d88df19380e486 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -61,6 +61,7 @@ @@ -2505,7 +2505,7 @@ index e7b992a4fa4a711639d7089c6508d782fb128fd5..e5c4ff499af4abcb6e3877844ae74df5 #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3724,9 +3725,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -3732,9 +3733,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (roleValue() == AccessibilityRole::ApplicationDialog) return AccessibilityObjectInclusion::IncludeObject; @@ -2523,7 +2523,7 @@ index e7b992a4fa4a711639d7089c6508d782fb128fd5..e5c4ff499af4abcb6e3877844ae74df5 { AXComputedObjectAttributeCache* attributeCache = nullptr; diff --git a/Source/WebCore/accessibility/AccessibilityObjectInterface.h b/Source/WebCore/accessibility/AccessibilityObjectInterface.h -index f74784a950c349f692298ede02ab3e4fdad4cdf3..d77d4e8eb557f07ec65fac01c529616f71f397bd 100644 +index 730dc39499b4350d444ce5ece2be0fcd54c08434..b223d60cfd842b3cd09f5068db132d03488cd978 100644 --- a/Source/WebCore/accessibility/AccessibilityObjectInterface.h +++ b/Source/WebCore/accessibility/AccessibilityObjectInterface.h @@ -57,7 +57,7 @@ typedef const struct __AXTextMarkerRange* AXTextMarkerRangeRef; @@ -2535,7 +2535,7 @@ index f74784a950c349f692298ede02ab3e4fdad4cdf3..d77d4e8eb557f07ec65fac01c529616f #endif namespace PAL { -@@ -1552,6 +1552,8 @@ private: +@@ -1554,6 +1554,8 @@ private: COMPtr m_wrapper; #elif USE(ATSPI) RefPtr m_wrapper; @@ -2642,7 +2642,7 @@ index 0000000000000000000000000000000000000000..dd2d8452302999e4a89b0bc18e842645 + +#endif // ENABLE(ACCESSIBILITY) && !USE(ATK) && !USE(ATSPI) diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -index 2cc6674df51634daa275a34828b832212ade9b2a..697cf75e301cae080c8fcc8ad749142e33f14683 100644 +index 41b03fd31e9879a93a07a018c33bf166b4c2d713..08fa7e77c9b491a91c21cb49a0ca6cf59e1220c4 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h @@ -132,6 +132,8 @@ namespace WebCore { @@ -2680,7 +2680,7 @@ index 01d312c38e8e273099cf8d9b187ac704300f4c34..62570e7024cebae99b9d2eef711e70d8 if (!value) return userPrefersReducedMotion; diff --git a/Source/WebCore/dom/DataTransfer.cpp b/Source/WebCore/dom/DataTransfer.cpp -index 5186d365dfdfb02b1c62f1400f9f15b31afbf4c4..a591245ef7841731bcfd82eb2026607378651496 100644 +index 1fd7ac8377fe0b502f396998b1675460542bd823..7452bfd809b3e5f5c489cf254ad1321eaec084dc 100644 --- a/Source/WebCore/dom/DataTransfer.cpp +++ b/Source/WebCore/dom/DataTransfer.cpp @@ -496,6 +496,14 @@ Ref DataTransfer::createForDrag(const Document& document) @@ -2699,7 +2699,7 @@ index 5186d365dfdfb02b1c62f1400f9f15b31afbf4c4..a591245ef7841731bcfd82eb20266073 { auto dataTransfer = adoptRef(*new DataTransfer(StoreMode::ReadWrite, makeUnique(), Type::DragAndDropData)); diff --git a/Source/WebCore/dom/DataTransfer.h b/Source/WebCore/dom/DataTransfer.h -index 4b1b54ddc37426c51614e594c3a99b3862929b65..be102d9d6369e36540e342d35febf16e7aa9927b 100644 +index fbcdea3855b8a42ab5f69ba06839b78857abb1f1..a5686a98b117836df7656d4360056be8ef2a2878 100644 --- a/Source/WebCore/dom/DataTransfer.h +++ b/Source/WebCore/dom/DataTransfer.h @@ -90,6 +90,9 @@ public: @@ -2869,6 +2869,19 @@ index 7542bab569d49879f0eb460520738b3da37116f6..17c92229cc596bc80a718911b74737d3 PointerEvent(const AtomString& type, const PlatformTouchEvent&, IsCancelable isCancelable, unsigned touchIndex, bool isPrimary, Ref&&); #endif +diff --git a/Source/WebCore/editing/ReplaceSelectionCommand.cpp b/Source/WebCore/editing/ReplaceSelectionCommand.cpp +index 33cb19fe6e720771da7ad9afae0289ed6005b1b8..6b3993d5e3fcc4099c12e0376ed7ddbd3fe220ed 100644 +--- a/Source/WebCore/editing/ReplaceSelectionCommand.cpp ++++ b/Source/WebCore/editing/ReplaceSelectionCommand.cpp +@@ -230,7 +230,7 @@ void ReplacementFragment::removeContentsWithSideEffects() + auto end = descendantsOfType(*m_fragment).end(); + while (it != end) { + Ref element = *it; +- if (isScriptElement(element) || (is(element) && element->getAttribute(classAttr) != WebKitMSOListQuirksStyle) ++ if (isScriptElement(element) || (is(element) && element->getAttribute(classAttr) != AtomString(WebKitMSOListQuirksStyle)) + || is(element) || is(element) || is(element) || is(element)) { + elementsToRemove.append(WTFMove(element)); + it.traverseNextSkippingChildren(); diff --git a/Source/WebCore/editing/libwpe/EditorLibWPE.cpp b/Source/WebCore/editing/libwpe/EditorLibWPE.cpp index b8a3148b067373dadfb43975473a18caeb266d51..504172cd327b38ffbd103259e86d374752ee3474 100644 --- a/Source/WebCore/editing/libwpe/EditorLibWPE.cpp @@ -2920,6 +2933,19 @@ index e739d217b780fc475c78762f0b04b96f57fa7df1..2d8479d1695fc6239c9f55ab29371d5d if (!UserGestureIndicator::processingUserGesture()) return; +diff --git a/Source/WebCore/html/FormController.cpp b/Source/WebCore/html/FormController.cpp +index 51a2aa3f83136e582a07715ecebd82572af9aff3..8f395ff841f6731c3de442bc648dce4ae9a34d08 100644 +--- a/Source/WebCore/html/FormController.cpp ++++ b/Source/WebCore/html/FormController.cpp +@@ -147,7 +147,7 @@ FormControlState FormController::SavedFormState::takeControlState(const FormElem + void FormController::SavedFormState::appendReferencedFilePaths(Vector& vector) const + { + for (auto& element : m_map) { +- if (element.key.second != "file"_s) // type ++ if (element.key.second != AtomString("file"_s)) // type + continue; + for (auto& state : element.value) { + for (auto& file : HTMLInputElement::filesFromFileInputFormControlState(state)) diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp index 23b330d6d57226dd0e3e2d19117520097f6baf7f..45531ee0561e8783f245f05f27cd51c175c52b70 100644 --- a/Source/WebCore/inspector/InspectorController.cpp @@ -3353,8 +3379,20 @@ index bde7c16e2e3fbe0b5d3891996e550f99785bb5c1..899b13d1eac5bd7dd35fe82cce1bf796 inline InstrumentingAgents* InspectorInstrumentation::instrumentingAgents(ScriptExecutionContext* context) { return context ? instrumentingAgents(*context) : nullptr; +diff --git a/Source/WebCore/inspector/UserGestureEmulationScope.h b/Source/WebCore/inspector/UserGestureEmulationScope.h +index 07103c35e0a9193a010a85cf2ea8017b2ad59212..338d158be5a6f35adc6817dc94d6084b8bc593c5 100644 +--- a/Source/WebCore/inspector/UserGestureEmulationScope.h ++++ b/Source/WebCore/inspector/UserGestureEmulationScope.h +@@ -37,6 +37,7 @@ namespace WebCore { + class ChromeClient; + class Document; + class Page; ++class Document; + + class UserGestureEmulationScope { + WTF_MAKE_NONCOPYABLE(UserGestureEmulationScope); diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp -index 9b678ae214c8c8d324d233d9d3e3f351c46f6dc4..5ea4116377851c3824d813f426852ce5b50473bf 100644 +index 19b82d5098da96d66489c84c5309fc7225b8a725..188b193b1cf67f2cd4cf35ad2313de57bd703670 100644 --- a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp @@ -62,12 +62,16 @@ @@ -3632,7 +3670,7 @@ index 9b678ae214c8c8d324d233d9d3e3f351c46f6dc4..5ea4116377851c3824d813f426852ce5 + if (!node) + return makeUnexpected("Can not find element for given id"_s); + -+ if (node->nodeType() != Node::ELEMENT_NODE || node->nodeName() != "INPUT") ++ if (node->nodeType() != Node::ELEMENT_NODE || node->nodeName() != "INPUT"_s) + return makeUnexpected("Not an input node"_s); + + if (!(bool(files) ^ bool(paths))) @@ -3869,7 +3907,7 @@ index 1a4779cbc9f388434295a94fd9da566d6ff4e3f7..c4712dd9f1319c205b97e5afa0a903b7 // InspectorInstrumentation void willRecalculateStyle(); diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp -index 78c340d26e07205fa467ac93f068423ea23e99d7..315887ccd675e5f1726668486deaaa9f1f1775b0 100644 +index 78c340d26e07205fa467ac93f068423ea23e99d7..0e47e112b2dbb074bbbb9e540c6e41cd59e05327 100644 --- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp @@ -32,20 +32,28 @@ @@ -4787,10 +4825,10 @@ index 78c340d26e07205fa467ac93f068423ea23e99d7..315887ccd675e5f1726668486deaaa9f + axNode->setHaspopup(axObject->popupValue()); + + String invalidValue = axObject->invalidStatus(); -+ if (invalidValue != "false") { -+ if (invalidValue == "grammar") ++ if (invalidValue != "false"_s) { ++ if (invalidValue == "grammar"_s) + axNode->setInvalid(Inspector::Protocol::Page::AXNode::Invalid::Grammar); -+ else if (invalidValue == "spelling") ++ else if (invalidValue == "spelling"_s) + axNode->setInvalid(Inspector::Protocol::Page::AXNode::Invalid::Spelling); + else // Future versions of ARIA may allow additional truthy values. Ex. format, order, or size. + axNode->setInvalid(Inspector::Protocol::Page::AXNode::Invalid::True); @@ -5287,18 +5325,6 @@ index 6aba3a2c6e8bbb7a0bca4f07824cf4de8ce36f8e..537e3b34d6405e412bf0e2350909c9af InstrumentingAgents& m_instrumentingAgents; Page& m_inspectedPage; -diff --git a/Source/WebCore/inspector/agents/page/UserGestureEmulationScope.h b/Source/WebCore/inspector/agents/page/UserGestureEmulationScope.h -index 11bda04703c38c0ac3c81ca8d575c453ed3430a2..d1d0d7c2002e3e4021584e6493d91ac214cd5534 100644 ---- a/Source/WebCore/inspector/agents/page/UserGestureEmulationScope.h -+++ b/Source/WebCore/inspector/agents/page/UserGestureEmulationScope.h -@@ -39,6 +39,7 @@ namespace WebCore { - class ChromeClient; - class Document; - class Page; -+class Document; - - class UserGestureEmulationScope { - WTF_MAKE_NONCOPYABLE(UserGestureEmulationScope); diff --git a/Source/WebCore/loader/CookieJar.h b/Source/WebCore/loader/CookieJar.h index 21e33e46bdb1af8434527747e3c308cbe53f60f0..c17c4de17f439c04d27caa532771934cb2f62abd 100644 --- a/Source/WebCore/loader/CookieJar.h @@ -5322,7 +5348,7 @@ index 21e33e46bdb1af8434527747e3c308cbe53f60f0..c17c4de17f439c04d27caa532771934c protected: static SameSiteInfo sameSiteInfo(const Document&, IsForDOMCookieAccess = IsForDOMCookieAccess::No); diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp -index ce453415884b3400185c8f9ebb400b01e7325447..367b38e1cc79da385772cee0dfc2776389ac9674 100644 +index 7aa1cd888e1bee6e9a6e326f68a71ffc008a728a..85de870ae44f6ec4efc4d4e7e770c79a446031e7 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp @@ -1507,8 +1507,6 @@ void DocumentLoader::detachFromFrame() @@ -5353,10 +5379,10 @@ index 50de786a5483597989439209ebd16b5b4e8a2924..59198323a3e72b92e95f73c15a43dc6d DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index 2d3e75288eef017f4cab26584d25d65a8b582682..49075624068299bfb700c18629731791251efa41 100644 +index e350042d03e78ad19cb5ea642b29025b5ba75e76..d1049c1b4b5e73da2beefd5d15179c129b9dbbd9 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp -@@ -1167,6 +1167,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr stat +@@ -1173,6 +1173,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr stat } m_client->dispatchDidNavigateWithinPage(); @@ -5364,7 +5390,7 @@ index 2d3e75288eef017f4cab26584d25d65a8b582682..49075624068299bfb700c18629731791 m_frame.document()->statePopped(stateObject ? stateObject.releaseNonNull() : SerializedScriptValue::nullValue()); m_client->dispatchDidPopStateWithinPage(); -@@ -1603,6 +1604,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t +@@ -1609,6 +1610,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t const String& httpMethod = loader->request().httpMethod(); if (shouldPerformFragmentNavigation(isFormSubmission, httpMethod, policyChecker().loadType(), newURL)) { @@ -5373,7 +5399,7 @@ index 2d3e75288eef017f4cab26584d25d65a8b582682..49075624068299bfb700c18629731791 RefPtr oldDocumentLoader = m_documentLoader; NavigationAction action { *m_frame.document(), loader->request(), InitiatedByMainFrame::Unknown, policyChecker().loadType(), isFormSubmission }; -@@ -1632,7 +1635,9 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t +@@ -1638,7 +1641,9 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t } RELEASE_ASSERT(!isBackForwardLoadType(policyChecker().loadType()) || history().provisionalItem()); @@ -5383,7 +5409,7 @@ index 2d3e75288eef017f4cab26584d25d65a8b582682..49075624068299bfb700c18629731791 continueLoadAfterNavigationPolicy(request, formState.get(), navigationPolicyDecision, allowNavigationToInvalidURL); completionHandler(); }, PolicyDecisionMode::Asynchronous); -@@ -2800,12 +2805,17 @@ String FrameLoader::userAgent(const URL& url) const +@@ -2806,12 +2811,17 @@ String FrameLoader::userAgent(const URL& url) const String FrameLoader::navigatorPlatform() const { @@ -5403,7 +5429,7 @@ index 2d3e75288eef017f4cab26584d25d65a8b582682..49075624068299bfb700c18629731791 } void FrameLoader::dispatchOnloadEvents() -@@ -3212,6 +3222,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) +@@ -3218,6 +3228,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) checkCompleted(); if (m_frame.page()) checkLoadComplete(); @@ -5412,7 +5438,7 @@ index 2d3e75288eef017f4cab26584d25d65a8b582682..49075624068299bfb700c18629731791 } void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, bool shouldContinue) -@@ -3982,9 +3994,6 @@ String FrameLoader::referrer() const +@@ -3988,9 +4000,6 @@ String FrameLoader::referrer() const void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() { @@ -5422,7 +5448,7 @@ index 2d3e75288eef017f4cab26584d25d65a8b582682..49075624068299bfb700c18629731791 Vector> worlds; ScriptController::getAllWorlds(worlds); for (auto& world : worlds) -@@ -3993,13 +4002,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() +@@ -3999,13 +4008,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world) { @@ -5502,7 +5528,7 @@ index 4a65cd84e5b3c627f16712427d8059a73c759403..90a6262005694741aaaa59c869d35d5c #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 843ab83cea38a97f601dc22f35b284f152049527..b8b276c20bd226b78a2757cbe52a9c2fb6ff19cb 100644 +index 398188a9cc6d0ff79259324ef8cf37e5f80af9d6..3263040687199f1c21267bc15a0c61b8480f842f 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -142,6 +142,7 @@ @@ -6235,7 +6261,7 @@ 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 a26e32a917edb14da910a6538bdfe18bf3bd8df6..be8fabf2eadccdc26c225d992b15855e2a91d83d 100644 +index f68850e2120e0b155809a277d9f44382d075fdb3..13bc1ec2ca101311aaa227e7b7884c73efe2d5b5 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp @@ -487,6 +487,37 @@ void Page::setOverrideViewportArguments(const std::optional& @@ -6305,7 +6331,7 @@ index a26e32a917edb14da910a6538bdfe18bf3bd8df6..be8fabf2eadccdc26c225d992b15855e { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index be8eb5264eeae6a461856d6c477b3eaeee31569f..833f2e0ef70707680c09a84b692086037fa87572 100644 +index 3166d7463afcbd48dd08bb0d20ed047bd7ac0f54..6dd15d9fb0c0887bae8bafff9a52967c9e543310 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h @@ -281,6 +281,9 @@ public: @@ -6350,7 +6376,7 @@ index be8eb5264eeae6a461856d6c477b3eaeee31569f..833f2e0ef70707680c09a84b69208603 #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -1021,6 +1035,9 @@ private: +@@ -1023,6 +1037,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -6360,7 +6386,7 @@ index be8eb5264eeae6a461856d6c477b3eaeee31569f..833f2e0ef70707680c09a84b69208603 #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1100,6 +1117,7 @@ private: +@@ -1102,6 +1119,7 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6368,7 +6394,7 @@ index be8eb5264eeae6a461856d6c477b3eaeee31569f..833f2e0ef70707680c09a84b69208603 #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1277,6 +1295,11 @@ private: +@@ -1279,6 +1297,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -6442,10 +6468,10 @@ index 897d2a009752a4030659a88e8b16382e00ac2316..08bb3344c59a0462668762815473659f #endif diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h -index e6f03848b809ec796454e14fc7d6ea45373239ee..563ba04256ea44ba0f109c37c4638a5a59e02890 100644 +index 687407911c5af4b3f5aca3b42c85a14f585a49d0..fc883c029e29277149b575b191f333ecdcc694fc 100644 --- a/Source/WebCore/page/RuntimeEnabledFeatures.h +++ b/Source/WebCore/page/RuntimeEnabledFeatures.h -@@ -177,6 +177,7 @@ public: +@@ -174,6 +174,7 @@ public: void setMouseEventsSimulationEnabled(bool isEnabled) { m_mouseEventsSimulationEnabled = isEnabled; } bool touchEventsEnabled() const; void setTouchEventsEnabled(bool isEnabled) { m_touchEventsEnabled = isEnabled; } @@ -6494,7 +6520,7 @@ index 7ac11c8289347e3a2f3e7316cf9e32932b9544ed..764b2d4fe36ac2e5588bd22595424ac1 } diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp -index d1679136a7ca95a16ca3fa6246c42f0111d940b5..9e49bf67a063987dc4964ca2a1267c649a5e24ff 100644 +index 882c974316404ffb3f35640922c7b032a60f8152..b76888b2d241f77b29276523fb3b1d49e52214b7 100644 --- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp @@ -298,6 +298,8 @@ bool ContentSecurityPolicy::allowContentSecurityPolicySourceStarToMatchAnyProtoc @@ -6925,7 +6951,7 @@ index ee63764693bb08b70a4ee6c54bf566f5143182cf..947c9c4f4bde763469e66b915e054f8d #else return false; diff --git a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp b/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp -index 4db603a94f3af1b1bce94ab0f1ae36054c004fcc..c1820f48eb86348f8ca678fde636244e8c91267e 100644 +index fab94e0ac0f4ab8f7d7decec53adb1f3ac7a6e07..cd853346eb019b00fa99478e7aee2961f61bc23b 100644 --- a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp +++ b/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp @@ -48,6 +48,13 @@ @@ -7049,7 +7075,7 @@ index b60f9a64bacc8282860da6de299b75aeb295b9b5..55bd017c03c6478ca334bd5ef164160f namespace WebCore { diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp -index 7b54a01f3e963c18791734ec4a3c4ea8c8f38a9e..dd7ce59e0cef49f1214a71f35bda597708081496 100644 +index ce40cc903f98688cbd2da28c0f0ed6660ce38b52..808e5e68f6abafc3a200f6c2d7cd12c9f34be473 100644 --- a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp +++ b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp @@ -27,7 +27,7 @@ @@ -7059,8 +7085,8 @@ index 7b54a01f3e963c18791734ec4a3c4ea8c8f38a9e..dd7ce59e0cef49f1214a71f35bda5977 -#if ENABLE(WEBGL) && USE(OPENGL) +#if !PLATFORM(WIN) && ENABLE(WEBGL) && USE(OPENGL) + #include "ByteArrayPixelBuffer.h" #include "ExtensionsGLOpenGL.h" - #include "IntRect.h" diff --git a/Source/WebCore/platform/graphics/win/ComplexTextControllerUniscribe.cpp b/Source/WebCore/platform/graphics/win/ComplexTextControllerUniscribe.cpp index 6d6820fc22f9a7102bbdad6c4b5e3e7e9645f66c..f44797b8c197bf1b3daaa9b59dad2a8e250c4791 100644 --- a/Source/WebCore/platform/graphics/win/ComplexTextControllerUniscribe.cpp @@ -7817,7 +7843,7 @@ index 8e3cb385825b5d3f9b045bbd93d099324bec2912..51d451aaec8e2f799272efc8b3f4feeb WEBCORE_EXPORT void setCookie(const Cookie&); WEBCORE_EXPORT void setCookies(const Vector&, const URL&, const URL& mainDocumentURL); diff --git a/Source/WebCore/platform/network/ResourceResponseBase.h b/Source/WebCore/platform/network/ResourceResponseBase.h -index f5558f3b6b822e80bfb731e3ad40b2e515a8ff17..081a3bfa4dc18c7ad3d40f07e252992845287781 100644 +index e09b7b612a69d7cf0d21b0122e948bb9d66a8e2f..b4ed30c1ed25eb436f4697fa3cfbc08e805c828e 100644 --- a/Source/WebCore/platform/network/ResourceResponseBase.h +++ b/Source/WebCore/platform/network/ResourceResponseBase.h @@ -223,6 +223,8 @@ public: @@ -7878,7 +7904,7 @@ index 8f3f4ad592fb624f406d6244dcab766940496b7a..1db5f443608b0387ff0b9b19dab78847 { ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies)); diff --git a/Source/WebCore/platform/network/curl/CookieJarDB.h b/Source/WebCore/platform/network/curl/CookieJarDB.h -index c4eb67d6f7c334076b32b798dcea40b570681e6f..ce86ab28225aa466350671441294f2ace8851bbd 100644 +index dd0553966d670c398bb352730905def8a0a3f289..0622f8a2d217365cfa4ceb1b4cab58b898835f92 100644 --- a/Source/WebCore/platform/network/curl/CookieJarDB.h +++ b/Source/WebCore/platform/network/curl/CookieJarDB.h @@ -72,7 +72,7 @@ public: @@ -8657,6 +8683,19 @@ index fac9402820702989bf72ed2425678bfb82bd6523..40b5a6441d22714fd370ce1a7c2f534e // Returns the line height of the inner renderer. int innerLineHeight() const override; #endif +diff --git a/Source/WebCore/rendering/RenderTreeAsText.cpp b/Source/WebCore/rendering/RenderTreeAsText.cpp +index d2dc7f9d8d1d52a2fe26984c748ff31ca47564b0..aacc1a576323d50ed5fe0600b85cad94767f2393 100644 +--- a/Source/WebCore/rendering/RenderTreeAsText.cpp ++++ b/Source/WebCore/rendering/RenderTreeAsText.cpp +@@ -142,7 +142,7 @@ static bool isEmptyOrUnstyledAppleStyleSpan(const Node* node) + return false; + + const HTMLElement& element = downcast(*node); +- if (element.getAttribute(classAttr) != "Apple-style-span"_s) ++ if (element.getAttribute(classAttr) != AtomString("Apple-style-span"_s)) + return false; + + if (!node->hasChildNodes()) diff --git a/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in b/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in index 2081154f90fac8f7b9f7c6061cf5dc6da1af44b5..e7c6071a6f2e05e76e0fd1cb4661ebd32a5bb3fd 100644 --- a/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in @@ -8745,7 +8784,7 @@ index 77597632a0e3f5dbac4ed45312c401496cf2387d..c3861e47242b15234101ca02a83f2766 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 75f5fe9a094503648bdd1ef3231154a0f92314ae..ef46091d7cf93f2a80acaa11d37270748d0df001 100644 +index 45dc0534b6cbc236b89ef54844d651f52d5b4ce2..0dd00c548d7fd5c572570a5a88fd34ac03afeb74 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -530,6 +530,12 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) @@ -8826,10 +8865,10 @@ index 11b3fc7c4267ef9e412d7d48bb6cfbe70b2bdfeb..af1fb6660696cf9c91d319670d554272 HashSet> m_keptAliveLoads; diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index f3654db2dff953d825f012af144e1c00130d8251..b8165beb908b307a26c7acc47e3cf52adbaaaff2 100644 +index 1d9c725383fa4ad497de378783e519b98451fb20..44fd5f3b958f8a7bd85b8657fff5bac058a86a69 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -@@ -720,7 +720,7 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didRece +@@ -723,7 +723,7 @@ void NetworkSessionCocoa::setClientAuditToken(const WebCore::AuthenticationChall if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { sessionCocoa->setClientAuditToken(challenge); @@ -8838,7 +8877,7 @@ index f3654db2dff953d825f012af144e1c00130d8251..b8165beb908b307a26c7acc47e3cf52a return completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]); NSURLSessionTaskTransactionMetrics *metrics = task._incompleteTaskMetrics.transactionMetrics.lastObject; -@@ -964,6 +964,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END +@@ -967,6 +967,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData(taskMetrics, networkDataTask->networkLoadMetrics())); @@ -8853,7 +8892,7 @@ index f3654db2dff953d825f012af144e1c00130d8251..b8165beb908b307a26c7acc47e3cf52a #if !LOG_DISABLED LOG(NetworkSession, "%llu didReceiveResponse completionHandler (%d)", taskIdentifier, policyAction); diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp -index 919935044a5b6b24a5d3f8268a0b876065032550..9cfdab46f921fe8b38d6a10e74cb03355b020090 100644 +index d1fac29ff7fb628b8994642eb9b7a35cad9ad37f..5f2068c1d6deff4792d974714d75b204958e9a42 100644 --- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp +++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp @@ -84,6 +84,8 @@ NetworkDataTaskCurl::NetworkDataTaskCurl(NetworkSession& session, NetworkDataTas @@ -9014,10 +9053,10 @@ index ddb157400854dd30878a15879cd3b8c2c13f436f..9e952998a139b84ccb80f7e756343e4b } return makeUnique(channel, request, soupSession(), soupMessage.get(), protocol); diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index 701de727c8ca19283d4da10529f2d50b370d9757..51f0b17a24b3869966ddebdda32cdc539f6863bd 100644 +index c8b445abe3f464e8d327642e80ac900b565f93d3..b1792226c39d05ec9961581a00b58a92da615b73 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake -@@ -476,6 +476,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES +@@ -488,6 +488,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES ${GSTREAMER_PBUTILS_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} ${LIBSOUP_INCLUDE_DIRS} @@ -9027,7 +9066,7 @@ index 701de727c8ca19283d4da10529f2d50b370d9757..51f0b17a24b3869966ddebdda32cdc53 ) if (USE_WPE_RENDERER) -@@ -529,6 +532,9 @@ if (USE_LIBWEBRTC) +@@ -541,6 +544,9 @@ if (USE_LIBWEBRTC) list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/libwebrtc/Source/" "${THIRDPARTY_DIR}/libwebrtc/Source/webrtc" @@ -9037,7 +9076,7 @@ index 701de727c8ca19283d4da10529f2d50b370d9757..51f0b17a24b3869966ddebdda32cdc53 ) endif () -@@ -543,6 +549,12 @@ if (ENABLE_MEDIA_STREAM) +@@ -555,6 +561,12 @@ if (ENABLE_MEDIA_STREAM) ) endif () @@ -9051,10 +9090,10 @@ index 701de727c8ca19283d4da10529f2d50b370d9757..51f0b17a24b3869966ddebdda32cdc53 set(WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2GTK_INSTALLED_HEADERS}) list(REMOVE_ITEM WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit/WebKitEnumTypes.h) diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake -index 93c194b1e3c2462fee6b8c66ecbb9323c4841350..51e0f52c363ecd4b1d64c78834473ceb0e6cab30 100644 +index 8126927e398ac903e7c3a7200cdb67894a8c4ed7..7dc4ee3c07733ab2c7a39c57499408fba81eed19 100644 --- a/Source/WebKit/PlatformWPE.cmake +++ b/Source/WebKit/PlatformWPE.cmake -@@ -185,6 +185,7 @@ set(WPE_API_INSTALLED_HEADERS +@@ -197,6 +197,7 @@ set(WPE_API_INSTALLED_HEADERS ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitOptionMenuItem.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPermissionRequest.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPlugin.h @@ -9062,7 +9101,7 @@ index 93c194b1e3c2462fee6b8c66ecbb9323c4841350..51e0f52c363ecd4b1d64c78834473ceb ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPolicyDecision.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitRectangle.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitResponsePolicyDecision.h -@@ -313,6 +314,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES +@@ -325,6 +326,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES "${WEBKIT_DIR}/UIProcess/CoordinatedGraphics" "${WEBKIT_DIR}/UIProcess/Inspector/glib" "${WEBKIT_DIR}/UIProcess/geoclue" @@ -9070,7 +9109,7 @@ index 93c194b1e3c2462fee6b8c66ecbb9323c4841350..51e0f52c363ecd4b1d64c78834473ceb "${WEBKIT_DIR}/UIProcess/gstreamer" "${WEBKIT_DIR}/UIProcess/linux" "${WEBKIT_DIR}/UIProcess/soup" -@@ -334,8 +336,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES +@@ -346,8 +348,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES ${GIO_UNIX_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} ${LIBSOUP_INCLUDE_DIRS} @@ -9089,7 +9128,7 @@ index 93c194b1e3c2462fee6b8c66ecbb9323c4841350..51e0f52c363ecd4b1d64c78834473ceb Cairo::Cairo Freetype::Freetype diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake -index 737f761d4595df39fc4a1877f7f95fb5aa506c47..885921ea5c771e2728ef39a652c59cf144dc4d83 100644 +index feb39b35c1bd873c646da76aa762e40680f96533..9188b2fd6561727504fb5f14185d00d245cc98cf 100644 --- a/Source/WebKit/PlatformWin.cmake +++ b/Source/WebKit/PlatformWin.cmake @@ -64,8 +64,12 @@ list(APPEND WebKit_SOURCES @@ -9105,7 +9144,7 @@ index 737f761d4595df39fc4a1877f7f95fb5aa506c47..885921ea5c771e2728ef39a652c59cf1 UIProcess/win/WebPageProxyWin.cpp UIProcess/win/WebPopupMenuProxyWin.cpp UIProcess/win/WebProcessPoolWin.cpp -@@ -83,6 +87,7 @@ list(APPEND WebKit_SOURCES +@@ -84,6 +88,7 @@ list(APPEND WebKit_SOURCES WebProcess/MediaCache/WebMediaKeyStorageManager.cpp WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp @@ -9113,7 +9152,7 @@ index 737f761d4595df39fc4a1877f7f95fb5aa506c47..885921ea5c771e2728ef39a652c59cf1 WebProcess/WebPage/AcceleratedSurface.cpp -@@ -136,6 +141,72 @@ list(APPEND WebKit_MESSAGES_IN_FILES +@@ -137,6 +142,72 @@ list(APPEND WebKit_MESSAGES_IN_FILES GPUProcess/graphics/wc/RemoteWCLayerTreeHost ) @@ -9186,7 +9225,7 @@ index 737f761d4595df39fc4a1877f7f95fb5aa506c47..885921ea5c771e2728ef39a652c59cf1 set(WebKitCommonIncludeDirectories ${WebKit_INCLUDE_DIRECTORIES}) set(WebKitCommonSystemIncludeDirectories ${WebKit_SYSTEM_INCLUDE_DIRECTORIES}) -@@ -196,6 +267,7 @@ if (${WTF_PLATFORM_WIN_CAIRO}) +@@ -197,6 +268,7 @@ if (${WTF_PLATFORM_WIN_CAIRO}) OpenSSL::SSL mfuuid.lib strmiids.lib @@ -9206,6 +9245,19 @@ index caf67e1dece5b727e43eba780e70814f8fdb0f63..740150d2589d6e16a516daa3bf6ef899 #include #include #include +diff --git a/Source/WebKit/Shared/IPCTester.messages.in b/Source/WebKit/Shared/IPCTester.messages.in +index 3ee8ea4fea2ac058fb7e25eb41aa9ab363db7c55..ca31cfc74453b17cd4062e30e8433190b09c7cfc 100644 +--- a/Source/WebKit/Shared/IPCTester.messages.in ++++ b/Source/WebKit/Shared/IPCTester.messages.in +@@ -27,7 +27,7 @@ messages -> IPCTester NotRefCounted { + StopMessageTesting() -> () Synchronous + CreateStreamTester(WebKit::IPCStreamTesterIdentifier identifier, IPC::StreamConnectionBuffer stream) WantsConnection + ReleaseStreamTester(WebKit::IPCStreamTesterIdentifier identifier) -> () Synchronous +- CreateConnectionTester(WebKit::IPCConnectionTesterIdentifier ideœntifier, IPC::Attachment connection) WantsConnection ++ CreateConnectionTester(WebKit::IPCConnectionTesterIdentifier identifier, IPC::Attachment connection) WantsConnection + CreateConnectionTesterAndSendAsyncMessages(WebKit::IPCConnectionTesterIdentifier identifier, IPC::Attachment connection, uint32_t messageCount) WantsConnection + ReleaseConnectionTester(WebKit::IPCConnectionTesterIdentifier identifier) -> () Synchronous + diff --git a/Source/WebKit/Shared/NativeWebKeyboardEvent.h b/Source/WebKit/Shared/NativeWebKeyboardEvent.h index ee8cac1c980039c4a36de5501ab7f135e710d06b..deae2be9e720ff76186ecea89920dfc39c4f186a 100644 --- a/Source/WebKit/Shared/NativeWebKeyboardEvent.h @@ -9285,10 +9337,10 @@ 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 d33585ec4c0fecb7f02b3b56f8169d4797e9e2ed..e7f623726a6ddfb2d0ae63c5ac16217c7051f46c 100644 +index 44e6cf59eb1b5f6edd05b70d33fec92f1d13a13a..4dbed341290f7eda0a47aeb2fc464956d799a8de 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -@@ -122,6 +122,10 @@ +@@ -123,6 +123,10 @@ #include #endif @@ -9299,7 +9351,7 @@ index d33585ec4c0fecb7f02b3b56f8169d4797e9e2ed..e7f623726a6ddfb2d0ae63c5ac16217c // FIXME: Seems like we could use std::tuple to cut down the code below a lot! namespace IPC { -@@ -1384,6 +1388,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature +@@ -1412,6 +1416,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature encoder << windowFeatures.resizable; encoder << windowFeatures.fullscreen; encoder << windowFeatures.dialog; @@ -9309,7 +9361,7 @@ index d33585ec4c0fecb7f02b3b56f8169d4797e9e2ed..e7f623726a6ddfb2d0ae63c5ac16217c } bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& windowFeatures) -@@ -1412,6 +1419,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win +@@ -1440,6 +1447,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win return false; if (!decoder.decode(windowFeatures.dialog)) return false; @@ -9322,7 +9374,7 @@ index d33585ec4c0fecb7f02b3b56f8169d4797e9e2ed..e7f623726a6ddfb2d0ae63c5ac16217c return true; } -@@ -1425,6 +1438,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) +@@ -1453,6 +1466,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) #if PLATFORM(COCOA) encoder << dragData.pasteboardName(); encoder << dragData.fileNames(); @@ -9334,7 +9386,7 @@ index d33585ec4c0fecb7f02b3b56f8169d4797e9e2ed..e7f623726a6ddfb2d0ae63c5ac16217c #endif encoder << dragData.dragDestinationActionMask(); encoder << dragData.pageID(); -@@ -1448,9 +1466,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1476,9 +1494,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(applicationFlags)) return false; @@ -9352,7 +9404,7 @@ index d33585ec4c0fecb7f02b3b56f8169d4797e9e2ed..e7f623726a6ddfb2d0ae63c5ac16217c if (!decoder.decode(pasteboardName)) return false; -@@ -1466,8 +1491,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1494,8 +1519,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(pageID)) return false; @@ -9846,10 +9898,10 @@ index 90df093a49c09dc670dfea55077c77d889dd1c1b..6ffd51532e29b941b8dc10f545b7f5b8 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index 368ed8c2f09a99f6d58555ae1af05ad272b90019..0a8de7f8af0efdaa280dbda7cf6599f4e17e5d57 100644 +index 8449b98dca13bf468ebd203434694bafdb33dcb2..ec7005d1359069b319a2b3753026f294e52f7fff 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -395,11 +395,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -396,11 +396,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -9864,7 +9916,7 @@ index 368ed8c2f09a99f6d58555ae1af05ad272b90019..0a8de7f8af0efdaa280dbda7cf6599f4 UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -408,6 +411,7 @@ UIProcess/PageLoadState.cpp +@@ -409,6 +412,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -9872,7 +9924,7 @@ index 368ed8c2f09a99f6d58555ae1af05ad272b90019..0a8de7f8af0efdaa280dbda7cf6599f4 UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -450,6 +454,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -451,6 +455,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -9881,7 +9933,7 @@ index 368ed8c2f09a99f6d58555ae1af05ad272b90019..0a8de7f8af0efdaa280dbda7cf6599f4 UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPreferences.cpp -@@ -573,7 +579,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -574,7 +580,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -9894,7 +9946,7 @@ index 368ed8c2f09a99f6d58555ae1af05ad272b90019..0a8de7f8af0efdaa280dbda7cf6599f4 UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 860996b37535577bee0fdccbeeb026a622c24418..129a4da9b1bbf90ba5b36ce733b4aee4c2c7a54d 100644 +index 0ec8eca8cb9f393c9464a83ebf2ef9984cae1b6a..1bc846e858a4b004817aa050cfa255cb06bb4f6d 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt @@ -276,6 +276,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm @@ -9914,7 +9966,7 @@ index 860996b37535577bee0fdccbeeb026a622c24418..129a4da9b1bbf90ba5b36ce733b4aee4 UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm UIProcess/Inspector/mac/WKInspectorViewController.mm diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt -index 3b52d10af68fa9048d93193720fe3068defa8606..089ad9d5e0faf0a34c87dbbaf11abf96e33d8d71 100644 +index bc7726cbe2dd19dc5fa32f0ba65c9ef93acefb21..835f2fc17595024fe5830e8a2861b2872ff43406 100644 --- a/Source/WebKit/SourcesGTK.txt +++ b/Source/WebKit/SourcesGTK.txt @@ -128,6 +128,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify @@ -10228,7 +10280,7 @@ index afa925f36c29db9c23921298dead9cce737500d6..42d396342acdb6d39830f611df0ee40e NS_ASSUME_NONNULL_END diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm -index e6f2fcf02b24fa16021c3be83f6116f989610027..bc2ddd59dd037fe3f52f996124b8cd2d426d526d 100644 +index b8bf936e2eb8ca4dc0f445099dfb899395950bdb..30a2af76de0daac450c7afbb8a2dfe8116147b11 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm @@ -47,6 +47,7 @@ @@ -10239,7 +10291,7 @@ index e6f2fcf02b24fa16021c3be83f6116f989610027..bc2ddd59dd037fe3f52f996124b8cd2d #import #import #import -@@ -234,6 +235,11 @@ - (void)removeDataOfTypes:(NSSet *)dataTypes modifiedSince:(NSDate *)date comple +@@ -234,6 +235,11 @@ static WallTime toSystemClockTime(NSDate *date) }); } @@ -10418,7 +10470,7 @@ diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm b/ index 2e235bb880c638a0e74256b6d66cb0244ea0a3f1..3471eebb47e860f7c2071d0e7f2691c9f0a6355d 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm -@@ -257,6 +257,16 @@ - (BOOL)processSwapsOnNavigation +@@ -257,6 +257,16 @@ return _processPoolConfiguration->processSwapsOnNavigation(); } @@ -10689,7 +10741,7 @@ index 64c90f9f25fc44911e819ab94fa973bf0b82a0e4..8d8c739fb903b71f7881801cb41901f2 bool canRunBeforeUnloadConfirmPanel() const final { return true; } diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -index 4c428ea9ff63076ad49d0adf5ac206698c0d4ced..6ae9593350f3eb0a45bbedf58c8a188a332d7d27 100644 +index be4999328ad31e635b1cb2093b129140e852b450..c6b0aaac648a6686142a9085da383e14ef8a204f 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp @@ -403,10 +403,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa @@ -11723,7 +11775,7 @@ index 24b29521c80bbcfc9d9b6553aac11a7a02faef99..7358db1001a753a3e67fb99af7b46b92 #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index c457d9a2b50e270ba2b5256bb9c1ceb2029a916d..67cc79e09e6926b2e8878500b72be36bebf51053 100644 +index 71171b1292b0f23ef0f0a3101b6c7538c7a593d2..83513ef77cbd2d77865eaa63c738952cff7a6f37 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm @@ -359,7 +359,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process @@ -11735,7 +11787,7 @@ index c457d9a2b50e270ba2b5256bb9c1ceb2029a916d..67cc79e09e6926b2e8878500b72be36b #endif #if PLATFORM(IOS) -@@ -619,8 +619,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -614,8 +614,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -11761,7 +11813,7 @@ index a4d0e7c10ffe1cfd50203c996cec083f167ac03f..95cfb310026746a10d36c50bbbcbc40e void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -index 301c5369280e278a5cd21b231ef6041425a120f7..1a2f7fb51740c54931c8690281399e0346bea2ed 100644 +index 02ff741ea45cf7ee4e3848ddbe8ec287435904c4..9f6d8ca4e3b4f7a3518f185ac79570b110a469f4 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm @@ -2776,6 +2776,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() @@ -14195,7 +14247,7 @@ index 0000000000000000000000000000000000000000..d0e11ed81a6257c011df23d5870da740 +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/InspectorPlaywrightAgent.cpp b/Source/WebKit/UIProcess/InspectorPlaywrightAgent.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..6039fdbcef4cc08e51a195b0c82a4cfb3a5ef8a1 +index 0000000000000000000000000000000000000000..21c18c2df54097375dee67bb2393bdd6f3242d69 --- /dev/null +++ b/Source/WebKit/UIProcess/InspectorPlaywrightAgent.cpp @@ -0,0 +1,963 @@ @@ -14994,11 +15046,11 @@ index 0000000000000000000000000000000000000000..6039fdbcef4cc08e51a195b0c82a4cfb + cookie.session = *value; + String sameSite; + if (obj->getString("sameSite"_s, sameSite)) { -+ if (sameSite == "None") ++ if (sameSite == "None"_s) + cookie.sameSite = WebCore::Cookie::SameSitePolicy::None; -+ if (sameSite == "Lax") ++ if (sameSite == "Lax"_s) + cookie.sameSite = WebCore::Cookie::SameSitePolicy::Lax; -+ if (sameSite == "Strict") ++ if (sameSite == "Strict"_s) + cookie.sameSite = WebCore::Cookie::SameSitePolicy::Strict; + } + cookies.append(WTFMove(cookie)); @@ -15982,7 +16034,7 @@ index 0000000000000000000000000000000000000000..b3bb4880a866ee6132b8b26acf8dad81 +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..3349b5d961f1308e201782358e8b3a7354d11a97 +index 0000000000000000000000000000000000000000..ac30c5f2308932d0074e59acf8093750f5eab9db --- /dev/null +++ b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp @@ -0,0 +1,332 @@ @@ -16110,23 +16162,23 @@ index 0000000000000000000000000000000000000000..3349b5d961f1308e201782358e8b3a73 +{ + if (key.length() == 1) + return makeString("U+", hex(toASCIIUpper(key.characterAt(0)), 4)); -+ if (key == "Delete") ++ if (key == "Delete"_s) + return "U+007F"_s; -+ if (key == "Backspace") ++ if (key == "Backspace"_s) + return "U+0008"_s; -+ if (key == "ArrowUp") ++ if (key == "ArrowUp"_s) + return "Up"_s; -+ if (key == "ArrowDown") ++ if (key == "ArrowDown"_s) + return "Down"_s; -+ if (key == "ArrowLeft") ++ if (key == "ArrowLeft"_s) + return "Left"_s; -+ if (key == "ArrowRight") ++ if (key == "ArrowRight"_s) + return "Right"_s; -+ if (key == "Tab") ++ if (key == "Tab"_s) + return "U+0009"_s; -+ if (key == "Pause") ++ if (key == "Pause"_s) + return "Pause"_s; -+ if (key == "ScrollLock") ++ if (key == "ScrollLock"_s) + return "Scroll"_s; + return key; +} @@ -16134,9 +16186,9 @@ index 0000000000000000000000000000000000000000..3349b5d961f1308e201782358e8b3a73 +void WebPageInspectorInputAgent::dispatchKeyEvent(const String& type, std::optional&& modifiers, const String& text, const String& unmodifiedText, const String& code, const String& key, std::optional&& windowsVirtualKeyCode, std::optional&& nativeVirtualKeyCode, std::optional&& autoRepeat, std::optional&& isKeypad, std::optional&& isSystemKey, RefPtr&& commands, Ref&& callback) +{ + WebKit::WebEvent::Type eventType; -+ if (type == "keyDown") { ++ if (type == "keyDown"_s) { + eventType = WebKit::WebEvent::KeyDown; -+ } else if (type == "keyUp") { ++ } else if (type == "keyUp"_s) { + eventType = WebKit::WebEvent::KeyUp; + } else { + callback->sendFailure("Unsupported event type."_s); @@ -16177,7 +16229,7 @@ index 0000000000000000000000000000000000000000..3349b5d961f1308e201782358e8b3a73 + WallTime timestamp = WallTime::now(); + + // cancel any active drag on Escape -+ if (eventType == WebKit::WebEvent::KeyDown && key == "Escape" && m_page.cancelDragIfNeeded()) { ++ if (eventType == WebKit::WebEvent::KeyDown && key == "Escape"_s && m_page.cancelDragIfNeeded()) { + callback->sendSuccess(); + return; + } @@ -16203,11 +16255,11 @@ index 0000000000000000000000000000000000000000..3349b5d961f1308e201782358e8b3a73 +void WebPageInspectorInputAgent::dispatchMouseEvent(const String& type, int x, int y, std::optional&& modifiers, const String& button, std::optional&& buttons, std::optional&& clickCount, std::optional&& deltaX, std::optional&& deltaY, Ref&& callback) +{ + WebEvent::Type eventType = WebEvent::NoType; -+ if (type == "down") ++ if (type == "down"_s) + eventType = WebEvent::MouseDown; -+ else if (type == "up") ++ else if (type == "up"_s) + eventType = WebEvent::MouseUp; -+ else if (type == "move") ++ else if (type == "move"_s) + eventType = WebEvent::MouseMove; + else { + callback->sendFailure("Unsupported event type"_s); @@ -16220,13 +16272,13 @@ index 0000000000000000000000000000000000000000..3349b5d961f1308e201782358e8b3a73 + + WebMouseEvent::Button eventButton = WebMouseEvent::NoButton; + if (!!button) { -+ if (button == "left") ++ if (button == "left"_s) + eventButton = WebMouseEvent::LeftButton; -+ else if (button == "middle") ++ else if (button == "middle"_s) + eventButton = WebMouseEvent::MiddleButton; -+ else if (button == "right") ++ else if (button == "right"_s) + eventButton = WebMouseEvent::RightButton; -+ else if (button == "none") ++ else if (button == "none"_s) + eventButton = WebMouseEvent::NoButton; + else { + callback->sendFailure("Unsupported eventButton"_s); @@ -16411,7 +16463,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 09d9f1cc093aa5539b5be90304781a27fb784300..3d8bf100bc1d041137b58bb7af776a2022354595 100644 +index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979f644f461 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -247,6 +247,9 @@ @@ -17174,7 +17226,7 @@ index 56789958133037207df23dffd42a5144132e3219..06c9a3d31cf2a08c187087b07f4141d7 WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index d972449851175209109506b3842f8c35d43f0094..b19c0dfc5f55e05d74ee947325acb938faf6555f 100644 +index 812df81bf826eddae029c3d60978e7ccfb91cf48..7d9cdcae47454397791c2e979d95730c33940539 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp @@ -2011,6 +2011,12 @@ void WebsiteDataStore::originDirectoryForTesting(URL&& origin, URL&& topOrigin, @@ -17703,7 +17755,7 @@ index 0000000000000000000000000000000000000000..f5f811ced4eafef530d101c4e397fe27 + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/gtk/WebDateTimePickerGtk.cpp b/Source/WebKit/UIProcess/gtk/WebDateTimePickerGtk.cpp -index ce0b10ec8d07762bb1b19ff1eb05fc17de129c2c..275ab45bc83e9ab3011023ec3cf999472e8ab8b0 100644 +index 6029857cfcd6c4fea14de28243f1955138a62844..8a1bda8f2637670cf88baca998cbff09157d2a6f 100644 --- a/Source/WebKit/UIProcess/gtk/WebDateTimePickerGtk.cpp +++ b/Source/WebKit/UIProcess/gtk/WebDateTimePickerGtk.cpp @@ -34,6 +34,8 @@ @@ -18270,7 +18322,7 @@ index 1a2c89022fd23b5dc5976500d9a3943d6daaffb8..9f66ad2c714018be74e669df4c650d42 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 f0edd9660e699ab411fda40d77c27ecde396a281..76c8fe9c3d2add36272307c5bd367d55d9114464 100644 +index 388231d5569e5fbb2ed8450b6c6b1276e18e4cff..578c6f66ac0ef39ad06c4d7561a3931433476c63 100644 --- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm +++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm @@ -465,6 +465,12 @@ void WebContextMenuProxyMac::getShareMenuItem(CompletionHandler allowedActionsMask) RequestAdditionalItemsForDragSession(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -index 228f8ef1415e5829c706357b188fc7fd860b2137..e3095164374ad48a1c66e533579865e123ada20f 100644 +index dc54788b7076064e6d2fc6ca1f6050ac214ecc43..c6026ad111a3b3a88781d80e5ba5545a78edf3d4 100644 --- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm +++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm @@ -808,21 +808,37 @@ String WebPage::platformUserAgent(const URL&) const @@ -20615,7 +20667,7 @@ index c77ff78cd3cd9627d1ae7b930c81457094645200..88746359159a76b169b7e6dcbee4fb34 } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index 4f818395cb940e76ae58ec19a59e3358cf8138ac..ec0235ccbde767fb0d802fe71d339b66f68f68ad 100644 +index 58590251c62d3adddce9a229e88a9ac9d2885750..aff3f5943eb34ba7d57e88a60f1d3dd92de7d3d7 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -92,6 +92,7 @@ @@ -20651,10 +20703,10 @@ index 8987c3964a9308f2454759de7f8972215a3ae416..bcac0afeb94ed8123d1f9fb0b932c849 SetProcessDPIAware(); return true; diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -index 9f9c67523b8fac9025d2cec101adf452631ffc61..737d8dab4f7aa1fe446b2dcfdc32fe83e02a4555 100644 +index 725c6714b8f75365ba4cdb969df1bd1bbe4c69c1..562571835a5740c5df06e1bad8b6ce9077bf7d66 100644 --- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -@@ -4189,7 +4189,7 @@ - (void)mouseDown:(WebEvent *)event +@@ -4189,7 +4189,7 @@ static BOOL currentScrollIsBlit(NSView *clipView) _private->handlingMouseDownEvent = NO; } @@ -20664,10 +20716,10 @@ index 9f9c67523b8fac9025d2cec101adf452631ffc61..737d8dab4f7aa1fe446b2dcfdc32fe83 - (void)touch:(WebEvent *)event { diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm -index 09748e5cf07408ec620bb0a151378dbf6590733d..824b2efbfe7c6821ab0913cc7ebeaf960ea79784 100644 +index 59cecf9242ab834dadc904ef295365e1476f47f9..ca4cc96e62df62e92c22c3535f5972cc1fdc4cba 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm -@@ -4043,7 +4043,7 @@ + (void)_doNotStartObservingNetworkReachability +@@ -4039,7 +4039,7 @@ IGNORE_WARNINGS_END } #endif // PLATFORM(IOS_FAMILY) @@ -20676,7 +20728,7 @@ index 09748e5cf07408ec620bb0a151378dbf6590733d..824b2efbfe7c6821ab0913cc7ebeaf96 - (NSArray *)_touchEventRegions { -@@ -4085,7 +4085,7 @@ - (NSArray *)_touchEventRegions +@@ -4081,7 +4081,7 @@ IGNORE_WARNINGS_END }).autorelease(); } @@ -20717,7 +20769,7 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 0b46274ec42f24ec201f5bd8771cdf751781a381..5ae927b66bfbd065ff6d2752671cf35f92182d9a 100644 +index 337ac4df65636502a2b20a323c24033027536247..d44db8d54f0c8a4d840c6d970591a9f0a8c850cf 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -11,8 +11,13 @@ if (${CMAKE_VERSION} VERSION_LESS "3.20" AND NOT ${CMAKE_GENERATOR} STREQUAL "Ni @@ -20774,7 +20826,7 @@ index 0b46274ec42f24ec201f5bd8771cdf751781a381..5ae927b66bfbd065ff6d2752671cf35f WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PDFJS PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC ON) -@@ -159,10 +168,10 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PRIVATE ON) +@@ -158,10 +167,10 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYER_BASED_SVG_ENGINE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -20785,9 +20837,9 @@ index 0b46274ec42f24ec201f5bd8771cdf751781a381..5ae927b66bfbd065ff6d2752671cf35f -WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PRIVATE ON) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) -@@ -170,7 +179,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION P + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MODERN_MEDIA_CONTROLS PRIVATE ON) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_CONTEXT_MENUS PRIVATE ON) +@@ -171,7 +180,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION P WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS_IN_WORKERS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -20796,7 +20848,7 @@ index 0b46274ec42f24ec201f5bd8771cdf751781a381..5ae927b66bfbd065ff6d2752671cf35f WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PERIODIC_MEMORY_MONITOR PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ON) -@@ -178,6 +187,15 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) +@@ -179,6 +188,15 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_API_STATISTICS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -20812,7 +20864,7 @@ index 0b46274ec42f24ec201f5bd8771cdf751781a381..5ae927b66bfbd065ff6d2752671cf35f include(GStreamerDependencies) # Finalize the value for all options. Do not attempt to use an option before -@@ -279,7 +297,8 @@ if (NOT EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py") +@@ -280,7 +298,8 @@ if (NOT EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py") set(BUILD_REVISION "tarball") endif () @@ -20823,7 +20875,7 @@ index 0b46274ec42f24ec201f5bd8771cdf751781a381..5ae927b66bfbd065ff6d2752671cf35f SET_AND_EXPOSE_TO_BUILD(HAVE_OS_DARK_MODE_SUPPORT 1) diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake -index 42c335562733a8813a434880d74b0b4ed9232694..55600800f9bf05f8c9e4d9a9577d9e7681660fb3 100644 +index f2f47fde02518af99c8c473b9321e58d40e864f7..13e6d8586a323770b9a0148afa68264fc724bcbc 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 @@ -20840,10 +20892,10 @@ index 42c335562733a8813a434880d74b0b4ed9232694..55600800f9bf05f8c9e4d9a9577d9e76 find_package(Cairo 1.14.0 REQUIRED) find_package(Fontconfig 2.8.0 REQUIRED) find_package(Freetype 2.4.2 REQUIRED) -@@ -62,10 +67,10 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GPU_PROCESS PRIVATE OFF) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE ON) +@@ -62,10 +67,10 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYER_BASED_SVG_ENGINE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_CONTEXT_MENUS PRIVATE ON) -WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_RECORDER PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_RECORDER PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE ON) @@ -20851,9 +20903,9 @@ index 42c335562733a8813a434880d74b0b4ed9232694..55600800f9bf05f8c9e4d9a9577d9e76 -WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ON) 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) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE ON) -@@ -75,24 +80,42 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS_IN_WORKERS PRIVATE ${EN +@@ -76,24 +81,42 @@ 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) @@ -20901,7 +20953,7 @@ index 42c335562733a8813a434880d74b0b4ed9232694..55600800f9bf05f8c9e4d9a9577d9e76 WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON) # Private options specific to the WPE port. -@@ -299,7 +322,7 @@ if (NOT EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py") +@@ -300,7 +323,7 @@ if (NOT EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py") endif () SET_AND_EXPOSE_TO_BUILD(HAVE_ACCESSIBILITY ${ENABLE_ACCESSIBILITY}) @@ -22736,7 +22788,7 @@ index 4f3640a8b93897d69604ee8ba38cd07561720ad2..00b657a8a585d104afc346dc1126fb71 InjectedBundle/wpe/InjectedBundleWPE.cpp InjectedBundle/wpe/TestRunnerWPE.cpp diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp -index 719d0b06fb681a452f6cda8d575da727a40681b8..ed86e04231b6a92fc8ba047d9a12ead5b0afe77e 100644 +index 16253216895fd73900d22fb2d8b6741310c2f4bc..8b67a71bf5d2b6909eb36d0e54180c29a6ae76ae 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp @@ -874,6 +874,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options) @@ -22819,20 +22871,6 @@ index 017c992209e39859a0b56c1145bb79d9fdc6e939..5bf0744cfdcca58f6ecab6a9838abacf ruby # These are dependencies necessary for running tests. -diff --git a/Tools/jhbuild/jhbuild-minimal.modules b/Tools/jhbuild/jhbuild-minimal.modules -index 77755b7fa816283c5e738c4e82c9a822499ef353..348eb67028791bf13e333299f521de2fc7a020c1 100644 ---- a/Tools/jhbuild/jhbuild-minimal.modules -+++ b/Tools/jhbuild/jhbuild-minimal.modules -@@ -175,7 +175,8 @@ - - - -- -+ - - - diff --git a/Tools/win/DLLLauncher/DLLLauncherMain.cpp b/Tools/win/DLLLauncher/DLLLauncherMain.cpp index 52605867b9302d1afcc56c5e9b0c54acf0827900..6edf24ab60249241ba2969531ef55f4b495dce9e 100644 --- a/Tools/win/DLLLauncher/DLLLauncherMain.cpp