diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 8f539152f4..8982cac0c0 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1707 -Changed: yurys@chromium.org Thu 18 Aug 2022 05:50:58 PM PDT +1708 +Changed: dpino@igalia.com Tue Aug 23 13:42:36 UTC 2022 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 18579e43a8..62f14fb421 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="7db2194055b8957ce3f325a9f6823f38d156cc48" +BASE_REVISION="115d9297ff1ae8ce0d01358d42d3f7bc8b33e577" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 64029e2c9d..8beb6ef4c3 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -1,8 +1,8 @@ diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt -index 5cfff6ac7f3828fe6445140282e12a002b983f0f..19108d5e4e1baa6177baaa6e0df604cf2dcd4a36 100644 +index c2e1cda64b287749cb508203f8e0562dff62cec6..5799df8cc071219937a19d1a4d6893409dd6ae03 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1359,22 +1359,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1360,22 +1360,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json @@ -31,10 +31,10 @@ index 5cfff6ac7f3828fe6445140282e12a002b983f0f..19108d5e4e1baa6177baaa6e0df604cf ${JAVASCRIPTCORE_DIR}/inspector/protocol/ServiceWorker.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Target.json diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make -index 92652ba9bcd53553ab52166b633a4f0d6263d324..da5c253e67adb8edec7df6af84fa65743972b63c 100644 +index a1ee4b4a0563f2bb0fa07080da0f5b1c10bb6767..79cdd20c34092dd9cc8026128e6aba3bfac9e50a 100644 --- a/Source/JavaScriptCore/DerivedSources.make +++ b/Source/JavaScriptCore/DerivedSources.make -@@ -290,22 +290,27 @@ INSPECTOR_DOMAINS := \ +@@ -291,22 +291,27 @@ INSPECTOR_DOMAINS := \ $(JavaScriptCore)/inspector/protocol/CSS.json \ $(JavaScriptCore)/inspector/protocol/Canvas.json \ $(JavaScriptCore)/inspector/protocol/Console.json \ @@ -1860,13 +1860,13 @@ index 0d42c17c6a85b2a9f6af319431332f7f8a709188..8899c8e85b11db81d1da14c7f2781488 Source/third_party/opus/src/celt Source/third_party/opus/src/include diff --git a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp -index 4157c0a95fa332ac85a295814fda2fb61f3da434..f77a990c1a52f3ab2943a02a4375bb71d91c1656 100644 +index 0a36256d0da1126ff93c39f189e76a2f5f282094..db1fe9fab24f4480b0e067c9022f731d717d98b6 100644 --- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp +++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp -@@ -338,3 +338,24 @@ __ZN6webrtc32createPixelBufferFromFrameBufferERNS_16VideoFrameBufferERKNSt3__18f - __ZN6webrtc25CreateTaskQueueGcdFactoryEv +@@ -339,3 +339,24 @@ __ZN6webrtc25CreateTaskQueueGcdFactoryEv __ZN6webrtc27CreatePeerConnectionFactoryEPN3rtc6ThreadES2_S2_NS0_13scoped_refptrINS_17AudioDeviceModuleEEENS3_INS_19AudioEncoderFactoryEEENS3_INS_19AudioDecoderFactoryEEENSt3__110unique_ptrINS_19VideoEncoderFactoryENSA_14default_deleteISC_EEEENSB_INS_19VideoDecoderFactoryENSD_ISG_EEEENS3_INS_10AudioMixerEEENS3_INS_15AudioProcessingEEEPNS_19AudioFrameProcessorENSB_INS_16TaskQueueFactoryENSD_ISP_EEEE __ZN6webrtc16convertBGRAToYUVEP10__CVBufferS1_ + __ZNK7cricket9Candidate16ToStringInternalEb +__ZN8mkvmuxer11SegmentInfo15set_writing_appEPKc +__ZN8mkvmuxer11SegmentInfo4InitEv +__ZN8mkvmuxer7Segment10OutputCuesEb @@ -2124,7 +2124,7 @@ 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 8e180a9913870eeabba0960fb3eea2aca92bbdfc..be52610f76b05af1cf86a195a2e042909bd276dd 100644 +index e0889ff9d0885654a812cc7a36805dab1ace6331..4cfa2d20ecea9965c8c6d02b478dcfd9f192a6cd 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -527,7 +527,7 @@ CrossOriginOpenerPolicyEnabled: @@ -2168,7 +2168,7 @@ index 8e180a9913870eeabba0960fb3eea2aca92bbdfc..be52610f76b05af1cf86a195a2e04290 # FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well. MediaCapabilitiesExtensionsEnabled: -@@ -1438,7 +1439,7 @@ SpeechRecognitionEnabled: +@@ -1450,7 +1451,7 @@ SpeechRecognitionEnabled: WebKitLegacy: default: false WebKit: @@ -2177,7 +2177,7 @@ index 8e180a9913870eeabba0960fb3eea2aca92bbdfc..be52610f76b05af1cf86a195a2e04290 default: false WebCore: default: false -@@ -1553,6 +1554,7 @@ UseGPUProcessForDisplayCapture: +@@ -1565,6 +1566,7 @@ UseGPUProcessForDisplayCapture: WebKit: default: true @@ -2185,7 +2185,7 @@ index 8e180a9913870eeabba0960fb3eea2aca92bbdfc..be52610f76b05af1cf86a195a2e04290 UseGPUProcessForWebGLEnabled: type: bool humanReadableName: "GPU Process: WebGL" -@@ -1563,7 +1565,7 @@ UseGPUProcessForWebGLEnabled: +@@ -1575,7 +1577,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 a7a9a06cb94a14616127b6accebeb9fb106c9699..54fc2622b16096695624a24f044f73ca7373aec1 100644 +index 938499ea858b75528c3aada69c22d7892f9377d2..81821ffcf9095e66f002b2441fbfb1382f14f8dd 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h @@ -255,7 +255,7 @@ @@ -2274,10 +2274,10 @@ index 17ef2b99a00c53e854210ad488369ad232944c5e..59a4dfb0b80a6f8d30ec361b2dbde8e5 #if (!defined(HAVE_LOCKDOWN_MODE_PDF_ADDITIONS) && \ diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index 818de728babd72eab591b6c29243a62eb66e5192..ed532edaa08fd4d4f2814b82d358e4c69124da10 100644 +index 3fed02ead342e0beaf5297ea2f1af76d7f64325e..8e02fef515ebecc187c8668cec9ba5c745eec029 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make -@@ -994,6 +994,10 @@ JS_BINDING_IDLS := \ +@@ -995,6 +995,10 @@ JS_BINDING_IDLS := \ $(WebCore)/dom/Slotable.idl \ $(WebCore)/dom/StaticRange.idl \ $(WebCore)/dom/StringCallback.idl \ @@ -2288,7 +2288,7 @@ index 818de728babd72eab591b6c29243a62eb66e5192..ed532edaa08fd4d4f2814b82d358e4c6 $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1542,9 +1546,6 @@ JS_BINDING_IDLS := \ +@@ -1543,9 +1547,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -2329,7 +2329,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 { @@ -2337,7 +2337,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 { @@ -2345,7 +2345,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 { @@ -2353,7 +2353,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 { @@ -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 2326514b9a201dce8dbe41a03fb7fdc4ff3ebc37..ad96db9efce294a9f462a7ef83a2acbf219ae334 100644 +index 53b2ecdecc9274eef5bcd28861965038f9826e73..a9e908d8944b2de4d731ca22324d928a24a07a51 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5589,6 +5589,13 @@ +@@ -5598,6 +5598,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 2326514b9a201dce8dbe41a03fb7fdc4ff3ebc37..ad96db9efce294a9f462a7ef83a2acbf 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, ); }; }; -@@ -18089,6 +18096,14 @@ +@@ -18109,6 +18116,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 2326514b9a201dce8dbe41a03fb7fdc4ff3ebc37..ad96db9efce294a9f462a7ef83a2acbf 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 = ""; }; -@@ -24827,6 +24842,11 @@ +@@ -24854,6 +24869,11 @@ BC4A5324256055590028C592 /* TextDirectionSubmenuInclusionBehavior.h */, 2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */, 2D4F96F21A1ECC240098BF88 /* TextIndicator.h */, @@ -2492,7 +2492,7 @@ index 2326514b9a201dce8dbe41a03fb7fdc4ff3ebc37..ad96db9efce294a9f462a7ef83a2acbf F48570A42644C76D00C05F71 /* TranslationContextMenuInfo.h */, F4E1965F21F26E4E00285078 /* UndoItem.cpp */, 2ECDBAD521D8906300F00ECD /* UndoItem.h */, -@@ -30682,6 +30702,8 @@ +@@ -30709,6 +30729,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2501,7 +2501,7 @@ index 2326514b9a201dce8dbe41a03fb7fdc4ff3ebc37..ad96db9efce294a9f462a7ef83a2acbf 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -33038,6 +33060,7 @@ +@@ -33069,6 +33091,7 @@ AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, @@ -2509,7 +2509,7 @@ index 2326514b9a201dce8dbe41a03fb7fdc4ff3ebc37..ad96db9efce294a9f462a7ef83a2acbf 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, 7CE7FA591EF882300060C9D6 /* DocumentTouch.h */, A8185F3209765765005826D9 /* DocumentType.cpp */, -@@ -37354,6 +37377,8 @@ +@@ -37389,6 +37412,8 @@ 1AD8F81B11CAB9E900E93E54 /* PlatformStrategies.h in Headers */, 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, @@ -2518,7 +2518,7 @@ index 2326514b9a201dce8dbe41a03fb7fdc4ff3ebc37..ad96db9efce294a9f462a7ef83a2acbf CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, -@@ -38502,6 +38527,7 @@ +@@ -38542,6 +38567,7 @@ 0F54DD081881D5F5003EEDBB /* Touch.h in Headers */, 71B7EE0D21B5C6870031C1EF /* TouchAction.h in Headers */, 0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */, @@ -2526,7 +2526,7 @@ index 2326514b9a201dce8dbe41a03fb7fdc4ff3ebc37..ad96db9efce294a9f462a7ef83a2acbf 0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */, 070334D71459FFD5008D8D45 /* TrackBase.h in Headers */, BE88E0C21715CE2600658D98 /* TrackListBase.h in Headers */, -@@ -39447,6 +39473,7 @@ +@@ -39487,6 +39513,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2534,7 +2534,7 @@ index 2326514b9a201dce8dbe41a03fb7fdc4ff3ebc37..ad96db9efce294a9f462a7ef83a2acbf 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */, -@@ -39524,6 +39551,9 @@ +@@ -39564,6 +39591,9 @@ C1692DD223D23ABD006E88F7 /* SystemBattery.mm in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2545,7 +2545,7 @@ index 2326514b9a201dce8dbe41a03fb7fdc4ff3ebc37..ad96db9efce294a9f462a7ef83a2acbf 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp -index b07f94f5ab6ee350110a1d9b9bd93344ea7eb692..167e4bbd7e170be76b71f5d893f1b9f6f02a975d 100644 +index 12f2f786ac833ec6b856b163342c166341cad932..38b335492530db8eec03686e5d2d5b745e1a0c6c 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -61,6 +61,7 @@ @@ -2556,7 +2556,7 @@ index b07f94f5ab6ee350110a1d9b9bd93344ea7eb692..167e4bbd7e170be76b71f5d893f1b9f6 #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3777,9 +3778,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -3758,9 +3759,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (roleValue() == AccessibilityRole::ApplicationDialog) return AccessibilityObjectInclusion::IncludeObject; @@ -2574,7 +2574,7 @@ index b07f94f5ab6ee350110a1d9b9bd93344ea7eb692..167e4bbd7e170be76b71f5d893f1b9f6 { AXComputedObjectAttributeCache* attributeCache = nullptr; diff --git a/Source/WebCore/accessibility/AccessibilityObjectInterface.h b/Source/WebCore/accessibility/AccessibilityObjectInterface.h -index 68eb22fa17f9057d5cc18baee2431f71fe665bcb..98b79d929730993e2ffe773462a6beae3cbc30ee 100644 +index 8aaa2178da795e5586abd0792b43a0671714c34d..51ed0a4b014f32bc90d299656eba206ec1f8ccd3 100644 --- a/Source/WebCore/accessibility/AccessibilityObjectInterface.h +++ b/Source/WebCore/accessibility/AccessibilityObjectInterface.h @@ -57,7 +57,7 @@ typedef const struct __AXTextMarkerRange* AXTextMarkerRangeRef; @@ -2586,7 +2586,7 @@ index 68eb22fa17f9057d5cc18baee2431f71fe665bcb..98b79d929730993e2ffe773462a6beae #endif namespace PAL { -@@ -1559,6 +1559,8 @@ private: +@@ -1516,6 +1516,8 @@ private: COMPtr m_wrapper; #elif USE(ATSPI) RefPtr m_wrapper; @@ -2596,10 +2596,10 @@ index 68eb22fa17f9057d5cc18baee2431f71fe665bcb..98b79d929730993e2ffe773462a6beae virtual void detachPlatformWrapper(AccessibilityDetachmentType) = 0; }; diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -index 66d16a6e4075540d291204fc6e10fdd41aba0d42..e11edda46dca31abbd9498b0eaeca48aabf47669 100644 +index 472716d33f0c0f105b1c81a06fba0e60a4260d76..383837148b8b7a5eb39bba73bb505a0f7b0a0a7c 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -@@ -157,6 +157,8 @@ namespace WebCore { +@@ -158,6 +158,8 @@ namespace WebCore { macro(DecompressionStreamDecoder) \ macro(DecompressionStreamTransform) \ macro(DelayNode) \ @@ -2680,6 +2680,18 @@ index fbcdea3855b8a42ab5f69ba06839b78857abb1f1..a5686a98b117836df7656d4360056be8 static Ref createForDragStartEvent(const Document&); static Ref createForDrop(const Document&, std::unique_ptr&&, OptionSet, bool draggingFiles); static Ref createForUpdatingDropTarget(const Document&, std::unique_ptr&&, OptionSet, bool draggingFiles); +diff --git a/Source/WebCore/dom/DeviceMotionEvent.h b/Source/WebCore/dom/DeviceMotionEvent.h +index 8a3c4fc3c6ed07ecfe53d4c64f4298edc5669ca9..6022cd9eced0b147118d20a4c86e8e6605d00e7d 100644 +--- a/Source/WebCore/dom/DeviceMotionEvent.h ++++ b/Source/WebCore/dom/DeviceMotionEvent.h +@@ -26,6 +26,7 @@ + #pragma once + + #include "DeviceOrientationOrMotionPermissionState.h" ++#include "Document.h" + #include "Event.h" + #include "IDLTypes.h" + diff --git a/Source/WebCore/dom/DeviceMotionEvent.idl b/Source/WebCore/dom/DeviceMotionEvent.idl index ea39a33a6250b4d10b20802f98aa9a5d57e63a7b..300a763508d311fd7b34cb3df3cc93080bb52930 100644 --- a/Source/WebCore/dom/DeviceMotionEvent.idl @@ -3916,7 +3928,7 @@ index c6ebcc9d7e399a35f71350c9374df0f2107c518b..3bfa03ae7f27d9128fe207c1de1bfea9 // InspectorInstrumentation void willRecalculateStyle(); diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp -index a6e415a9bf47e0f4c98b9f375b3195df287fe67b..47811cd1eeaa9f2ef224abfd3962cf1b5b8f107c 100644 +index a6e415a9bf47e0f4c98b9f375b3195df287fe67b..15c5da138b47e518bea8b744d05c2e844b2e893d 100644 --- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp @@ -32,20 +32,28 @@ @@ -4424,7 +4436,7 @@ index a6e415a9bf47e0f4c98b9f375b3195df287fe67b..47811cd1eeaa9f2ef224abfd3962cf1b Protocol::ErrorStringOr InspectorPageAgent::setScreenSizeOverride(std::optional&& width, std::optional&& height) { if (width.has_value() != height.has_value()) -@@ -1127,6 +1360,632 @@ Protocol::ErrorStringOr InspectorPageAgent::setScreenSizeOverride(std::opt +@@ -1127,6 +1360,636 @@ Protocol::ErrorStringOr InspectorPageAgent::setScreenSizeOverride(std::opt m_inspectedPage.mainFrame().setOverrideScreenSize(FloatSize(width.value_or(0), height.value_or(0))); return { }; } @@ -4809,8 +4821,10 @@ index a6e415a9bf47e0f4c98b9f375b3195df287fe67b..47811cd1eeaa9f2ef224abfd3962cf1b + axNode->setMultiline(multiline); + if (axObject->isMultiSelectable()) + axNode->setMultiselectable(axObject->isMultiSelectable()); ++ /* FIXME(dpino): Build error after 253506@main. + if (axObject->supportsReadOnly() && !axObject->canSetValueAttribute() && axObject->isEnabled()) + axNode->setReadonly(true); ++ */ + if (axObject->supportsRequiredAttribute()) + axNode->setRequired(axObject->isRequired()); + if (axObject->isSelected()) @@ -4850,8 +4864,10 @@ index a6e415a9bf47e0f4c98b9f375b3195df287fe67b..47811cd1eeaa9f2ef224abfd3962cf1b + axNode->setValuemin(axObject->minValueForRange()); + if (axObject->maxValueForRange() != 0) + axNode->setValuemax(axObject->maxValueForRange()); ++ /* FIXME(dpino): Build error after 253506@main. + if (axObject->supportsAutoComplete()) + axNode->setAutocomplete(axObject->autoCompleteValue()); ++ */ + if (axObject->hasPopup()) + axNode->setHaspopup(axObject->popupValue()); + @@ -5690,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 1cfb3665021ce207ea3b52ae970373416f466666..ca6977e66fb7a65a50b8be69fe9b154a2b60e3a9 100644 +index 0a4a28511d418ed7d5f5b0125527829ae5d902fc..5b4d54c29ae8937539aab0f4748327370e411875 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -142,6 +142,7 @@ @@ -7011,7 +7027,7 @@ index 44799e0b2a93cbcf25f4315d62a3d95896c02f3d..29277223448a0936a16f975970ab60d7 #endif diff --git a/Source/WebCore/platform/ScrollableArea.h b/Source/WebCore/platform/ScrollableArea.h -index 15e75c74d437b962dfffcafa9c086491064e1f15..2b4b682b087c645cdfd02997658e07a423bb9c2d 100644 +index 59c42302727cdb400f4832d09ad1ece583d84aa5..b44626f26509dd6978495560d087ddb289392bed 100644 --- a/Source/WebCore/platform/ScrollableArea.h +++ b/Source/WebCore/platform/ScrollableArea.h @@ -103,7 +103,7 @@ public: @@ -7243,6 +7259,81 @@ 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 +--- 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 + } + #endif + ++#if !GST_CHECK_VERSION(1, 18, 0) ++GstClockTime gst_element_get_current_clock_time(GstElement * element) ++{ ++ GstClock *clock = NULL; ++ GstClockTime ret; ++ ++ g_return_val_if_fail (GST_IS_ELEMENT (element), GST_CLOCK_TIME_NONE); ++ ++ clock = gst_element_get_clock (element); ++ ++ if (!clock) { ++ GST_DEBUG_OBJECT (element, "Element has no clock"); ++ return GST_CLOCK_TIME_NONE; ++ } ++ ++ ret = gst_clock_get_time (clock); ++ gst_object_unref (clock); ++ ++ return ret; ++} ++ ++GstClockTime webkitGstElementGetCurrentRunningTime(GstElement * element) ++{ ++ GstClockTime base_time, clock_time; ++ ++ g_return_val_if_fail (GST_IS_ELEMENT (element), GST_CLOCK_TIME_NONE); ++ ++ base_time = gst_element_get_base_time (element); ++ ++ if (!GST_CLOCK_TIME_IS_VALID (base_time)) { ++ GST_DEBUG_OBJECT (element, "Could not determine base time"); ++ return GST_CLOCK_TIME_NONE; ++ } ++ ++ clock_time = gst_element_get_current_clock_time (element); ++ ++ if (!GST_CLOCK_TIME_IS_VALID (clock_time)) { ++ return GST_CLOCK_TIME_NONE; ++ } ++ ++ if (clock_time < base_time) { ++ GST_DEBUG_OBJECT (element, "Got negative current running time"); ++ return GST_CLOCK_TIME_NONE; ++ } ++ ++ return clock_time - base_time; ++} ++#endif ++ + #if ENABLE(VIDEO) + bool getVideoSizeAndFormatFromCaps(const GstCaps* caps, WebCore::IntSize& size, GstVideoFormat& format, int& pixelAspectRatioNumerator, int& pixelAspectRatioDenominator, int& stride) + { +diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h +index ddfdee52fffb5e9c9ab68c4503df8b26a4c288e5..fc52dd2034f072fa084584018d45873f4152c5e9 100644 +--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h ++++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h +@@ -60,8 +60,10 @@ inline bool webkitGstCheckVersion(guint major, guint minor, guint micro) + #if !GST_CHECK_VERSION(1, 18, 0) + #define GST_VIDEO_MAX_COMPONENTS 4 + void webkitGstVideoFormatInfoComponent(const GstVideoFormatInfo*, guint, gint components[GST_VIDEO_MAX_COMPONENTS]); ++GstClockTime webkitGstElementGetCurrentRunningTime(GstElement * element); + + #define gst_video_format_info_component webkitGstVideoFormatInfoComponent ++#define gst_element_get_current_running_time webkitGstElementGetCurrentRunningTime + #endif + + #define GST_VIDEO_CAPS_TYPE_PREFIX "video/" diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp index ce40cc903f98688cbd2da28c0f0ed6660ce38b52..808e5e68f6abafc3a200f6c2d7cd12c9f34be473 100644 --- a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp @@ -8366,7 +8457,7 @@ index 1c91f93595ab4362409762530880878e3804c2b8..8848c9d880f341d4a0de089ff0ddc1d0 { GUniquePtr targetCookie(cookie.toSoupCookie()); diff --git a/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp b/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp -index fdde3ee4f109b35c5b6766450a5aa3fd56619199..6d960bee81c15d0415c04616bb7715390a9a83e6 100644 +index e3b1ba835135de598a653c823872ff4f01bec4b9..84ae88e1245572de6770c7aa1345da14af99b8fb 100644 --- a/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp +++ b/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp @@ -39,6 +39,7 @@ @@ -9151,7 +9242,7 @@ diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/ index d8eeb6c27a92134728ffada573a1f140e303c727..9ddddb0796cc00d7eea060b11919711446a39586 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 +@@ -720,7 +720,7 @@ void NetworkSessionCocoa::setClientAuditToken(const WebCore::AuthenticationChall if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { sessionCocoa->setClientAuditToken(challenge); @@ -9336,10 +9427,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 0f5355b305602e855195c8832b5671f91f43f819..8dcae8e77dc5c08b5deca8ed8eadff9f90ae7cd3 100644 +index 1d029fd29c4e3fded98e80dd30f48532ad45b844..d6e9cf9f2259b3d0aaf0ed7f551e8a5db5d02e7c 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake -@@ -489,6 +489,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES +@@ -494,6 +494,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES ${GSTREAMER_PBUTILS_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} ${LIBSOUP_INCLUDE_DIRS} @@ -9349,7 +9440,7 @@ index 0f5355b305602e855195c8832b5671f91f43f819..8dcae8e77dc5c08b5deca8ed8eadff9f ) if (USE_WPE_RENDERER) -@@ -530,6 +533,9 @@ if (USE_LIBWEBRTC) +@@ -535,6 +538,9 @@ if (USE_LIBWEBRTC) list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/libwebrtc/Source/" "${THIRDPARTY_DIR}/libwebrtc/Source/webrtc" @@ -9359,9 +9450,9 @@ index 0f5355b305602e855195c8832b5671f91f43f819..8dcae8e77dc5c08b5deca8ed8eadff9f ) endif () -@@ -544,6 +550,12 @@ if (ENABLE_MEDIA_STREAM) - ) - endif () +@@ -565,6 +571,12 @@ GENERATE_API_HEADERS(WebKit2WebExtension_HEADER_TEMPLATES + "-DUSE(GTK4)=$" + ) +# Playwright begin +list(APPEND WebKit_PRIVATE_INCLUDE_DIRECTORIES @@ -9373,18 +9464,18 @@ index 0f5355b305602e855195c8832b5671f91f43f819..8dcae8e77dc5c08b5deca8ed8eadff9f 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 10230e9bd3d4b5afc507178e35a61a9c84624238..d9d1becc4a0b801c06f25e194cac662f96b47576 100644 +index 8375a0623af77204b3fa5d2fd68af3658164c4c7..6e5d6a9dfe7da8b0f4b7acb65acb4c3849968d87 100644 --- a/Source/WebKit/PlatformWPE.cmake +++ b/Source/WebKit/PlatformWPE.cmake -@@ -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 +@@ -226,6 +226,7 @@ set(WPE_API_INSTALLED_HEADERS + ${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.h + ${DERIVED_SOURCES_WPE_API_DIR}/WebKitVersion.h + ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitColor.h + ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPointerLockPermissionRequest.h - ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitPolicyDecision.h ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitRectangle.h - ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitResponsePolicyDecision.h -@@ -326,6 +327,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES + ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebViewBackend.h + ${WEBKIT_DIR}/UIProcess/API/wpe/webkit.h +@@ -349,6 +350,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES "${WEBKIT_DIR}/UIProcess/Inspector/glib" "${WEBKIT_DIR}/UIProcess/Notifications/glib/" "${WEBKIT_DIR}/UIProcess/geoclue" @@ -9392,7 +9483,7 @@ index 10230e9bd3d4b5afc507178e35a61a9c84624238..d9d1becc4a0b801c06f25e194cac662f "${WEBKIT_DIR}/UIProcess/gstreamer" "${WEBKIT_DIR}/UIProcess/linux" "${WEBKIT_DIR}/UIProcess/soup" -@@ -347,8 +349,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES +@@ -370,8 +372,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES ${GIO_UNIX_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} ${LIBSOUP_INCLUDE_DIRS} @@ -9607,10 +9698,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 d8d0a639b6578d384f483ef636d3e16c51fe98fe..9cffd80bfdb19d6b131a393cc56755efb325599c 100644 +index 736417923a0bdf499836bb2622fb97f1ba34e78a..a7b8293ef3b85e765f0f5b6323d2dd08ae489251 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -@@ -124,6 +124,10 @@ +@@ -125,6 +125,10 @@ #include #endif @@ -9621,7 +9712,7 @@ index d8d0a639b6578d384f483ef636d3e16c51fe98fe..9cffd80bfdb19d6b131a393cc56755ef // FIXME: Seems like we could use std::tuple to cut down the code below a lot! namespace IPC { -@@ -1298,6 +1302,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature +@@ -1299,6 +1303,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature encoder << windowFeatures.resizable; encoder << windowFeatures.fullscreen; encoder << windowFeatures.dialog; @@ -9631,7 +9722,7 @@ index d8d0a639b6578d384f483ef636d3e16c51fe98fe..9cffd80bfdb19d6b131a393cc56755ef } bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& windowFeatures) -@@ -1326,6 +1333,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win +@@ -1327,6 +1334,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win return false; if (!decoder.decode(windowFeatures.dialog)) return false; @@ -9644,7 +9735,7 @@ index d8d0a639b6578d384f483ef636d3e16c51fe98fe..9cffd80bfdb19d6b131a393cc56755ef return true; } -@@ -1339,6 +1352,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) +@@ -1340,6 +1353,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) #if PLATFORM(COCOA) encoder << dragData.pasteboardName(); encoder << dragData.fileNames(); @@ -9656,7 +9747,7 @@ index d8d0a639b6578d384f483ef636d3e16c51fe98fe..9cffd80bfdb19d6b131a393cc56755ef #endif encoder << dragData.dragDestinationActionMask(); encoder << dragData.pageID(); -@@ -1362,9 +1380,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1363,9 +1381,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(applicationFlags)) return false; @@ -9674,7 +9765,7 @@ index d8d0a639b6578d384f483ef636d3e16c51fe98fe..9cffd80bfdb19d6b131a393cc56755ef if (!decoder.decode(pasteboardName)) return false; -@@ -1380,8 +1405,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1381,8 +1406,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(pageID)) return false; @@ -10168,10 +10259,10 @@ index 90df093a49c09dc670dfea55077c77d889dd1c1b..6ffd51532e29b941b8dc10f545b7f5b8 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index 69195152333b0deb19654ea685ef86b313bbb192..d7521c5e0fa48a7bc9facad0895f7debebc674ad 100644 +index b2ac77880db8d99cec811f1127a201c6f7fb7c52..ff0b26a6ffb398d634964ea2b6e312c89b86432d 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -399,11 +399,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -374,11 +374,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -10186,7 +10277,7 @@ index 69195152333b0deb19654ea685ef86b313bbb192..d7521c5e0fa48a7bc9facad0895f7deb UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -413,6 +416,7 @@ UIProcess/PageLoadState.cpp +@@ -388,6 +391,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -10194,7 +10285,7 @@ index 69195152333b0deb19654ea685ef86b313bbb192..d7521c5e0fa48a7bc9facad0895f7deb UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -454,6 +458,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -429,6 +433,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -10203,7 +10294,7 @@ index 69195152333b0deb19654ea685ef86b313bbb192..d7521c5e0fa48a7bc9facad0895f7deb UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPermissionControllerProxy.cpp -@@ -580,7 +586,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -555,7 +561,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -10216,10 +10307,10 @@ index 69195152333b0deb19654ea685ef86b313bbb192..d7521c5e0fa48a7bc9facad0895f7deb UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 0338af0551b2f3d22f27367161abe5a8806b7444..aa36dc1b2f5f272c301fc8c48b8917d3548ec8db 100644 +index 5296abc26c97d11aa67843ca25b38681ceeac602..6f8712fee94d2d56f5e52c119f69d8a488f8bbd6 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -283,6 +283,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm +@@ -262,6 +262,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -10227,7 +10318,7 @@ index 0338af0551b2f3d22f27367161abe5a8806b7444..aa36dc1b2f5f272c301fc8c48b8917d3 UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -459,6 +460,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -438,6 +439,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -10568,7 +10659,7 @@ index 67c2480832991ff512fd49b0195cc195e85794e2..619c8a85bd1bdb14a593f15fa02ae90b #import #import #import -@@ -234,6 +235,11 @@ - (void)removeDataOfTypes:(NSSet *)dataTypes modifiedSince:(NSDate *)date comple +@@ -234,6 +235,11 @@ static WallTime toSystemClockTime(NSDate *date) }); } @@ -10747,7 +10838,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(); } @@ -16742,7 +16833,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 5126e406c4ada8c0d21bf8e101470d4485823751..d856b6670c907afb9a589d642395c3da4dd3e231 100644 +index cbb1f2333982a4816e2ae5745e6a44c2ef2b1dfc..921baa7d749af67094f13b2400c887f98028a23a 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -246,6 +246,9 @@ @@ -17261,7 +17352,7 @@ index 5126e406c4ada8c0d21bf8e101470d4485823751..d856b6670c907afb9a589d642395c3da // 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 2306e725f2b79c2239dc24c065d8093c7b08cbf0..1493ffc54271945dc6d8a534e74f528e2580a805 100644 +index 4998e6d8ee4b6610d89348d1e75e0d65c92e18a8..5370d17a063214bb76a98acf06653b3c3d38c970 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17383,7 +17474,7 @@ index 2306e725f2b79c2239dc24c065d8093c7b08cbf0..1493ffc54271945dc6d8a534e74f528e #endif #if ENABLE(WEB_CRYPTO) -@@ -2765,6 +2794,7 @@ private: +@@ -2767,6 +2796,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17391,7 +17482,7 @@ index 2306e725f2b79c2239dc24c065d8093c7b08cbf0..1493ffc54271945dc6d8a534e74f528e #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -3039,6 +3069,20 @@ private: +@@ -3041,6 +3071,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17412,7 +17503,7 @@ index 2306e725f2b79c2239dc24c065d8093c7b08cbf0..1493ffc54271945dc6d8a534e74f528e #endif PageLoadState m_pageLoadState; -@@ -3253,6 +3297,9 @@ private: +@@ -3255,6 +3299,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17579,10 +17670,10 @@ index 85de56c9a40c1389c10d6cad3d5dd5953d969b9f..5736d72bf2c2e064567b9df041095fa5 WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index d67e914edbe266f9319b52808fe3808e4e149a6a..5afb63e331f2d0514e95261fb66a0609e8166cb5 100644 +index 71ca21d2b7acf40c785af5755bfc1e7c13d5752c..fe3a0e9fac65f8a1197db74fb7d885f15acf1a86 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -1970,6 +1970,12 @@ void WebsiteDataStore::originDirectoryForTesting(URL&& origin, URL&& topOrigin, +@@ -1972,6 +1972,12 @@ void WebsiteDataStore::originDirectoryForTesting(URL&& origin, URL&& topOrigin, networkProcess().websiteDataOriginDirectoryForTesting(m_sessionID, WTFMove(origin), WTFMove(topOrigin), type, WTFMove(completionHandler)); } @@ -18675,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 c887bf039915f555679279b05b25c8340b52fb82..b825b7177f20d9bed1d2a13c3700b7995c95c499 100644 +index 2291f987a7ebf6702d55ed69b3efee1f94a9ddfa..d4a81ba2b7cdf698c7f60eeec3395c7242f763ed 100644 --- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm +++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm @@ -465,6 +465,12 @@ void WebContextMenuProxyMac::getShareMenuItem(CompletionHandler(loadParameters.shouldTreatAsContinuingLoad), loadParameters.request.isAppInitiated(), valueOrDefault(loadParameters.existingNetworkResourceLoadIdentifierToResume).toUInt64()); -@@ -1995,17 +2014,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1997,17 +2016,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -20628,7 +20719,7 @@ index 139f4f64cc322fe5b1be6700aaf71b065ac23048..595d715ed23d2c23966b56fc60a98dba // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -2022,20 +2037,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -2024,20 +2039,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -20656,7 +20747,7 @@ index 139f4f64cc322fe5b1be6700aaf71b065ac23048..595d715ed23d2c23966b56fc60a98dba #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -2043,7 +2056,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -2045,7 +2058,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -20664,7 +20755,7 @@ index 139f4f64cc322fe5b1be6700aaf71b065ac23048..595d715ed23d2c23966b56fc60a98dba void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2328,6 +2340,7 @@ void WebPage::scaleView(double scale) +@@ -2330,6 +2342,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -20672,7 +20763,7 @@ index 139f4f64cc322fe5b1be6700aaf71b065ac23048..595d715ed23d2c23966b56fc60a98dba scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2507,17 +2520,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2509,17 +2522,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -20691,7 +20782,7 @@ index 139f4f64cc322fe5b1be6700aaf71b065ac23048..595d715ed23d2c23966b56fc60a98dba } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3406,6 +3415,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3408,6 +3417,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -20796,7 +20887,7 @@ index 139f4f64cc322fe5b1be6700aaf71b065ac23048..595d715ed23d2c23966b56fc60a98dba #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3482,6 +3589,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3484,6 +3591,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -20808,7 +20899,7 @@ index 139f4f64cc322fe5b1be6700aaf71b065ac23048..595d715ed23d2c23966b56fc60a98dba void WebPage::insertNewlineInQuotedContent() { Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame(); -@@ -3722,6 +3834,7 @@ void WebPage::didCompletePageTransition() +@@ -3724,6 +3836,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -20816,7 +20907,7 @@ index 139f4f64cc322fe5b1be6700aaf71b065ac23048..595d715ed23d2c23966b56fc60a98dba } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4606,7 +4719,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4611,7 +4724,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -20825,7 +20916,7 @@ index 139f4f64cc322fe5b1be6700aaf71b065ac23048..595d715ed23d2c23966b56fc60a98dba void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -7028,6 +7141,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -7033,6 +7146,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -20836,7 +20927,7 @@ index 139f4f64cc322fe5b1be6700aaf71b065ac23048..595d715ed23d2c23966b56fc60a98dba return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index f99d75d3a5c8ff0d48600154ee420a6a38e391bc..bb4923536647f3736e4b8467379b2d3a05affb22 100644 +index efb6d1c6316dcafbc61ed911345ac1bf9316cbb5..e634d7812650517e44fbd481ec96f6cd62c73b18 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -118,6 +118,10 @@ @@ -20882,7 +20973,7 @@ index f99d75d3a5c8ff0d48600154ee420a6a38e391bc..bb4923536647f3736e4b8467379b2d3a void insertNewlineInQuotedContent(); -@@ -1667,6 +1675,7 @@ private: +@@ -1669,6 +1677,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -20890,7 +20981,7 @@ index f99d75d3a5c8ff0d48600154ee420a6a38e391bc..bb4923536647f3736e4b8467379b2d3a void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1704,6 +1713,7 @@ private: +@@ -1706,6 +1715,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -20898,7 +20989,7 @@ index f99d75d3a5c8ff0d48600154ee420a6a38e391bc..bb4923536647f3736e4b8467379b2d3a #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1849,9 +1859,7 @@ private: +@@ -1851,9 +1861,7 @@ private: void addLayerForFindOverlay(CompletionHandler&&); void removeLayerForFindOverlay(CompletionHandler&&); @@ -20908,7 +20999,7 @@ index f99d75d3a5c8ff0d48600154ee420a6a38e391bc..bb4923536647f3736e4b8467379b2d3a void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2392,6 +2400,7 @@ private: +@@ -2394,6 +2402,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -20917,7 +21008,7 @@ index f99d75d3a5c8ff0d48600154ee420a6a38e391bc..bb4923536647f3736e4b8467379b2d3a bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 1bbd26289b3c2fdf685e8653e677fe0e4fa70d65..72d5223f2b4df97bbb52a7785832d130e4c525aa 100644 +index 243231cce1bb7068445c8ac18e440f992cca23d6..da81a297660bc2cded1429c2d98a90f37117a1bc 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 @@ -21097,10 +21188,10 @@ index 8987c3964a9308f2454759de7f8972215a3ae416..bcac0afeb94ed8123d1f9fb0b932c849 SetProcessDPIAware(); return true; diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -index 78a6e84a1dc04f81b5c266f08ce25f13311d78f2..3136508a043a1b1fd9f7415c551d865710850aa0 100644 +index ef4dbe919eed91caaea49292fa3926b7ec2be0e6..5332a0ad8cbe859c905f5a5995fa8c95617cea45 100644 --- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -@@ -4208,7 +4208,7 @@ - (void)mouseDown:(WebEvent *)event +@@ -4200,7 +4200,7 @@ static BOOL currentScrollIsBlit(NSView *clipView) _private->handlingMouseDownEvent = NO; } @@ -21113,7 +21204,7 @@ diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/ma index 48cc5be9887a698f2bae9261598c08b55705cff8..55904a59760c3a1f987e07db8f5d40d5efa66368 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm -@@ -4035,7 +4035,7 @@ + (void)_doNotStartObservingNetworkReachability +@@ -4035,7 +4035,7 @@ IGNORE_WARNINGS_END } #endif // PLATFORM(IOS_FAMILY) @@ -21122,7 +21213,7 @@ index 48cc5be9887a698f2bae9261598c08b55705cff8..55904a59760c3a1f987e07db8f5d40d5 - (NSArray *)_touchEventRegions { -@@ -4077,7 +4077,7 @@ - (NSArray *)_touchEventRegions +@@ -4077,7 +4077,7 @@ IGNORE_WARNINGS_END }).autorelease(); } @@ -21163,7 +21254,7 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index c534ddeb37b0b2c0b1eb5953078424f2495f2720..c6f9db5b98df828e9ed61f5aa120db4f7ae6f11f 100644 +index 6279a0d3435db9ac91f7705be3f8d40a6b3187a1..a77f548e0c421607f7c20cddfb7c9fe24e3655ac 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 @@ -21180,7 +21271,7 @@ index c534ddeb37b0b2c0b1eb5953078424f2495f2720..c6f9db5b98df828e9ed61f5aa120db4f find_package(Cairo 1.14.0 REQUIRED) find_package(Fontconfig 2.8.0 REQUIRED) find_package(Freetype 2.4.2 REQUIRED) -@@ -32,6 +37,10 @@ find_package(EGL) +@@ -33,6 +38,10 @@ find_package(EGL) find_package(OpenGL) find_package(OpenGLES2) @@ -21191,7 +21282,7 @@ index c534ddeb37b0b2c0b1eb5953078424f2495f2720..c6f9db5b98df828e9ed61f5aa120db4f include(GStreamerDefinitions) SET_AND_EXPOSE_TO_BUILD(USE_CAIRO TRUE) -@@ -65,15 +74,15 @@ WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGET "Whether to enable support for the Qua +@@ -66,15 +75,15 @@ WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGET "Whether to enable support for the Qua WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC ON) WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ON) WEBKIT_OPTION_DEFINE(USE_ANGLE_WEBGL "Whether to use ANGLE as WebGL backend." PUBLIC OFF) @@ -21210,7 +21301,7 @@ index c534ddeb37b0b2c0b1eb5953078424f2495f2720..c6f9db5b98df828e9ed61f5aa120db4f WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON) WEBKIT_OPTION_DEFINE(USE_WPE_RENDERER "Whether to enable WPE rendering" PUBLIC ON) -@@ -123,9 +132,9 @@ endif () +@@ -124,9 +133,9 @@ endif () # without approval from a GTK reviewer. There must be strong reason to support # changing the value of the option. WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON) @@ -21222,7 +21313,7 @@ index c534ddeb37b0b2c0b1eb5953078424f2495f2720..c6f9db5b98df828e9ed61f5aa120db4f WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PUBLIC ON) -@@ -157,10 +166,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}) @@ -21235,7 +21326,7 @@ index c534ddeb37b0b2c0b1eb5953078424f2495f2720..c6f9db5b98df828e9ed61f5aa120db4f 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_MEDIA_CONTROLS_CONTEXT_MENUS PRIVATE ON) -@@ -170,7 +179,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION P +@@ -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}) @@ -21244,7 +21335,7 @@ index c534ddeb37b0b2c0b1eb5953078424f2495f2720..c6f9db5b98df828e9ed61f5aa120db4f 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) -@@ -179,6 +188,15 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_API_STATISTICS PRIVATE ON) +@@ -180,6 +189,15 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_API_STATISTICS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE ON) @@ -21260,7 +21351,7 @@ index c534ddeb37b0b2c0b1eb5953078424f2495f2720..c6f9db5b98df828e9ed61f5aa120db4f include(GStreamerDependencies) # Finalize the value for all options. Do not attempt to use an option before -@@ -277,6 +295,7 @@ if (NOT EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py") +@@ -278,6 +296,7 @@ if (NOT EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py") endif () SET_AND_EXPOSE_TO_BUILD(USE_ATSPI ${ENABLE_ACCESSIBILITY}) @@ -21269,7 +21360,7 @@ index c534ddeb37b0b2c0b1eb5953078424f2495f2720..c6f9db5b98df828e9ed61f5aa120db4f SET_AND_EXPOSE_TO_BUILD(HAVE_OS_DARK_MODE_SUPPORT 1) diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake -index 4dab99ed75adee82a1e470be270f152c4aa75bff..52e057d322b012e7f90262910d886c38ae55336a 100644 +index 82831d950b260f8bb92828ceae8b3b30cc697fe8..1d0966ea7f6300164317c32c9872678d0a83c1b5 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 @@ -21286,7 +21377,7 @@ index 4dab99ed75adee82a1e470be270f152c4aa75bff..52e057d322b012e7f90262910d886c38 find_package(Cairo 1.14.0 REQUIRED) find_package(Fontconfig 2.8.0 REQUIRED) find_package(Freetype 2.4.2 REQUIRED) -@@ -41,7 +46,7 @@ include(GStreamerDefinitions) +@@ -42,7 +47,7 @@ include(GStreamerDefinitions) # changing the value of the option. WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21295,7 +21386,7 @@ index 4dab99ed75adee82a1e470be270f152c4aa75bff..52e057d322b012e7f90262910d886c38 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT PUBLIC ON) -@@ -63,10 +68,10 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE +@@ -64,10 +69,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) @@ -21308,7 +21399,7 @@ index 4dab99ed75adee82a1e470be270f152c4aa75bff..52e057d322b012e7f90262910d886c38 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) -@@ -77,25 +82,43 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS_IN_WORKERS PRIVATE ${EN +@@ -78,25 +83,43 @@ 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) @@ -21410,7 +21501,7 @@ index 00ac7921bf6903d047585063cc374231397f236b..038ddb5f9adeda2f950e4631f4390fc9 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) else () diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake -index 62b4bc6e91b180abe8ca0f749ce76bf1aba98d4d..23216d79747d514c53e965618d5bf7ade8beb659 100644 +index bdf462125f056ecb241f79dbb0ff79dbefa40291..9844ea22e138c715b8142cd1771f99131b1155c3 100644 --- a/Source/cmake/OptionsWinCairo.cmake +++ b/Source/cmake/OptionsWinCairo.cmake @@ -37,20 +37,42 @@ if (OpenJPEG_FOUND) @@ -21459,9 +21550,9 @@ index 62b4bc6e91b180abe8ca0f749ce76bf1aba98d4d..23216d79747d514c53e965618d5bf7ad SET_AND_EXPOSE_TO_BUILD(USE_CURL ON) SET_AND_EXPOSE_TO_BUILD(USE_GRAPHICS_LAYER_TEXTURE_MAPPER ON) SET_AND_EXPOSE_TO_BUILD(USE_GRAPHICS_LAYER_WC ON) -@@ -67,11 +89,7 @@ SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE}) - - SET_AND_EXPOSE_TO_BUILD(HAVE_OS_DARK_MODE_SUPPORT 1) +@@ -74,11 +96,7 @@ set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}") + WEBKIT_CHECK_HAVE_SYMBOL(USE_BORINGSSL OPENSSL_IS_BORINGSSL openssl/ssl.h) + cmake_pop_check_state() -# CoreFoundation is required when building WebKitLegacy -if (ENABLE_WEBKIT_LEGACY) @@ -22099,10 +22190,10 @@ index b0a503013185f29feeca47e4313b27e349973c02..ee1f87780a99b2b626b1ada984d63109 + } // namespace WTR diff --git a/Tools/glib/dependencies/apt b/Tools/glib/dependencies/apt -index c3898e86e8c3e018400dd11b0722bfa01b6cb561..7f9221377839579a9c6bf57a84c7cb164691a1f4 100644 +index 8635ebd88f92175c6cec4781ae3934193afec484..552dbf544180132ee7a72e364bf52582ac6884fa 100644 --- a/Tools/glib/dependencies/apt +++ b/Tools/glib/dependencies/apt -@@ -1,17 +1,17 @@ +@@ -1,11 +1,11 @@ #!/usr/bin/env bash -# If the package $1 is available, prints it. Otherwise prints $2. @@ -22116,16 +22207,9 @@ index c3898e86e8c3e018400dd11b0722bfa01b6cb561..7f9221377839579a9c6bf57a84c7cb16 echo $2 fi } - - aptIfExists() { -- local ret=$(apt show "$1" 2>/dev/null) -+ ret=$(apt show "$1" 2>/dev/null) - if [[ $? -ne 0 ]]; then - return - fi -@@ -57,9 +57,11 @@ PACKAGES=( - libwebp-dev - libwoff-dev +@@ -66,9 +66,11 @@ PACKAGES=( + $(aptIfExists libwpe-1.0-dev) + $(aptIfExists libwpebackend-fdo-1.0-dev) libxml2-utils + libxcb-glx0-dev libxslt1-dev @@ -22136,14 +22220,13 @@ index c3898e86e8c3e018400dd11b0722bfa01b6cb561..7f9221377839579a9c6bf57a84c7cb16 # These are dependencies necessary for running tests. diff --git a/Tools/gtk/dependencies/apt b/Tools/gtk/dependencies/apt -index 8edc8d8119c729959fec7e4ddf762e2aeeb5f1f0..5c93e4c8f3ef2c8978f4e9b9290e713fe2e68797 100644 +index 04cfec1eca7818035ca2de7dd4f2efcc9434741f..9435d01ef9ad3eaec226ed6abbd6151214f132f9 100644 --- a/Tools/gtk/dependencies/apt +++ b/Tools/gtk/dependencies/apt -@@ -34,7 +34,7 @@ PACKAGES+=( - libxtst-dev +@@ -35,6 +35,7 @@ PACKAGES+=( nasm + unifdef xfonts-utils -- $(aptIfExists libenchant-dev) + $(aptIfElse libenchant-dev libenchant-2-dev) # These are dependencies necessary for running tests.