From 43af0f02dd27c0b806680ec2a5b94ebf8105d684 Mon Sep 17 00:00:00 2001 From: Diego Pino Date: Thu, 28 Oct 2021 22:41:34 +0800 Subject: [PATCH] browser(webkit): roll to 10/28/21 (#9839) --- browser_patches/webkit/BUILD_NUMBER | 4 +- browser_patches/webkit/UPSTREAM_CONFIG.sh | 2 +- browser_patches/webkit/patches/bootstrap.diff | 415 +++++++++--------- 3 files changed, 212 insertions(+), 209 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 254fbaf2d5..ab916d26bb 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1566 -Changed: yurys@chromium.org Wed 27 Oct 2021 09:04:43 AM PDT +1567 +Changed: dpino@igalia.com Thu Oct 28 22:24:42 HKT 2021 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 90126d15b4..aa46690f00 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="e01d5946aff61513a22e9ffe9efa3bf8051bce28" +BASE_REVISION="a0ed1f83d00448c17e651ca331847a0a6808353d" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index e090db5868..2d5a321079 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 8b9182ced101951a8d005b06b7e17c1961ada076..e5ab9784176273b80b7e28bb1bdac12ca7a5c5dc 100644 +index e77083a4648e05fb3b254062425c0f428ce5e822..43015ba90c4e9a71782ea6c29d77bbba33c0261d 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1346,22 +1346,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1350,22 +1350,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json @@ -1968,20 +1968,20 @@ index dd884b22250114627213c4827ca176c283ec2525..9927a937145f23d05e907083a01748dd PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/libwebrtc; USE_HEADERMAP = NO; diff --git a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj -index d8677555342ee0168223a0bc3ef54603b1a23460..b9ee7198a702cbc0241de3a33b65a6940ad48bc6 100644 +index bf829f638933f828e80ba79d853003f2203ab948..268ca471d935f8075302a485bd698e69bb8eb2e2 100644 --- a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj +++ b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj -@@ -3856,6 +3856,9 @@ - CDFD2FCC24C4DAF70048DAC3 /* reader.h in Copy webm headers */ = {isa = PBXBuildFile; fileRef = CDEBB40524C0191A00ADBD44 /* reader.h */; }; - CDFD2FCD24C4DAF70048DAC3 /* status.h in Copy webm headers */ = {isa = PBXBuildFile; fileRef = CDEBB40624C0191A00ADBD44 /* status.h */; }; - CDFD2FCE24C4DAF70048DAC3 /* webm_parser.h in Copy webm headers */ = {isa = PBXBuildFile; fileRef = CDEBB40824C0191A00ADBD44 /* webm_parser.h */; }; +@@ -3853,6 +3853,9 @@ + CDFD2FCC24C4DAF70048DAC3 /* reader.h in Headers */ = {isa = PBXBuildFile; fileRef = CDEBB40524C0191A00ADBD44 /* reader.h */; settings = {ATTRIBUTES = (Public, ); }; }; + CDFD2FCD24C4DAF70048DAC3 /* status.h in Headers */ = {isa = PBXBuildFile; fileRef = CDEBB40624C0191A00ADBD44 /* status.h */; settings = {ATTRIBUTES = (Public, ); }; }; + CDFD2FCE24C4DAF70048DAC3 /* webm_parser.h in Headers */ = {isa = PBXBuildFile; fileRef = CDEBB40824C0191A00ADBD44 /* webm_parser.h */; settings = {ATTRIBUTES = (Public, ); }; }; + F3B7819924C7CC5200FCB122 /* mkvmuxerutil.cc in Sources */ = {isa = PBXBuildFile; fileRef = F3B7819624C7CC5100FCB122 /* mkvmuxerutil.cc */; }; + F3B7819A24C7CC5200FCB122 /* mkvmuxer.cc in Sources */ = {isa = PBXBuildFile; fileRef = F3B7819724C7CC5200FCB122 /* mkvmuxer.cc */; }; + F3B7819B24C7CC5200FCB122 /* mkvwriter.cc in Sources */ = {isa = PBXBuildFile; fileRef = F3B7819824C7CC5200FCB122 /* mkvwriter.cc */; }; /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ -@@ -8318,6 +8321,9 @@ +@@ -8272,6 +8275,9 @@ CDEBB49D24C0191A00ADBD44 /* master_parser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = master_parser.h; sourceTree = ""; }; CDFD2F9624C4B2F90048DAC3 /* vp9_header_parser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = vp9_header_parser.h; sourceTree = ""; }; CDFD2F9A24C4B2F90048DAC3 /* vp9_header_parser.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = vp9_header_parser.cc; sourceTree = ""; }; @@ -1991,7 +1991,7 @@ index d8677555342ee0168223a0bc3ef54603b1a23460..b9ee7198a702cbc0241de3a33b65a694 FB39D0D11200F0E300088E69 /* libwebrtc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libwebrtc.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ -@@ -15298,6 +15304,7 @@ +@@ -15233,6 +15239,7 @@ isa = PBXGroup; children = ( CDFD2F9224C4B2F90048DAC3 /* common */, @@ -1999,7 +1999,7 @@ index d8677555342ee0168223a0bc3ef54603b1a23460..b9ee7198a702cbc0241de3a33b65a694 CDEBB19224C0191800ADBD44 /* webm_parser */, ); path = libwebm; -@@ -15432,6 +15439,16 @@ +@@ -15367,6 +15374,16 @@ path = common; sourceTree = ""; }; @@ -2016,7 +2016,7 @@ index d8677555342ee0168223a0bc3ef54603b1a23460..b9ee7198a702cbc0241de3a33b65a694 FB39D06E1200ED9200088E69 = { isa = PBXGroup; children = ( -@@ -17491,7 +17508,7 @@ +@@ -17431,7 +17448,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -2025,7 +2025,7 @@ index d8677555342ee0168223a0bc3ef54603b1a23460..b9ee7198a702cbc0241de3a33b65a694 }; 5CD286461E6E154E0094FDC8 /* Check for Weak VTables and Externals */ = { isa = PBXShellScriptBuildPhase; -@@ -18634,6 +18651,7 @@ +@@ -18574,6 +18591,7 @@ 419C82F51FE20EB50040C30F /* audio_encoder_opus.cc in Sources */, 419C82F31FE20EB50040C30F /* audio_encoder_opus_config.cc in Sources */, 4140B8201E4E3383007409E6 /* audio_encoder_pcm.cc in Sources */, @@ -2033,7 +2033,7 @@ index d8677555342ee0168223a0bc3ef54603b1a23460..b9ee7198a702cbc0241de3a33b65a694 5CDD8FFE1E43CE3A00621E92 /* audio_encoder_pcm16b.cc in Sources */, 5CD285461E6A61D20094FDC8 /* audio_format.cc in Sources */, 41DDB26F212679D200296D47 /* audio_format_to_string.cc in Sources */, -@@ -19071,6 +19089,7 @@ +@@ -19011,6 +19029,7 @@ 417953DB216983910028266B /* metrics.cc in Sources */, 5CDD865E1E43B8B500621E92 /* min_max_operations.c in Sources */, 4189395B242A71F5007FDC41 /* min_video_bitrate_experiment.cc in Sources */, @@ -2041,7 +2041,7 @@ index d8677555342ee0168223a0bc3ef54603b1a23460..b9ee7198a702cbc0241de3a33b65a694 4131C387234B957D0028A615 /* moving_average.cc in Sources */, 41FCBB1521B1F7AA00A5DF27 /* moving_average.cc in Sources */, 5CD286101E6A64C90094FDC8 /* moving_max.cc in Sources */, -@@ -19303,6 +19322,7 @@ +@@ -19243,6 +19262,7 @@ 4131C53B234C8B190028A615 /* rtc_event_rtp_packet_outgoing.cc in Sources */, 4131C552234C8B190028A615 /* rtc_event_video_receive_stream_config.cc in Sources */, 4131C554234C8B190028A615 /* rtc_event_video_send_stream_config.cc in Sources */, @@ -2050,7 +2050,7 @@ index d8677555342ee0168223a0bc3ef54603b1a23460..b9ee7198a702cbc0241de3a33b65a694 41323A1D2665288B00B38623 /* packet_sequencer.cc in Sources */, 4131BF2D234B88200028A615 /* rtc_stats_collector.cc in Sources */, diff --git a/Source/WTF/Scripts/Preferences/WebPreferences.yaml b/Source/WTF/Scripts/Preferences/WebPreferences.yaml -index b929c9d72addb6500e98e1b0ad535bd018c547cc..8141987b4c4100f00a5db487c6ce83f7035d288c 100644 +index 6d7d92a46012278c77a624e3cda462008d9bb123..353103e6e7500e237e185451cff227b60ac02fa2 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferences.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferences.yaml @@ -1031,7 +1031,7 @@ InspectorStartsAttached: @@ -2081,10 +2081,10 @@ index b929c9d72addb6500e98e1b0ad535bd018c547cc..8141987b4c4100f00a5db487c6ce83f7 type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index 2c176ae23d5aae49471a340c7b2dc456c9142165..65c454e382400a1849c4633558fd4f06ffc6e8f3 100644 +index 848da780c8b2c71e50542a66afddf5973a279c6c..642e715265971685257fffefc288ca97203cc981 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -@@ -429,7 +429,7 @@ CrossOriginOpenerPolicyEnabled: +@@ -432,7 +432,7 @@ CrossOriginOpenerPolicyEnabled: WebKitLegacy: default: false WebKit: @@ -2093,7 +2093,7 @@ index 2c176ae23d5aae49471a340c7b2dc456c9142165..65c454e382400a1849c4633558fd4f06 WebCore: default: false -@@ -810,9 +810,9 @@ MaskWebGLStringsEnabled: +@@ -813,9 +813,9 @@ MaskWebGLStringsEnabled: WebKitLegacy: default: true WebKit: @@ -2105,7 +2105,7 @@ index 2c176ae23d5aae49471a340c7b2dc456c9142165..65c454e382400a1849c4633558fd4f06 # FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well. MediaCapabilitiesExtensionsEnabled: -@@ -1236,7 +1236,7 @@ SpeechRecognitionEnabled: +@@ -1239,7 +1239,7 @@ SpeechRecognitionEnabled: WebKitLegacy: default: false WebKit: @@ -2284,7 +2284,7 @@ index d1db2221b26a6ecf7d8bb8c900985e9a17763905..186d426c86d993656d86300e1c81adde #endif diff --git a/Source/WTF/wtf/PlatformGTK.cmake b/Source/WTF/wtf/PlatformGTK.cmake -index d609129ef1b2899b27a3a43f5271ea360925efec..a11f9a2b4893b743b73060bfbea6cb5321fbbf8a 100644 +index 3901bfb0f5479064f4e7b67c90621ff26d74b580..5b3615a871d0d7123822394c94d5ce1005e80394 100644 --- a/Source/WTF/wtf/PlatformGTK.cmake +++ b/Source/WTF/wtf/PlatformGTK.cmake @@ -77,6 +77,7 @@ list(APPEND WTF_LIBRARIES @@ -2294,9 +2294,9 @@ index d609129ef1b2899b27a3a43f5271ea360925efec..a11f9a2b4893b743b73060bfbea6cb53 + stdc++fs ) - if (Systemd_FOUND) + if (Journald_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index cd073c4968285efa079a0d4ea12e88510bf3adc2..111d01c5786119a5981da5d00bcf3a80b42b1a1e 100644 +index 123f583962dfa60c7bea06b86ea320d2f3c59af5..c29f608804079359d8ca8791e5865bddc5b3eb29 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -384,7 +384,7 @@ @@ -2309,7 +2309,7 @@ index cd073c4968285efa079a0d4ea12e88510bf3adc2..111d01c5786119a5981da5d00bcf3a80 #endif diff --git a/Source/WTF/wtf/PlatformWPE.cmake b/Source/WTF/wtf/PlatformWPE.cmake -index 3b47997e5cf9cc4b04e01e1f69d0eb1185789636..0e89ea259b77cd3737b4848ff776d217019e0097 100644 +index f8bedf1af5d20d9c93a96af565e416bfb0df6faa..a072e5e130822d3658cbab453aef8d160a0a73de 100644 --- a/Source/WTF/wtf/PlatformWPE.cmake +++ b/Source/WTF/wtf/PlatformWPE.cmake @@ -50,6 +50,7 @@ list(APPEND WTF_LIBRARIES @@ -2319,7 +2319,7 @@ index 3b47997e5cf9cc4b04e01e1f69d0eb1185789636..0e89ea259b77cd3737b4848ff776d217 + stdc++fs ) - if (Systemd_FOUND) + if (Journald_FOUND) diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make index d924abe9a77f779dc2256e93efd332004f55698e..eaf736e8c5502a5787353b49060f7bb9cdd4f679 100644 --- a/Source/WebCore/DerivedSources.make @@ -2449,7 +2449,7 @@ index 9f4daefcd385d534149f0a5a6ce0e8016e25638f..37f64495ec9b316bbf0a5e3212917d43 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index 906c299845db03f7738e581850d4d0c4ae9a30c6..e27f97c613819ddb4cdf00e52e7f25933dfa0cb9 100644 +index 0ce584be6270f1c5754324e51dba895899c7b4dc..098ad0423f08a66c181d829d81c4808e710de218 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt @@ -605,3 +605,9 @@ platform/graphics/angle/ANGLEUtilities.cpp @no-unify @@ -2463,10 +2463,10 @@ index 906c299845db03f7738e581850d4d0c4ae9a30c6..e27f97c613819ddb4cdf00e52e7f2593 +JSTouchList.cpp +// Playwright end diff --git a/Source/WebCore/SourcesGTK.txt b/Source/WebCore/SourcesGTK.txt -index 60373635c135f23dcf83ffbe05ad21c39c844ac9..55409c4c9163645383d1726d305b2bbb3a6d7fcd 100644 +index 6aa4060d8735712f463c35690689242f25d1d441..4bff6490fef065297df7834bdbb8a7029737d1d2 100644 --- a/Source/WebCore/SourcesGTK.txt +++ b/Source/WebCore/SourcesGTK.txt -@@ -93,7 +93,7 @@ platform/graphics/egl/GLContextEGLLibWPE.cpp @no-unify +@@ -94,7 +94,7 @@ platform/graphics/egl/GLContextEGLLibWPE.cpp @no-unify platform/graphics/egl/GLContextEGLWayland.cpp @no-unify platform/graphics/egl/GLContextEGLX11.cpp @no-unify @@ -2476,7 +2476,7 @@ index 60373635c135f23dcf83ffbe05ad21c39c844ac9..55409c4c9163645383d1726d305b2bbb platform/graphics/gtk/ColorGtk.cpp platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp diff --git a/Source/WebCore/SourcesWPE.txt b/Source/WebCore/SourcesWPE.txt -index 6633aa18a9cd81216e6c46a7c4237f01a1e4bbbb..18e160d6c13cce7e91bafe9e7b305e774963463f 100644 +index fd058e8f614edba70fd0d104285864e768eceb5d..375547aee2755513950c253666eeb5696505ab24 100644 --- a/Source/WebCore/SourcesWPE.txt +++ b/Source/WebCore/SourcesWPE.txt @@ -44,6 +44,8 @@ editing/libwpe/EditorLibWPE.cpp @@ -2514,7 +2514,7 @@ index 9f85e4986c53a1cc8d63b3394d3f7295832af387..1228fda7c688c5b24cecaf07e21437d3 __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 340e420bab59bbf78ab0af65fa4d9f31206713d7..3a7ba903fa8277d98440f7aea809aef0abf7b0ff 100644 +index 8195297ea6e5baf922587e6e676a8d2c123c8d28..68cfb8ba6ca5b9f2513ff02f502b369edf19a5cd 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj @@ -5421,6 +5421,14 @@ @@ -2532,7 +2532,7 @@ index 340e420bab59bbf78ab0af65fa4d9f31206713d7..3a7ba903fa8277d98440f7aea809aef0 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, ); }; }; -@@ -16890,6 +16898,14 @@ +@@ -16891,6 +16899,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 = ""; }; @@ -2547,7 +2547,7 @@ index 340e420bab59bbf78ab0af65fa4d9f31206713d7..3a7ba903fa8277d98440f7aea809aef0 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 = ""; }; -@@ -22552,7 +22568,12 @@ +@@ -22555,7 +22571,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2560,7 +2560,7 @@ index 340e420bab59bbf78ab0af65fa4d9f31206713d7..3a7ba903fa8277d98440f7aea809aef0 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -28387,6 +28408,8 @@ +@@ -28389,6 +28410,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2569,7 +2569,7 @@ index 340e420bab59bbf78ab0af65fa4d9f31206713d7..3a7ba903fa8277d98440f7aea809aef0 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -30645,6 +30668,7 @@ +@@ -30647,6 +30670,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2577,7 +2577,7 @@ index 340e420bab59bbf78ab0af65fa4d9f31206713d7..3a7ba903fa8277d98440f7aea809aef0 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -31658,6 +31682,7 @@ +@@ -31660,6 +31684,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2593,7 +2593,7 @@ index 340e420bab59bbf78ab0af65fa4d9f31206713d7..3a7ba903fa8277d98440f7aea809aef0 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -35885,9 +35911,11 @@ +@@ -35887,9 +35913,11 @@ B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */, @@ -2605,7 +2605,7 @@ index 340e420bab59bbf78ab0af65fa4d9f31206713d7..3a7ba903fa8277d98440f7aea809aef0 B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -36846,6 +36874,7 @@ +@@ -36848,6 +36876,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2613,7 +2613,7 @@ index 340e420bab59bbf78ab0af65fa4d9f31206713d7..3a7ba903fa8277d98440f7aea809aef0 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -36916,6 +36945,7 @@ +@@ -36918,6 +36947,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2621,7 +2621,7 @@ index 340e420bab59bbf78ab0af65fa4d9f31206713d7..3a7ba903fa8277d98440f7aea809aef0 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -36964,6 +36994,7 @@ +@@ -36966,6 +36996,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2629,7 +2629,7 @@ index 340e420bab59bbf78ab0af65fa4d9f31206713d7..3a7ba903fa8277d98440f7aea809aef0 DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -37496,6 +37527,7 @@ +@@ -37498,6 +37529,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2638,7 +2638,7 @@ index 340e420bab59bbf78ab0af65fa4d9f31206713d7..3a7ba903fa8277d98440f7aea809aef0 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 1a70b2efd621e11cb662e925015e028f34d64542..ae055af9b8f5e56b20ddbe01d45068c1921339ab 100644 +index 132efbcffc44a1c73b8c0617be03f366e22aa054..b8539b49b93ac0accbed9ec191b38919a1c733b2 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -60,6 +60,7 @@ @@ -2649,7 +2649,7 @@ index 1a70b2efd621e11cb662e925015e028f34d64542..ae055af9b8f5e56b20ddbe01d45068c1 #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3350,10 +3351,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -3361,10 +3362,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (useParentData ? m_isIgnoredFromParentData.isPresentationalChildOfAriaRole : isPresentationalChildOfAriaRole()) return AccessibilityObjectInclusion::IgnoreObject; @@ -2996,7 +2996,7 @@ index c33bc989d95a21425d43643795190cf40f7e9684..d54965c544b8cac7ebc1e9e408db8ae0 + } // namespace WebCore diff --git a/Source/WebCore/inspector/InspectorController.h b/Source/WebCore/inspector/InspectorController.h -index 784bf482fd68da68e1f38fd5cd6bcedc8971dfda..6cdf012453ff31120adbe5946ce23f075761ebef 100644 +index 11c26ccfd836c23ec85a52082e4eb4f4a1ffde25..edf37988c97b0fd2bb7a957b56ec028421d45083 100644 --- a/Source/WebCore/inspector/InspectorController.h +++ b/Source/WebCore/inspector/InspectorController.h @@ -101,6 +101,10 @@ public: @@ -4337,7 +4337,7 @@ index 8f6fbcc293aebf8b9d5c945d2829a1527b74bc7f..34e6726d970400c28f1812cdf5ceddb3 std::unique_ptr m_frontendDispatcher; diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp -index c894067585eb1e3dc79276d9d0e4f7562c84d801..ed6495297c2ec9cf4a186a6535c222f375a7d6c0 100644 +index c894067585eb1e3dc79276d9d0e4f7562c84d801..d5550e7bbcc11f1d514feaa2c670fc044e5c0270 100644 --- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp @@ -32,20 +32,26 @@ @@ -5260,7 +5260,7 @@ index c894067585eb1e3dc79276d9d0e4f7562c84d801..ed6495297c2ec9cf4a186a6535c222f3 + if (nodeToFind && axObject->node() == nodeToFind) + axNode->setFound(true); + -+ if (axObject->hasChildren()) { ++ if (!axObject->children().isEmpty()) { + Ref> children = JSON::ArrayOf::create(); + for (auto& childObject : axObject->children()) + children->addItem(snapshotForAXObject(childObject, nodeToFind)); @@ -5819,7 +5819,7 @@ index 982691dd2dfe2f65201370a12302b5086703c126..4af72beb3b1405ffac78e89e7fbb2b14 protected: static SameSiteInfo sameSiteInfo(const Document&, IsForDOMCookieAccess = IsForDOMCookieAccess::No); diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp -index 460060c1897ee1697b8dc7ebc32df8856bcfa8e1..5e281a519ec0de3e3de442771167f3a8fad2d5b4 100644 +index 27c64d75a8a2ab3e40ee3c486643c1391ce1abd7..afcd17effbd7b292e077c818e8074f30796790fe 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp @@ -1467,8 +1467,6 @@ void DocumentLoader::detachFromFrame() @@ -5850,7 +5850,7 @@ index 4fbfd7120199d27cfa87bdd596737106bce08db0..4f769e266eb4d33ca9c8fa553a4d763a DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index b92736ccdc4e3d6574cfbd6d1064c1a40abbfdc8..0b482088952ca4ddc21c80cc25aa0f7a2063f0bc 100644 +index e5a6cc301a99cd9040b03ab37a55c962b09684cd..aa292c1e1b8142895c01e4d9d797ac16b0b504e4 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp @@ -1168,6 +1168,7 @@ void FrameLoader::loadInSameDocument(const URL& url, SerializedScriptValue* stat @@ -5938,13 +5938,13 @@ index b92736ccdc4e3d6574cfbd6d1064c1a40abbfdc8..0b482088952ca4ddc21c80cc25aa0f7a InspectorInstrumentation::didClearWindowObjectInWorld(m_frame, world); } diff --git a/Source/WebCore/loader/LoaderStrategy.h b/Source/WebCore/loader/LoaderStrategy.h -index e2ecd1afc35ba6d312388c828ea4ce1ddc23acfc..b2bcda2e6990d621e5003819c7d8d03c1853b469 100644 +index b0cb56ec017e9c7f176bf57c2f8f28ac01aa13b8..e8a6802b8c7f2f9e77672a39a4b12df27ce30165 100644 --- a/Source/WebCore/loader/LoaderStrategy.h +++ b/Source/WebCore/loader/LoaderStrategy.h @@ -85,6 +85,7 @@ public: virtual bool isOnLine() const = 0; - virtual void addOnlineStateChangeListener(WTF::Function&&) = 0; + virtual void addOnlineStateChangeListener(Function&&) = 0; + virtual void setEmulateOfflineState(bool) {}; virtual bool shouldPerformSecurityChecks() const { return false; } @@ -6018,7 +6018,7 @@ index fa84c366c63175f9fb4730eb85c4677fc3d6368f..ecf5b8dc97e35910baf493424e673155 void ProgressTracker::incrementProgress(ResourceLoaderIdentifier identifier, const ResourceResponse& response) diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h -index ccbdfa4963e40396c79ea9639cb5a079b4f3ed26..b8952ccaaeb9e38391fb806c458ec0578c123e80 100644 +index 23a58bf8b83ce2f56be02162db5784ba7381f3e0..dd0130bc020a72b135654c2623ea61da05a9987c 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h @@ -306,7 +306,7 @@ public: @@ -6031,7 +6031,7 @@ index ccbdfa4963e40396c79ea9639cb5a079b4f3ed26..b8952ccaaeb9e38391fb806c458ec057 #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index f96c3128ed9fd38b36e0e5d1a416ffdefd3bb36c..3020fc0d0fdfcdb4d5b09332cdefbb7d1465f020 100644 +index 57b3357a15462924c0118ef276e499c012454211..0712f0da9850e94ad585aca90014f73ebf455cf3 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -138,6 +138,7 @@ @@ -6129,7 +6129,7 @@ index f96c3128ed9fd38b36e0e5d1a416ffdefd3bb36c..3020fc0d0fdfcdb4d5b09332cdefbb7d return swallowEvent; } -@@ -4107,7 +4107,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr +@@ -4109,7 +4109,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr if (!m_frame.document()) return false; @@ -6145,7 +6145,7 @@ index f96c3128ed9fd38b36e0e5d1a416ffdefd3bb36c..3020fc0d0fdfcdb4d5b09332cdefbb7d auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; if (dragState().shouldDispatchEvents) { -@@ -4518,7 +4525,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4520,7 +4527,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) allTouchReleased = false; } @@ -6155,7 +6155,7 @@ index f96c3128ed9fd38b36e0e5d1a416ffdefd3bb36c..3020fc0d0fdfcdb4d5b09332cdefbb7d PlatformTouchPoint::State pointState = point.state(); LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); -@@ -4645,6 +4653,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4647,6 +4655,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) changedTouches[pointState].m_touches->append(WTFMove(touch)); changedTouches[pointState].m_targets.add(touchTarget); } @@ -6774,7 +6774,7 @@ index 28d1fc3242174a680711027877d4153923790220..058b5309eed081fcc1e4158f66e80642 if (stateObjectType == StateObjectType::Push) { frame->loader().history().pushState(WTFMove(data), title, fullURL.string()); diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp -index a2b2b5f605b37c1185bf75eec3dc936a42a2659f..4b99643a482b4adc89f1998cf7873862538accc1 100644 +index 194f6d99e9aeef787313671598d1762a2c6568cf..6a217f3cede76a154743a81b96b7da04b96430d4 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp @@ -466,6 +466,37 @@ void Page::setOverrideViewportArguments(const std::optional& @@ -6844,7 +6844,7 @@ index a2b2b5f605b37c1185bf75eec3dc936a42a2659f..4b99643a482b4adc89f1998cf7873862 { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index 015f85244c9acd5ff50b3c89dec0a4c1a8d4f9ee..0a2e81b6903fbf87d13369081951c5355a4759c8 100644 +index 53f61377ac4dbbd95292a266b17fda291701e757..784c138d8fd28c0dbe89019c32f005c2dc6a5e73 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h @@ -266,6 +266,9 @@ public: @@ -6920,7 +6920,7 @@ index 015f85244c9acd5ff50b3c89dec0a4c1a8d4f9ee..0a2e81b6903fbf87d13369081951c535 #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) RefPtr m_deviceOrientationUpdateProvider; diff --git a/Source/WebCore/page/PointerCaptureController.cpp b/Source/WebCore/page/PointerCaptureController.cpp -index a220d0dc9959a0dd3c3a1b2b67b6dca9d3267a56..2b20c565a61941908cf56bbe8a15da83002f084c 100644 +index 62904802dda2b68fcde3bd0f05b3ea1cf7e31284..ac37a8a0abd2fee236a743fd7a976484bbb46fe1 100644 --- a/Source/WebCore/page/PointerCaptureController.cpp +++ b/Source/WebCore/page/PointerCaptureController.cpp @@ -196,7 +196,7 @@ bool PointerCaptureController::preventsCompatibilityMouseEventsForIdentifier(Poi @@ -6942,7 +6942,7 @@ index a220d0dc9959a0dd3c3a1b2b67b6dca9d3267a56..2b20c565a61941908cf56bbe8a15da83 #endif diff --git a/Source/WebCore/page/PointerCaptureController.h b/Source/WebCore/page/PointerCaptureController.h -index 49548142f6db6b245cf6ba234272615028aad1ae..ff1ed0ea25ff4f036763c5f381803cc303956b92 100644 +index 45435f77e4bc790aa60bdebc27ea69b9ba889c30..65ae0b7b220d7736a42981ff18798a2ec83dbdbe 100644 --- a/Source/WebCore/page/PointerCaptureController.h +++ b/Source/WebCore/page/PointerCaptureController.h @@ -57,7 +57,7 @@ public: @@ -6981,7 +6981,7 @@ index f90b8e6de036986779294cbb03c753ffcaf71801..af9672ae6605c341f2cbda8559e5441c #endif diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h -index 1f5bd43006b7278a25d6f4f2e221731ad3037a5e..a0d0a6b00a239800832aaa811373b3c6d93b67a9 100644 +index 3fdc945e785d4a3738b96b008528ee63c424b2d3..592e49b9b6d161c34f2e9810331a4d6e32567f4b 100644 --- a/Source/WebCore/page/RuntimeEnabledFeatures.h +++ b/Source/WebCore/page/RuntimeEnabledFeatures.h @@ -202,6 +202,7 @@ public: @@ -7046,7 +7046,7 @@ index 3bec0aef174336939838fb1069fffbcb9f3d5604..566ef3806be3c5ccf1bb951251c2a90d RefPtr SocketProvider::createWebSocketChannel(Document&, WebSocketChannelClient&) diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp -index 63315ba5ef688b8409c8a5f2c6ff40ecaf8fcd53..8c6dd28bd61d390c2baddfadb0a36882f8ff86cd 100644 +index 45b1d4af13e1702435c23615060d87000e91241f..a5cd4fe675a110aa6da305a11a42cbadfbb47245 100644 --- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp @@ -292,6 +292,8 @@ bool ContentSecurityPolicy::protocolMatchesSelf(const URL& url) const @@ -7910,7 +7910,7 @@ index 0516e70973e0078de6ad0216375d34dd9ef51a8d..ffd9a02deb5518e0c8c77b156815c11e { switch (val) { diff --git a/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp b/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp -index 7a3b4723f48c179864b2dd6d5b1ed8d27492358e..a741751acad01f11d7da0f6896eeb0023b9a3fcc 100644 +index 80958ba565a877224d0ed37e4e4057b4be0dde24..eca42bf5181bc4a95efca9c9c3f5ce0f987fea43 100644 --- a/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp +++ b/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp @@ -224,7 +224,7 @@ bool screenSupportsExtendedColor(Widget*) @@ -8487,7 +8487,7 @@ index c4eb67d6f7c334076b32b798dcea40b570681e6f..ce86ab28225aa466350671441294f2ac bool m_detectedDatabaseCorruption { false }; diff --git a/Source/WebCore/platform/network/curl/CurlStream.cpp b/Source/WebCore/platform/network/curl/CurlStream.cpp -index 29190c7898913eb4081a5bf82eaba3201d0446f5..92be0ba24fefb403587136dddb8cfe42cfac892b 100644 +index c0704f0cdd6442373f7b70bfe61539bf5b37d625..02fb139ccd854642242fef2c75d8fd15db8fe42d 100644 --- a/Source/WebCore/platform/network/curl/CurlStream.cpp +++ b/Source/WebCore/platform/network/curl/CurlStream.cpp @@ -33,7 +33,7 @@ @@ -8510,7 +8510,7 @@ index 29190c7898913eb4081a5bf82eaba3201d0446f5..92be0ba24fefb403587136dddb8cfe42 auto errorCode = m_curlHandle->perform(); if (errorCode != CURLE_OK) { diff --git a/Source/WebCore/platform/network/curl/CurlStream.h b/Source/WebCore/platform/network/curl/CurlStream.h -index e64629fc22a2097a2af0b0c0139b23d7908cf3dc..920a8c12c6c69afc5aec6de12e9f5fba312237a0 100644 +index 4f59b20e8db27903994b33154ce64b0994f3a0ba..e18315445ee05d47b81f00b47ab84ec5d5ae032b 100644 --- a/Source/WebCore/platform/network/curl/CurlStream.h +++ b/Source/WebCore/platform/network/curl/CurlStream.h @@ -50,12 +50,12 @@ public: @@ -8520,8 +8520,8 @@ index e64629fc22a2097a2af0b0c0139b23d7908cf3dc..920a8c12c6c69afc5aec6de12e9f5fba - static std::unique_ptr create(CurlStreamScheduler& scheduler, CurlStreamID streamID, URL&& url) + static std::unique_ptr create(CurlStreamScheduler& scheduler, CurlStreamID streamID, bool ignoreCertificateErrors, URL&& url) { -- return WTF::makeUnique(scheduler, streamID, WTFMove(url)); -+ return WTF::makeUnique(scheduler, streamID, ignoreCertificateErrors, WTFMove(url)); +- return makeUnique(scheduler, streamID, WTFMove(url)); ++ return makeUnique(scheduler, streamID, ignoreCertificateErrors, WTFMove(url)); } - CurlStream(CurlStreamScheduler&, CurlStreamID, URL&&); @@ -8530,7 +8530,7 @@ index e64629fc22a2097a2af0b0c0139b23d7908cf3dc..920a8c12c6c69afc5aec6de12e9f5fba void send(UniqueArray&&, size_t); diff --git a/Source/WebCore/platform/network/curl/CurlStreamScheduler.cpp b/Source/WebCore/platform/network/curl/CurlStreamScheduler.cpp -index b4a9abd45307e14b1b0080c5fd8490acaf7bb599..d750af7d2e6e25b9df9fada78ae1fe3767066fbb 100644 +index d94ff4f9169a6c0b5adb9719f5506d0fb80e6f89..3f955607764d028807d150619bf7f49e08bc3e7e 100644 --- a/Source/WebCore/platform/network/curl/CurlStreamScheduler.cpp +++ b/Source/WebCore/platform/network/curl/CurlStreamScheduler.cpp @@ -40,7 +40,7 @@ CurlStreamScheduler::~CurlStreamScheduler() @@ -8554,7 +8554,7 @@ index b4a9abd45307e14b1b0080c5fd8490acaf7bb599..d750af7d2e6e25b9df9fada78ae1fe37 return streamID; diff --git a/Source/WebCore/platform/network/curl/CurlStreamScheduler.h b/Source/WebCore/platform/network/curl/CurlStreamScheduler.h -index 7d881206c9689f433227969c9b7f9ff268bdaaed..2e8118f11f87fa5f32adcedc165aec8220b36d58 100644 +index 0c39c90aac884fca48849388acc1b42bad16d620..dd8e50686c348b46d5ae92fd67a31eb0cbdb014f 100644 --- a/Source/WebCore/platform/network/curl/CurlStreamScheduler.h +++ b/Source/WebCore/platform/network/curl/CurlStreamScheduler.h @@ -38,7 +38,7 @@ public: @@ -9219,10 +9219,10 @@ index 0000000000000000000000000000000000000000..cf2b51f6f02837a1106f4d999f2f130e + +} // namespace WebCore diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp -index 11e3aeb4b20e6677be15f0ec6f2470f71b44b97b..e74dfdecafa9068fca6f469d21842529431e768d 100644 +index 0c26696299174bd6fd89c62b1a02296fa89e4bd9..aa23506fbd5880c39039688913105df08c2a2dc0 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp -@@ -2604,7 +2604,7 @@ LayoutRect RenderLayer::getRectToExpose(const LayoutRect& visibleRect, const Lay +@@ -2603,7 +2603,7 @@ LayoutRect RenderLayer::getRectToExpose(const LayoutRect& visibleRect, const Lay ScrollAlignment::Behavior scrollX; LayoutRect exposeRectX(exposeRect.x(), visibleRect.y(), exposeRect.width(), visibleRect.height()); LayoutUnit intersectWidth = intersection(visibleRect, exposeRectX).width(); @@ -9335,7 +9335,7 @@ index daeba5d84582c506391b2eca143710d23a17de12..cd68dd1d1b7e7d952040e6546a66fbbb 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 f95062614e9640c3cd629d7394cbeb85982b54c8..9483194f2d25e42174a72c667e73b9aafe2a67a0 100644 +index d38e9a60c99bfbe4db4edb232bcd586efabaeebc..646c3bbf1803b2669482953bf47e957b3727f4cf 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -26,7 +26,6 @@ @@ -9700,7 +9700,7 @@ index d602a5f90999fc7f440e2468d40332625ed37083..577b76728f762e7f5aa509531a65eaab void didReceiveMessage(IPC::Connection&, IPC::Decoder&); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 284979e61201d79b764538b17001a0da8a5728d4..bc16673844c8f6c1a846f18e0980c88df5ecb408 100644 +index 3cf6743a23989122cdd3d9c88d394f18cd52bd3a..72542900893c6c98914fa7e23646bbad8002b980 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm @@ -720,7 +720,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se @@ -10508,10 +10508,10 @@ index 3dbe10d49b4de34636900efe31fb57e7e60e341c..1457cbaad0bf5c3b17902fd8c2f243a2 const WebCore::IntPoint& globalPosition() const { return m_globalPosition; } float deltaX() const { return m_deltaX; } diff --git a/Source/WebKit/Shared/WebPageCreationParameters.cpp b/Source/WebKit/Shared/WebPageCreationParameters.cpp -index cbca908e38360d1d9c99442e093fa089151e96d6..98cef85c15d88bd2fbcca564c939968f72347838 100644 +index 582c5e3be33511629ccc66f821ecf2e01bc536d9..2d1bb12439f1f720c8ff77130f56d1ced2915127 100644 --- a/Source/WebKit/Shared/WebPageCreationParameters.cpp +++ b/Source/WebKit/Shared/WebPageCreationParameters.cpp -@@ -156,6 +156,8 @@ void WebPageCreationParameters::encode(IPC::Encoder& encoder) const +@@ -158,6 +158,8 @@ void WebPageCreationParameters::encode(IPC::Encoder& encoder) const encoder << crossOriginAccessControlCheckEnabled; encoder << processDisplayName; @@ -10520,7 +10520,7 @@ index cbca908e38360d1d9c99442e093fa089151e96d6..98cef85c15d88bd2fbcca564c939968f encoder << shouldCaptureAudioInUIProcess; encoder << shouldCaptureAudioInGPUProcess; encoder << shouldCaptureVideoInUIProcess; -@@ -543,7 +545,10 @@ std::optional WebPageCreationParameters::decode(IPC:: +@@ -549,7 +551,10 @@ std::optional WebPageCreationParameters::decode(IPC:: if (!processDisplayName) return std::nullopt; parameters.processDisplayName = WTFMove(*processDisplayName); @@ -10533,10 +10533,10 @@ index cbca908e38360d1d9c99442e093fa089151e96d6..98cef85c15d88bd2fbcca564c939968f return std::nullopt; diff --git a/Source/WebKit/Shared/WebPageCreationParameters.h b/Source/WebKit/Shared/WebPageCreationParameters.h -index eb1ee0959a513db8257d64addceea509b7a3e86e..11f614ece8472a186deb11b04d127336b59f86d4 100644 +index 26ad3e0b3fcbc818f99fcb7ae06eb75e95e1a2d1..989137fd39ca671a449517120f4ec01e6e181af1 100644 --- a/Source/WebKit/Shared/WebPageCreationParameters.h +++ b/Source/WebKit/Shared/WebPageCreationParameters.h -@@ -252,6 +252,8 @@ struct WebPageCreationParameters { +@@ -254,6 +254,8 @@ struct WebPageCreationParameters { WebCore::ShouldRelaxThirdPartyCookieBlocking shouldRelaxThirdPartyCookieBlocking { WebCore::ShouldRelaxThirdPartyCookieBlocking::No }; @@ -10849,10 +10849,10 @@ index 85d6f74114f4e7f82d9502d1b99d69098d6a49b6..6896c9756edb233dda46c7031e1af699 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index f1998a60c6319bb1d3e7384f746a9effe0c72c2b..473a6c35a6872963504d26208993a80b4f3a1a99 100644 +index 1427e7e3bbcf11e9ee21d9bf878ba1c42c731640..aebe86316fdd0df7c1e5642408ddc133fb4017c1 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -315,11 +315,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -316,11 +316,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -10867,7 +10867,7 @@ index f1998a60c6319bb1d3e7384f746a9effe0c72c2b..473a6c35a6872963504d26208993a80b UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -328,6 +331,7 @@ UIProcess/PageLoadState.cpp +@@ -329,6 +332,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -10875,7 +10875,7 @@ index f1998a60c6319bb1d3e7384f746a9effe0c72c2b..473a6c35a6872963504d26208993a80b UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -368,6 +372,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -369,6 +373,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -10884,7 +10884,7 @@ index f1998a60c6319bb1d3e7384f746a9effe0c72c2b..473a6c35a6872963504d26208993a80b UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPreferences.cpp -@@ -489,7 +495,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -490,7 +496,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -10897,10 +10897,10 @@ index f1998a60c6319bb1d3e7384f746a9effe0c72c2b..473a6c35a6872963504d26208993a80b UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 209693e4b329c9310541a11738e0a71cb08b089f..fd5223322c2902978734b850b861b2ad7e210bc0 100644 +index 73df95c80850f191b9b698243ca20ca74652c946..38edadbedb22bab118be1faf719159ac3e28da16 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -277,6 +277,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm +@@ -279,6 +279,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -10908,7 +10908,7 @@ index 209693e4b329c9310541a11738e0a71cb08b089f..fd5223322c2902978734b850b861b2ad UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -449,6 +450,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -451,6 +452,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -12722,7 +12722,7 @@ index e679695a3fe1a0aef28dd5af0248d6906f341987..7a8898483f4a22d668a54c56a840fed9 bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRequestGeolocationPermissionForFrameDecisionHandler : 1; diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm -index 28c20e9b3c80b092d47824bafa9f0c2de23a8488..f51c0e10e053e89fbf3e362df2c6d62a88798c6a 100644 +index 6d0daa53ca5007107390503d280995a4cd876b65..15997edba7b6ff5f6b97bd27047dfcd9ca03b72d 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm @@ -109,6 +109,7 @@ void UIDelegate::setDelegate(id delegate) @@ -12867,7 +12867,7 @@ index 1c574458ef308c1a05541bd6add2bda50400d260..babdf3eb59c550c6c4b215bc2c078dad void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -index 69f43a09627637eef9562ab3bf9266917b12f10f..db3dbdc84d5d8097e8f306493159eb288ef07364 100644 +index bbd2599d9eaf354312eca1cfba1362c138369a85..c33385e23437a7d15b32b14ebfc272e2686f299f 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm @@ -2615,6 +2615,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() @@ -12882,7 +12882,7 @@ index 69f43a09627637eef9562ab3bf9266917b12f10f..db3dbdc84d5d8097e8f306493159eb28 ASSERT(m_colorSpace); return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] }; -@@ -4696,6 +4701,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu +@@ -4688,6 +4693,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu return adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions)); } @@ -16553,10 +16553,10 @@ index 9e7df1841ae9f59908477cdda1adc510586796e0..8303055373dcfbff8c598c5c00bb8a5b virtual RefPtr takeViewSnapshot(std::optional&&) = 0; #endif diff --git a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp -index b88a07846d78d600de7c023a0bd04096f0857a6c..127bc7b856c89c87310679cd1e89c08caa380821 100644 +index db9325c2eb5a97f6e8089c0eac5e506e02675e0d..b95ea50ea5d84c817e0082a00f1415c7adf82a00 100644 --- a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp +++ b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp -@@ -628,3 +628,5 @@ bool ProvisionalPageProxy::sendMessage(UniqueRef&& encoder, Option +@@ -629,3 +629,5 @@ bool ProvisionalPageProxy::sendMessage(UniqueRef&& encoder, Option } } // namespace WebKit @@ -17584,7 +17584,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c5d0414c4 100644 +index 210b2f4da2d21acd01077e8208fda4a348743f41..0e3297f55a5878011a38658d64b18f43c8fcdbdc 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -247,6 +247,9 @@ @@ -17638,7 +17638,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1920,6 +1943,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1922,6 +1945,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -17670,7 +17670,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2110,6 +2158,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2112,6 +2160,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -17696,7 +17696,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2682,6 +2749,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2684,6 +2751,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -17705,7 +17705,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2692,6 +2761,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2694,6 +2763,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -17714,7 +17714,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2707,18 +2778,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2727,6 +2821,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2729,6 +2823,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -17784,7 +17784,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2739,8 +2851,18 @@ void WebPageProxy::didStartDrag() +@@ -2741,8 +2853,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17804,7 +17804,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2845,16 +2967,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2847,16 +2969,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17850,7 +17850,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3073,7 +3217,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3075,7 +3219,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17859,7 +17859,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -3106,7 +3250,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3108,7 +3252,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -17868,7 +17868,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3495,6 +3639,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3497,6 +3641,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -17877,7 +17877,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c receivedPolicyDecision(policyAction, navigation, WTFMove(policies), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3561,6 +3707,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3563,6 +3709,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, RefPtr&& websitePolicies, std::variant, Ref>&& navigationActionOrResponse, Ref&& sender, std::optional sandboxExtensionHandle, WillContinueLoadInNewProcess willContinueLoadInNewProcess) { @@ -17885,7 +17885,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4283,6 +4430,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4285,6 +4432,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17897,7 +17897,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4616,6 +4768,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4618,6 +4770,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17905,7 +17905,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4840,6 +4993,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4842,6 +4995,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17914,7 +17914,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c // If the provisional page's load fails then we destroy the provisional page. if (m_provisionalPage && m_provisionalPage->mainFrame() == &frame && willContinueLoading == WillContinueLoading::No) m_provisionalPage = nullptr; -@@ -5308,7 +5463,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5310,7 +5465,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, NavigationActionData&& navigationActionData, FrameInfoData&& originatingFrameInfo, std::optional originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&& request, IPC::FormDataReference&& requestBody, WebCore::ResourceResponse&& redirectResponse, const UserData& userData, uint64_t listenerID) { @@ -17930,7 +17930,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5845,6 +6007,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5847,6 +6009,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa auto* originatingPage = m_process->webPage(originatingPageID); auto originatingFrameInfo = API::FrameInfo::create(WTFMove(originatingFrameInfoData), originatingPage); auto mainFrameURL = m_mainFrame ? m_mainFrame->url() : URL(); @@ -17938,7 +17938,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c auto completionHandler = [this, protectedThis = Ref { *this }, mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -5888,6 +6051,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5890,6 +6053,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17946,7 +17946,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c } void WebPageProxy::exitFullscreenImmediately() -@@ -5923,6 +6087,10 @@ void WebPageProxy::closePage() +@@ -5925,6 +6089,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17957,7 +17957,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -5959,6 +6127,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -5961,6 +6129,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f } runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { @@ -17966,7 +17966,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -5980,6 +6150,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -5982,6 +6152,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17975,7 +17975,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { page.m_uiClient->runJavaScriptConfirm(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](bool result) mutable { -@@ -6003,6 +6175,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -6005,6 +6177,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17984,7 +17984,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply), defaultValue](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { page.m_uiClient->runJavaScriptPrompt(page, message, defaultValue, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](auto& result) mutable { -@@ -6163,6 +6337,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6165,6 +6339,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17993,7 +17993,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7395,6 +7571,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7397,6 +7573,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -18002,7 +18002,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c } break; } -@@ -7409,10 +7587,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7411,10 +7589,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) pageClient().wheelEventWasNotHandledByWebCore(oldestProcessedEvent); } @@ -18019,7 +18019,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c break; } -@@ -7421,7 +7602,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7423,7 +7604,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) case WebEvent::RawKeyDown: case WebEvent::Char: { LOG(KeyHandling, "WebPageProxy::didReceiveEvent: %s (queue empty %d)", webKeyboardEventTypeString(type), m_keyEventQueue.isEmpty()); @@ -18027,7 +18027,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7440,7 +7620,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7442,7 +7622,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) // The call to doneWithKeyEvent may close this WebPage. // Protect against this being destroyed. Ref protect(*this); @@ -18035,7 +18035,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7449,6 +7628,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7451,6 +7630,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -18043,7 +18043,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c } break; } -@@ -7803,7 +7983,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7805,7 +7985,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%{public}s", processTerminationReasonToString(reason)); @@ -18055,7 +18055,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8184,6 +8367,7 @@ static const Vector& mediaRelatedIOKitClasses() +@@ -8186,6 +8369,7 @@ static const Vector& mediaRelatedIOKitClasses() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -18063,7 +18063,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8377,6 +8561,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8381,6 +8565,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.shouldRelaxThirdPartyCookieBlocking = m_configuration->shouldRelaxThirdPartyCookieBlocking(); parameters.canUseCredentialStorage = m_canUseCredentialStorage; @@ -18072,7 +18072,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c #if PLATFORM(GTK) parameters.gtkSettings = GtkSettingsManager::singleton().settingsState(); #endif -@@ -8457,6 +8643,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8461,6 +8647,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -18087,7 +18087,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8550,6 +8744,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8554,6 +8748,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -18104,7 +18104,7 @@ index f7a810b273d90f4abc4cfb17e43b2a3fc92dce6c..517d39c532f5014c142eaff93812cf3c // 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 ceea92766cf9eb132b961890a56e13cbb6efc37f..50a46f4d718c8ddb82171046f84d4037cec6478f 100644 +index 99336cc79a59a0f3d7e407103091171ab891c6be..02d5b6dbbe92249675f5e5284433dcc1d8e5b1f0 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -18187,7 +18187,7 @@ index ceea92766cf9eb132b961890a56e13cbb6efc37f..50a46f4d718c8ddb82171046f84d4037 RefPtr loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemesButNotAppLinks, API::Object* userData = nullptr); RefPtr loadFile(const String& fileURL, const String& resourceDirectoryURL, API::Object* userData = nullptr); RefPtr loadData(const IPC::DataReference&, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow); -@@ -1166,6 +1186,7 @@ public: +@@ -1168,6 +1188,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -18195,7 +18195,7 @@ index ceea92766cf9eb132b961890a56e13cbb6efc37f..50a46f4d718c8ddb82171046f84d4037 void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1240,14 +1261,20 @@ public: +@@ -1242,14 +1263,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -18217,7 +18217,7 @@ index ceea92766cf9eb132b961890a56e13cbb6efc37f..50a46f4d718c8ddb82171046f84d4037 #endif void processDidBecomeUnresponsive(); -@@ -1491,6 +1518,8 @@ public: +@@ -1493,6 +1520,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -18226,7 +18226,7 @@ index ceea92766cf9eb132b961890a56e13cbb6efc37f..50a46f4d718c8ddb82171046f84d4037 #endif #if ENABLE(WEB_CRYPTO) -@@ -2615,6 +2644,7 @@ private: +@@ -2617,6 +2646,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -18234,7 +18234,7 @@ index ceea92766cf9eb132b961890a56e13cbb6efc37f..50a46f4d718c8ddb82171046f84d4037 #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2875,6 +2905,20 @@ private: +@@ -2877,6 +2907,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -18255,7 +18255,7 @@ index ceea92766cf9eb132b961890a56e13cbb6efc37f..50a46f4d718c8ddb82171046f84d4037 #endif PageLoadState m_pageLoadState; -@@ -3086,6 +3130,9 @@ private: +@@ -3089,6 +3133,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -18301,7 +18301,7 @@ index f5705a06115a22e8e3076bc5f95bc9dc1be7c46a..6e10bc4717252db7bf44ed2d20950254 DidPerformDragOperation(bool handled) #endif diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index 36de58802ce6ec94bf4fcc8f2ce41ff9be736ecf..5de5b6898aae83d10c8f81ef385cc8c393d37f2c 100644 +index b65e086d88eacfebb3433d7dd1268a191dcbdd0a..b2037fe0bc09ae6aa502051e19d8bb7ef15d6d6b 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp @@ -512,6 +512,14 @@ void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkPro @@ -19331,7 +19331,7 @@ index d37c28feb1a57edfb4a8f4d898342d196c7a8802..c64611d78fe184acd76f38ad31647362 void navigationGestureWillEnd(bool willNavigate, WebBackForwardListItem&) override; void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem&) override; diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm -index 7f156ddefacf710df45786ac65da8944f09d12d7..1b081af5542220ffb400a3cf6a6be6fa2f06ae48 100644 +index ab73994899c547ce184b9961aa257ce1ba9bfcd5..e93c0888772b08e4a44690363e90f1c5dcd9dade 100644 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm @@ -81,6 +81,7 @@ @@ -20421,10 +20421,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3b6c391e0 100644 +index 386b095e2d491cb3c0620b469d89e255532f67e2..2d7981f17cfff08f78ce40f96fc9ecf58e2a458e 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1994,6 +1994,18 @@ +@@ -1998,6 +1998,18 @@ DF0C5F28252ECB8E00D921DB /* WKDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F24252ECB8D00D921DB /* WKDownload.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2A252ECB8E00D921DB /* WKDownloadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2B252ED44000D921DB /* WKDownloadInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */; }; @@ -20443,7 +20443,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 DF462E0F23F22F5500EFF35F /* WKHTTPCookieStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF462E1223F338BE00EFF35F /* WKContentWorldPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF84CEE4249AA24D009096F6 /* WKPDFHUDView.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF84CEE2249AA21F009096F6 /* WKPDFHUDView.mm */; }; -@@ -2051,6 +2063,9 @@ +@@ -2055,6 +2067,9 @@ E5CB07DC20E1678F0022C183 /* WKFormColorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */; }; E5DEFA6826F8F42600AB68DB /* PhotosUISPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E5DEFA6726F8F42600AB68DB /* PhotosUISPI.h */; }; ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -20453,7 +20453,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 F4094CBD2553053D003D73E3 /* DisplayListReaderHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = F4094CBB255304AF003D73E3 /* DisplayListReaderHandle.h */; }; F4094CBE25530540003D73E3 /* DisplayListWriterHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = F4094CB92553047E003D73E3 /* DisplayListWriterHandle.h */; }; F409BA181E6E64BC009DA28E /* WKDragDestinationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */; settings = {ATTRIBUTES = (Private, ); }; }; -@@ -6045,6 +6060,19 @@ +@@ -6056,6 +6071,19 @@ DF0C5F24252ECB8D00D921DB /* WKDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownload.h; sourceTree = ""; }; DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadInternal.h; sourceTree = ""; }; DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadDelegate.h; sourceTree = ""; }; @@ -20473,7 +20473,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHTTPCookieStorePrivate.h; sourceTree = ""; }; DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentWorldPrivate.h; sourceTree = ""; }; DF58C6311371AC5800F9A37C /* NativeWebWheelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebWheelEvent.h; sourceTree = ""; }; -@@ -6165,6 +6193,14 @@ +@@ -6176,6 +6204,14 @@ ECA680D31E6904B500731D20 /* ExtraPrivateSymbolsForTAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtraPrivateSymbolsForTAPI.h; sourceTree = ""; }; ECBFC1DB1E6A4D66000300C7 /* ExtraPublicSymbolsForTAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExtraPublicSymbolsForTAPI.h; sourceTree = ""; }; F036978715F4BF0500C3A80E /* WebColorPicker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebColorPicker.cpp; sourceTree = ""; }; @@ -20488,7 +20488,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 F4094CB92553047E003D73E3 /* DisplayListWriterHandle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DisplayListWriterHandle.h; sourceTree = ""; }; F4094CBA2553047E003D73E3 /* DisplayListWriterHandle.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DisplayListWriterHandle.cpp; sourceTree = ""; }; F4094CBB255304AF003D73E3 /* DisplayListReaderHandle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DisplayListReaderHandle.h; sourceTree = ""; }; -@@ -6304,6 +6340,7 @@ +@@ -6315,6 +6351,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -20496,7 +20496,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -8235,6 +8272,7 @@ +@@ -8247,6 +8284,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -20504,7 +20504,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -9328,6 +9366,7 @@ +@@ -9351,6 +9389,7 @@ isa = PBXGroup; children = ( 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -20512,7 +20512,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, ); -@@ -9833,6 +9872,12 @@ +@@ -9859,6 +9898,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -20525,7 +20525,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 ); path = Agents; sourceTree = ""; -@@ -9841,6 +9886,7 @@ +@@ -9867,6 +9912,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -20533,7 +20533,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -10362,6 +10408,12 @@ +@@ -10388,6 +10434,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -20546,7 +20546,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -10664,6 +10716,7 @@ +@@ -10690,6 +10742,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -20554,7 +20554,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -11263,6 +11316,11 @@ +@@ -11289,6 +11342,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -20566,7 +20566,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, C1817362205844A900DFDA65 /* DisplayLink.cpp */, -@@ -12137,6 +12195,7 @@ +@@ -12164,6 +12222,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -20574,7 +20574,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -12442,6 +12501,7 @@ +@@ -12469,6 +12528,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -20582,7 +20582,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -12458,6 +12518,7 @@ +@@ -12485,6 +12545,7 @@ 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, F40BBB41257FF46E0067463A /* GPUProcessWakeupMessageArguments.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -20590,7 +20590,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -12608,6 +12669,7 @@ +@@ -12633,6 +12694,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -20598,7 +20598,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, 93085DE026E5BCFD000EC6A7 /* NetworkStorageManager.h in Headers */, -@@ -12700,6 +12762,7 @@ +@@ -12729,6 +12791,7 @@ BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -20606,7 +20606,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */, -@@ -12722,6 +12785,7 @@ +@@ -12751,6 +12814,7 @@ CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, @@ -20614,7 +20614,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -13046,6 +13110,7 @@ +@@ -13075,6 +13139,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -20622,7 +20622,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -13178,6 +13243,7 @@ +@@ -13207,6 +13272,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -20630,7 +20630,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -13231,6 +13297,7 @@ +@@ -13260,6 +13326,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -20638,7 +20638,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -13387,6 +13454,7 @@ +@@ -13416,6 +13483,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -20646,7 +20646,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -14726,6 +14794,7 @@ +@@ -14755,6 +14823,7 @@ C1A152D724E5A29A00978C8B /* HandleXPCEndpointMessages.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -20654,7 +20654,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 9BF5EC642541145600984E77 /* JSIPCBinding.cpp in Sources */, 2D913441212CF9F000128AFD /* JSNPMethod.cpp in Sources */, 2D913442212CF9F000128AFD /* JSNPObject.cpp in Sources */, -@@ -14745,6 +14814,7 @@ +@@ -14774,6 +14843,7 @@ 2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */, 2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */, 2D92A77A212B6A6100F493FD /* Module.cpp in Sources */, @@ -20662,7 +20662,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 57B826452304F14000B72EB0 /* NearFieldSoftLink.mm in Sources */, 2D913443212CF9F000128AFD /* NetscapeBrowserFuncs.cpp in Sources */, 2D913444212CF9F000128AFD /* NetscapePlugin.cpp in Sources */, -@@ -14771,6 +14841,7 @@ +@@ -14801,6 +14871,7 @@ 1A2D8439127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp in Sources */, 2D92A792212B6AD400F493FD /* NPObjectProxy.cpp in Sources */, 2D92A793212B6AD400F493FD /* NPRemoteObjectMap.cpp in Sources */, @@ -20670,7 +20670,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 2D913447212CF9F000128AFD /* NPRuntimeObjectMap.cpp in Sources */, 2D913448212CF9F000128AFD /* NPRuntimeUtilities.cpp in Sources */, 2D92A794212B6AD400F493FD /* NPVariantData.cpp in Sources */, -@@ -15078,6 +15149,7 @@ +@@ -15108,6 +15179,7 @@ 2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -20679,7 +20679,7 @@ index 3256ce9ce911a2c0d99a10c0934788da2e33f455..59e10a01adf50499e90e947041c8bef3 BCBD3914125BB1A800D2C29F /* WebPageProxyMessageReceiver.cpp in Sources */, 7CE9CE101FA0767A000177DE /* WebPageUpdatePreferences.cpp in Sources */, diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp -index ad35e2bf11eb192d9806d617df33232e3b07e864..dc9b5833ab9cf6deb543d349d7a95364c4e2f4bb 100644 +index cd2796d2917459eaa95f90cbd78528dcf1e8032d..1e96da2372557fd1e6b9f2d3675c62cdc5c0b8b4 100644 --- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp +++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp @@ -232,6 +232,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou @@ -20757,7 +20757,7 @@ index ad35e2bf11eb192d9806d617df33232e3b07e864..dc9b5833ab9cf6deb543d349d7a95364 } void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader) -@@ -844,7 +857,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier +@@ -845,7 +858,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier bool WebLoaderStrategy::isOnLine() const { @@ -20766,7 +20766,7 @@ index ad35e2bf11eb192d9806d617df33232e3b07e864..dc9b5833ab9cf6deb543d349d7a95364 } void WebLoaderStrategy::addOnlineStateChangeListener(Function&& listener) -@@ -864,6 +877,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet +@@ -865,6 +878,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet void WebLoaderStrategy::setOnLineState(bool isOnLine) { @@ -20778,7 +20778,7 @@ index ad35e2bf11eb192d9806d617df33232e3b07e864..dc9b5833ab9cf6deb543d349d7a95364 if (m_isOnLine == isOnLine) return; -@@ -872,6 +890,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) +@@ -873,6 +891,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) listener(isOnLine); } @@ -20937,10 +20937,10 @@ index 2eb0886f13ed035a53b8eaa60605de4dfe53fbe3..c46393209cb4f80704bbc9268fad4371 { } diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -index 99a51ab5feaae479a03a3d581c889470b00ee9c2..3d69e88bf8ad783221b9ff18b0647a0bb21ea59d 100644 +index 769b7df7d4d2254e71f7129f6775bcbf1acb7f2d..e884b379903b0858398d68a392b6e616af97ecda 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -@@ -1572,13 +1572,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() +@@ -1574,13 +1574,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() if (webPage->scrollPinningBehavior() != DoNotPin) view->setScrollPinningBehavior(webPage->scrollPinningBehavior()); @@ -21317,10 +21317,10 @@ index f127d64d005ab7b93875591b94a5899205e91579..df0de26e4dc449a0fbf93e7037444df4 uint64_t m_navigationID; }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -index c1866a25bb9d47671108c409a8f2f4b33aaa37f7..205e1a27f2f1fe1f5ce80b2a561c6021c0bdca96 100644 +index 44ac8919e6a8b02c46a83e5fbf6ed71ff7585ff8..56da5a99ae7999f34c4e4d0ea5ebac2376474b42 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -@@ -897,6 +897,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) +@@ -901,6 +901,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) m_page->setCanUseCredentialStorage(parameters.canUseCredentialStorage); @@ -21330,7 +21330,7 @@ index c1866a25bb9d47671108c409a8f2f4b33aaa37f7..205e1a27f2f1fe1f5ce80b2a561c6021 updateThrottleState(); } -@@ -1698,6 +1701,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet +@@ -1702,6 +1705,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet } #endif @@ -21353,7 +21353,7 @@ index c1866a25bb9d47671108c409a8f2f4b33aaa37f7..205e1a27f2f1fe1f5ce80b2a561c6021 void WebPage::loadRequest(LoadParameters&& loadParameters) { setLastNavigationWasAppInitiated(loadParameters.request.isAppInitiated()); -@@ -1946,17 +1965,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1955,17 +1974,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -21372,7 +21372,7 @@ index c1866a25bb9d47671108c409a8f2f4b33aaa37f7..205e1a27f2f1fe1f5ce80b2a561c6021 // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -1973,20 +1988,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1982,20 +1997,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -21400,7 +21400,7 @@ index c1866a25bb9d47671108c409a8f2f4b33aaa37f7..205e1a27f2f1fe1f5ce80b2a561c6021 #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -1994,7 +2007,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -2003,7 +2016,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -21408,7 +21408,7 @@ index c1866a25bb9d47671108c409a8f2f4b33aaa37f7..205e1a27f2f1fe1f5ce80b2a561c6021 void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2289,6 +2301,7 @@ void WebPage::scaleView(double scale) +@@ -2298,6 +2310,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -21416,7 +21416,7 @@ index c1866a25bb9d47671108c409a8f2f4b33aaa37f7..205e1a27f2f1fe1f5ce80b2a561c6021 scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2393,17 +2406,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2402,17 +2415,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -21435,7 +21435,7 @@ index c1866a25bb9d47671108c409a8f2f4b33aaa37f7..205e1a27f2f1fe1f5ce80b2a561c6021 } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3290,6 +3299,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3299,6 +3308,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -21540,7 +21540,7 @@ index c1866a25bb9d47671108c409a8f2f4b33aaa37f7..205e1a27f2f1fe1f5ce80b2a561c6021 #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3366,6 +3473,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3375,6 +3482,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -21552,7 +21552,7 @@ index c1866a25bb9d47671108c409a8f2f4b33aaa37f7..205e1a27f2f1fe1f5ce80b2a561c6021 void WebPage::insertNewlineInQuotedContent() { Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame(); -@@ -3604,6 +3716,7 @@ void WebPage::didCompletePageTransition() +@@ -3613,6 +3725,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -21560,7 +21560,7 @@ index c1866a25bb9d47671108c409a8f2f4b33aaa37f7..205e1a27f2f1fe1f5ce80b2a561c6021 } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4405,7 +4518,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4414,7 +4527,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -21569,7 +21569,7 @@ index c1866a25bb9d47671108c409a8f2f4b33aaa37f7..205e1a27f2f1fe1f5ce80b2a561c6021 void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6731,6 +6844,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6740,6 +6853,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -21580,7 +21580,7 @@ index c1866a25bb9d47671108c409a8f2f4b33aaa37f7..205e1a27f2f1fe1f5ce80b2a561c6021 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index 1d8fdf4462e1ac5b68c5390c617133b8d64ff72e..f66e42e7e4a578fd3aaa86a369694fcd0d5dd27e 100644 +index cb8faaf6e51784652629c00a2187cfd2c27f44ca..3e24f84fcb8012fa45153e61199dec71698944eb 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -121,6 +121,10 @@ typedef struct _AtkObject AtkObject; @@ -21618,7 +21618,7 @@ index 1d8fdf4462e1ac5b68c5390c617133b8d64ff72e..f66e42e7e4a578fd3aaa86a369694fcd #endif void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&); -@@ -1241,6 +1248,7 @@ public: +@@ -1242,6 +1249,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -21626,7 +21626,7 @@ index 1d8fdf4462e1ac5b68c5390c617133b8d64ff72e..f66e42e7e4a578fd3aaa86a369694fcd void insertNewlineInQuotedContent(); -@@ -1602,6 +1610,7 @@ private: +@@ -1603,6 +1611,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -21634,7 +21634,7 @@ index 1d8fdf4462e1ac5b68c5390c617133b8d64ff72e..f66e42e7e4a578fd3aaa86a369694fcd void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1639,6 +1648,7 @@ private: +@@ -1640,6 +1649,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -21642,7 +21642,7 @@ index 1d8fdf4462e1ac5b68c5390c617133b8d64ff72e..f66e42e7e4a578fd3aaa86a369694fcd #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1762,9 +1772,7 @@ private: +@@ -1763,9 +1773,7 @@ private: void countStringMatches(const String&, OptionSet, uint32_t maxMatchCount); void replaceMatches(const Vector& matchIndices, const String& replacementText, bool selectionOnly, CompletionHandler&&); @@ -21652,7 +21652,7 @@ index 1d8fdf4462e1ac5b68c5390c617133b8d64ff72e..f66e42e7e4a578fd3aaa86a369694fcd void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2299,6 +2307,7 @@ private: +@@ -2301,6 +2309,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -21661,10 +21661,10 @@ index 1d8fdf4462e1ac5b68c5390c617133b8d64ff72e..f66e42e7e4a578fd3aaa86a369694fcd bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 9eb71212bed7b056d6c634a93fb6e9e2f2efe519..cce9204251b044ebe1598c4e31f66b055b47038e 100644 +index 38ce4570c98a8b7a92a1038a2155a1b27ea41849..7c89884055454cb78557c687842d84bb037fe661 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -@@ -136,6 +136,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -137,6 +137,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType ConnectInspector(String targetId, Inspector::FrontendChannel::ConnectionType connectionType) DisconnectInspector(String targetId) SendMessageToTargetBackend(String targetId, String message) @@ -21672,7 +21672,7 @@ index 9eb71212bed7b056d6c634a93fb6e9e2f2efe519..cce9204251b044ebe1598c4e31f66b05 #if ENABLE(REMOTE_INSPECTOR) SetIndicating(bool indicating); -@@ -147,6 +148,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -148,6 +149,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType #endif #if !ENABLE(IOS_TOUCH_EVENTS) && ENABLE(TOUCH_EVENTS) TouchEvent(WebKit::WebTouchEvent event) @@ -21680,7 +21680,7 @@ index 9eb71212bed7b056d6c634a93fb6e9e2f2efe519..cce9204251b044ebe1598c4e31f66b05 #endif CancelPointer(WebCore::PointerID pointerId, WebCore::IntPoint documentPoint) -@@ -176,6 +178,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -177,6 +179,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType LoadURLInFrame(URL url, String referrer, WebCore::FrameIdentifier frameID) LoadDataInFrame(IPC::DataReference data, String MIMEType, String encodingName, URL baseURL, WebCore::FrameIdentifier frameID) LoadRequest(struct WebKit::LoadParameters loadParameters) @@ -21688,7 +21688,7 @@ index 9eb71212bed7b056d6c634a93fb6e9e2f2efe519..cce9204251b044ebe1598c4e31f66b05 LoadRequestWaitingForProcessLaunch(struct WebKit::LoadParameters loadParameters, URL resourceDirectoryURL, WebKit::WebPageProxyIdentifier pageID, bool checkAssumedReadAccessToResourceURL) LoadData(struct WebKit::LoadParameters loadParameters) LoadSimulatedRequestAndResponse(struct WebKit::LoadParameters loadParameters, WebCore::ResourceResponse simulatedResponse) -@@ -315,10 +318,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -316,10 +319,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType AddMIMETypeWithCustomContentProvider(String mimeType) # Drag and drop. @@ -21701,7 +21701,7 @@ index 9eb71212bed7b056d6c634a93fb6e9e2f2efe519..cce9204251b044ebe1598c4e31f66b05 PerformDragControllerAction(enum:uint8_t WebKit::DragControllerAction action, WebCore::DragData dragData, WebKit::SandboxExtension::Handle sandboxExtensionHandle, Vector sandboxExtensionsForUpload) #endif #if ENABLE(DRAG_SUPPORT) -@@ -327,6 +330,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -328,6 +331,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType DragCancelled() #endif @@ -21713,7 +21713,7 @@ index 9eb71212bed7b056d6c634a93fb6e9e2f2efe519..cce9204251b044ebe1598c4e31f66b05 RequestDragStart(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet 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 060f8e0d6e67cb84f9c3b28f0b235e666040734a..b245aa5de5c74a32ad36fad82fd0b692bfbe29db 100644 +index 1e23affedecafdbcda31038c91bf808daa883ec1..decc224db495bdef70b41e6dd938547e041583ca 100644 --- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm +++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm @@ -836,21 +836,37 @@ String WebPage::platformUserAgent(const URL&) const @@ -21805,7 +21805,7 @@ index 0cf4707d44fb20a2cb125aaf9465d1282bf84651..59a6c108a4be8ef05ae01cb594898357 } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index 462c3c27814a1296cd3d3a8d4dcc29e20d01fdbc..58d583c6a791388681bdea8810b5bff0b1695e85 100644 +index b4802ecb937023e0e33a2435e8aaf0fc125b0598..220a8ab75026ed6d94f06fef33a3b0424874ebd0 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -89,6 +89,7 @@ @@ -21841,7 +21841,7 @@ index 8987c3964a9308f2454759de7f8972215a3ae416..bcac0afeb94ed8123d1f9fb0b932c849 SetProcessDPIAware(); return true; diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -index 4b078549dc4202fbb6c272ef205ab394e3947163..baf9ec17836fea22c478c4a58368a466404095fe 100644 +index c1765cfb4e665c8ea7875c7acd45e49e1a531826..3e00256787f89479e48a261e27597d06958d9b9f 100644 --- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm @@ -4213,7 +4213,7 @@ static BOOL currentScrollIsBlit(NSView *clipView) @@ -21854,7 +21854,7 @@ index 4b078549dc4202fbb6c272ef205ab394e3947163..baf9ec17836fea22c478c4a58368a466 - (void)touch:(WebEvent *)event { diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm -index 3b10dfaffc97b4b80e3e0321334122ac6347ddff..c99fe54f99266984975ac785330afaa0f7776fde 100644 +index 96ab44b302f6349a2e301fd204a711127fedfc98..ceb3283b0d0ff7c16c6155983176cf7727ebf3ad 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm @@ -4040,7 +4040,7 @@ IGNORE_WARNINGS_END @@ -21907,7 +21907,7 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 17144e3222cab6316b4720ed1cfefc56e104685c..77ba22cfa44c2e74a7a00f6eb051ebf103e44775 100644 +index bddfb7a51e8af377eb8de05ba62508ef31d44893..c09244377c381ae7729eeb08ab8f789bad336e2e 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -5,6 +5,7 @@ WEBKIT_OPTION_BEGIN() @@ -21929,7 +21929,7 @@ index 17144e3222cab6316b4720ed1cfefc56e104685c..77ba22cfa44c2e74a7a00f6eb051ebf1 include(GStreamerDefinitions) SET_AND_EXPOSE_TO_BUILD(USE_CAIRO TRUE) -@@ -59,7 +64,7 @@ WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspecti +@@ -60,7 +65,7 @@ WEBKIT_OPTION_DEFINE(ENABLE_JOURNALD_LOG "Whether to enable journald logging" PU WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGET "Whether to enable support for the Quartz windowing target." PUBLIC ON) 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) @@ -21938,16 +21938,17 @@ index 17144e3222cab6316b4720ed1cfefc56e104685c..77ba22cfa44c2e74a7a00f6eb051ebf1 WEBKIT_OPTION_DEFINE(USE_GTK4 "Whether to enable usage of GTK4 instead of GTK3." PUBLIC OFF) WEBKIT_OPTION_DEFINE(USE_LCMS "Whether to enable support for image color management using libcms2." PUBLIC ON) WEBKIT_OPTION_DEFINE(USE_LIBHYPHEN "Whether to enable the default automatic hyphenation implementation." PUBLIC ON) -@@ -67,7 +72,7 @@ WEBKIT_OPTION_DEFINE(USE_LIBNOTIFY "Whether to enable the default web notificati +@@ -68,7 +73,8 @@ WEBKIT_OPTION_DEFINE(USE_LIBNOTIFY "Whether to enable the default web notificati WEBKIT_OPTION_DEFINE(USE_LIBSECRET "Whether to enable the persistent credential storage using libsecret." PUBLIC ON) WEBKIT_OPTION_DEFINE(USE_OPENGL_OR_ES "Whether to use OpenGL or ES." PUBLIC ON) WEBKIT_OPTION_DEFINE(USE_OPENJPEG "Whether to enable support for JPEG2000 images." PUBLIC ON) -WEBKIT_OPTION_DEFINE(USE_SOUP2 "Whether to enable usage of Soup 2 instead of Soup 3." PUBLIC OFF) +WEBKIT_OPTION_DEFINE(USE_SOUP2 "Whether to enable usage of Soup 2 instead of Soup 3." PUBLIC ON) - WEBKIT_OPTION_DEFINE(USE_SYSTEMD "Whether to enable journald logging" PUBLIC ON) ++WEBKIT_OPTION_DEFINE(USE_SYSTEMD "Whether to enable journald logging" PUBLIC ON) 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) -@@ -119,7 +124,7 @@ endif () + +@@ -119,7 +125,7 @@ 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) @@ -21956,7 +21957,7 @@ index 17144e3222cab6316b4720ed1cfefc56e104685c..77ba22cfa44c2e74a7a00f6eb051ebf1 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) -@@ -152,7 +157,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE +@@ -152,7 +158,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21964,7 +21965,7 @@ index 17144e3222cab6316b4720ed1cfefc56e104685c..77ba22cfa44c2e74a7a00f6eb051ebf1 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) -@@ -168,6 +172,17 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) +@@ -168,6 +173,17 @@ 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}) @@ -21983,12 +21984,12 @@ index 17144e3222cab6316b4720ed1cfefc56e104685c..77ba22cfa44c2e74a7a00f6eb051ebf1 # Finalize the value for all options. Do not attempt to use an option before diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake -index a36e69382b629305738ca35113fc136e16b23801..c3b528bf2e07f56dd90b033d99c49a108f56bc83 100644 +index 6fd7aaf40eccec7d5014e289a6355f2798d1324c..935b27a3afbc9bfb5d11d477f47d44fde009684c 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -3,6 +3,7 @@ include(VersioningUtils) - SET_PROJECT_VERSION(2 33 2) + SET_PROJECT_VERSION(2 35 0) +set(ENABLE_WEBKIT_LEGACY OFF) set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") @@ -22002,7 +22003,7 @@ index a36e69382b629305738ca35113fc136e16b23801..c3b528bf2e07f56dd90b033d99c49a10 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE ON) -@@ -70,15 +70,35 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE OFF) +@@ -69,16 +69,37 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBXR PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -22030,6 +22031,7 @@ index a36e69382b629305738ca35113fc136e16b23801..c3b528bf2e07f56dd90b033d99c49a10 # there is a strong reason we should support changing the value of the option, # and the option is not relevant to any other WebKit ports. WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF) + WEBKIT_OPTION_DEFINE(ENABLE_JOURNALD_LOG "Whether to enable journald logging" PUBLIC ON) -WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC ${ENABLE_DEVELOPER_MODE}) -WEBKIT_OPTION_DEFINE(USE_AVIF "Whether to enable support for AVIF images." PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES}) +WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC OFF) @@ -22038,9 +22040,10 @@ index a36e69382b629305738ca35113fc136e16b23801..c3b528bf2e07f56dd90b033d99c49a10 WEBKIT_OPTION_DEFINE(USE_OPENJPEG "Whether to enable support for JPEG2000 images." PUBLIC ON) -WEBKIT_OPTION_DEFINE(USE_SOUP2 "Whether to enable usage of Soup 2 instead of Soup 3." PUBLIC OFF) +WEBKIT_OPTION_DEFINE(USE_SOUP2 "Whether to enable usage of Soup 2 instead of Soup 3." PUBLIC ON) - WEBKIT_OPTION_DEFINE(USE_SYSTEMD "Whether to enable journald logging" PUBLIC ON) ++WEBKIT_OPTION_DEFINE(USE_SYSTEMD "Whether to enable journald logging" PUBLIC ON) WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON) + # Private options specific to the WPE port. diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake index fb99a1e511986a6a0ea6a593d0c5a225bcc26fe3..5c31cd3f0529c81d932b3adc092ea8c1bab877e0 100644 --- a/Source/cmake/OptionsWin.cmake @@ -22652,10 +22655,10 @@ index b0f26645ea360cc7e55afbfbe2ceb4e5791a0fb7..e5401df8302bb7b1950d1c92caf9ae58 list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp -index 04f1dd2028fe85ddaa5e6548bbd3857fa40648da..e802366d5759a0a6934d55537c099467c1d811b9 100644 +index 8135aaf71c61da2a39256badf7e53cd247362940..378aee5702e60a26a49e098d7cb0f3e1a1d6f04d 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp -@@ -797,6 +797,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options) +@@ -805,6 +805,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options) 0, // requestStorageAccessConfirm shouldAllowDeviceOrientationAndMotionAccess, runWebAuthenticationPanel,