diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 3f73a39efc..35d85b13e1 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1609 -Changed: yurys@chromium.org Wed 02 Feb 2022 03:31:54 PM PST +1610 +Changed: dkolesa@igalia.com Fri Feb 4 00:43:35 CET 2022 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 1b4077c042..5c972a934b 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="dd0bc728b4618f059dafab7e742f261a174c3a70" +BASE_REVISION="f522f6f875f2443ba32dc2cce3d8b0cfd97ffc77" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 437201cec7..1d49d26c6b 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 37ce753743c353d58f66118b7837c8788e48197e..b82c7c1992b841dc0846366ded69bbe51096bd37 100644 +index 788377f671399a13b0b51531e0c29c24743db821..3ecf6ef79bc3fdb97282f8a9f0bddd85f693b639 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1342,22 +1342,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1343,22 +1343,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json @@ -1925,14 +1925,13 @@ index be86666961906832f585adb43edeb381ad199222..23b1fd28ee684537fcbcc9c671e2bff8 Source/third_party/opus/src/celt Source/third_party/opus/src/include diff --git a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp -index dfe8ba87c6bed689f7f044d388b7c21b19936518..3de753ce55f0626e98d19a71c31f81f2c7b65c4c 100644 +index ca5473a62ad98bf6b4e0ceb602885645d90f7d23..d2808ac22cfa34f15662941d2dcba7abe4a80d7d 100644 --- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp +++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp -@@ -330,4 +330,23 @@ __ZN3rtc6Thread12socketserverEv - __ZN6webrtc32webrtc_sequence_checker_internal19SequenceCheckerImplC2Ev - __ZNK3rtc14RTCCertificate17GetSSLCertificateEv +@@ -332,3 +332,23 @@ __ZNK3rtc14RTCCertificate17GetSSLCertificateEv __ZTVN6webrtc30WrappingAsyncDnsResolverResultE -- + __ZN6webrtc20pixelBufferFromFrameERKNS_10VideoFrameE + __ZN6webrtc14copyVideoFrameERKNS_10VideoFrameEPh +__ZN8mkvmuxer11SegmentInfo15set_writing_appEPKc +__ZN8mkvmuxer11SegmentInfo4InitEv +__ZN8mkvmuxer7Segment10OutputCuesEb @@ -1967,7 +1966,7 @@ index 2ee75dd5ff6bb1a30bd27c28600210f70beb17f8..1ad9a018d3431aa1e877983a55578296 PUBLIC_HEADERS_FOLDER_PREFIX = /usr/local/include; INSTALL_PUBLIC_HEADER_PREFIX = $(INSTALL_PATH_PREFIX)$(PUBLIC_HEADERS_FOLDER_PREFIX); diff --git a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj -index 5354ce4e111c808b39fbd22fb5f147fedaa46726..99b5e1db2c997ce80fe07ef2e0d576b330a540a6 100644 +index 447a02d3cd2802e028ec16d549654a06adcaaae5..bf576a79f103fe43e375df9be49e0f6ea19f0e14 100644 --- a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj +++ b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj @@ -3870,6 +3870,9 @@ @@ -2024,7 +2023,7 @@ index 5354ce4e111c808b39fbd22fb5f147fedaa46726..99b5e1db2c997ce80fe07ef2e0d576b3 }; 5CD286461E6E154E0094FDC8 /* Check for Weak VTables and Externals */ = { isa = PBXShellScriptBuildPhase; -@@ -18657,6 +18674,7 @@ +@@ -18658,6 +18675,7 @@ 419C82F51FE20EB50040C30F /* audio_encoder_opus.cc in Sources */, 419C82F31FE20EB50040C30F /* audio_encoder_opus_config.cc in Sources */, 4140B8201E4E3383007409E6 /* audio_encoder_pcm.cc in Sources */, @@ -2032,7 +2031,7 @@ index 5354ce4e111c808b39fbd22fb5f147fedaa46726..99b5e1db2c997ce80fe07ef2e0d576b3 5CDD8FFE1E43CE3A00621E92 /* audio_encoder_pcm16b.cc in Sources */, 5CD285461E6A61D20094FDC8 /* audio_format.cc in Sources */, 41DDB26F212679D200296D47 /* audio_format_to_string.cc in Sources */, -@@ -19103,6 +19121,7 @@ +@@ -19104,6 +19122,7 @@ 417953DB216983910028266B /* metrics.cc in Sources */, 5CDD865E1E43B8B500621E92 /* min_max_operations.c in Sources */, 4189395B242A71F5007FDC41 /* min_video_bitrate_experiment.cc in Sources */, @@ -2040,7 +2039,7 @@ index 5354ce4e111c808b39fbd22fb5f147fedaa46726..99b5e1db2c997ce80fe07ef2e0d576b3 4131C387234B957D0028A615 /* moving_average.cc in Sources */, 41FCBB1521B1F7AA00A5DF27 /* moving_average.cc in Sources */, 5CD286101E6A64C90094FDC8 /* moving_max.cc in Sources */, -@@ -19333,6 +19352,7 @@ +@@ -19334,6 +19353,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 */, @@ -2049,7 +2048,7 @@ index 5354ce4e111c808b39fbd22fb5f147fedaa46726..99b5e1db2c997ce80fe07ef2e0d576b3 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 d56c1cce33d857391475e037b8cc4eaa7233cfad..23704ab54b8f84930b2484aba525a2fd25bbddd5 100644 +index e79c7d92d128a8668f34c32418539146331f2ece..01b4985add6381a37d6bbfe7cb44f1f20f44b3e6 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferences.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferences.yaml @@ -995,7 +995,7 @@ InspectorStartsAttached: @@ -2080,7 +2079,7 @@ index d56c1cce33d857391475e037b8cc4eaa7233cfad..23704ab54b8f84930b2484aba525a2fd type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index 7a4d36463ec550c0f3ead4a7a25d5319fef3af5e..80609cf99b6b5581c4dd1a40476e28f00c033020 100644 +index 5b4d3b625717532554f3ad72a4db45a69eca85e6..30c6a502efdbf0fe619e7ddf2239f1535078958a 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -455,7 +455,7 @@ CrossOriginOpenerPolicyEnabled: @@ -2270,10 +2269,10 @@ index 664b0e29f6ba3ce4826e5109d73f86cc9bc6adfd..95e9875d933ff7b9219b2a1d89029b8a #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index 59e5093187a96134ddb342d5ccc740fb4a6dbca0..f3e4f6d01dde966a2431cfa16515d1edbda258f0 100644 +index 760bc70fee671a73d8cb302cef9480072dbab937..f282ad28a5d857b064eca9c123ecf5fdd9da63c6 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h -@@ -219,7 +219,7 @@ +@@ -215,7 +215,7 @@ #define ENABLE_DATA_DETECTION 1 #endif @@ -2295,10 +2294,10 @@ index 3901bfb0f5479064f4e7b67c90621ff26d74b580..5b3615a871d0d7123822394c94d5ce10 if (Journald_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index a04798e3b40af4ddc2b0908e369555d540668d33..cc3a0105b4369b3e8e3f353134ce3e2d1c519afb 100644 +index 70ca32462835341f4966ada7fbe0875868788773..0266b7b3633c684ae2d6a17fcf9853b05b38b894 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h -@@ -391,7 +391,7 @@ +@@ -397,7 +397,7 @@ #define HAVE_FOUNDATION_WITH_SAME_SITE_COOKIE_SUPPORT 1 #endif @@ -2421,10 +2420,10 @@ index bd3dead9cece47e9af0cc5b4ad188d74aabb8fcb..46a89056a878c8c4f015257df69629e7 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index 410c6f4ad5b2159045d152c661b50f153468467d..6db27f1055faf2c9d36ca207314d0a466c87375e 100644 +index 33a896520f78d5b83cb84f181fa76be3e1054942..04bcc6b5170cba64c90c43a500fb3e969325bfae 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt -@@ -615,3 +615,9 @@ platform/graphics/angle/ANGLEUtilities.cpp @no-unify +@@ -617,3 +617,9 @@ platform/graphics/angle/ANGLEUtilities.cpp @no-unify platform/graphics/angle/ExtensionsGLANGLE.cpp @no-unify platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify platform/graphics/angle/TemporaryANGLESetting.cpp @no-unify @@ -2486,10 +2485,10 @@ index c4898d6db6bf06552f602c4b7f0a7267e64e44f4..7cf2e30729671a89c373870c5691d337 __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 9cbf876e258fb97cdc8a36651f4b72054fd9c643..a42613a9b94fee39404514724641242c4e8250ea 100644 +index c5f44ef04a7058b19b24c85d11d63d9454e3db0c..319dc3d3e3c49e73c9b04f9c978a3a6667584258 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5479,6 +5479,13 @@ +@@ -5485,6 +5485,13 @@ EDE3A5000C7A430600956A37 /* ColorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE3A4FF0C7A430600956A37 /* ColorMac.h */; settings = {ATTRIBUTES = (Private, ); }; }; EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEC98020AED7E170059137F /* WebCorePrefix.h */; }; EFCC6C8F20FE914400A2321B /* CanvasActivityRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -2503,7 +2502,7 @@ index 9cbf876e258fb97cdc8a36651f4b72054fd9c643..a42613a9b94fee39404514724641242c 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, ); }; }; -@@ -17716,6 +17723,14 @@ +@@ -17731,6 +17738,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 = ""; }; @@ -2518,7 +2517,7 @@ index 9cbf876e258fb97cdc8a36651f4b72054fd9c643..a42613a9b94fee39404514724641242c 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 = ""; }; -@@ -24034,7 +24049,12 @@ +@@ -24064,7 +24079,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2531,7 +2530,7 @@ index 9cbf876e258fb97cdc8a36651f4b72054fd9c643..a42613a9b94fee39404514724641242c E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -29993,6 +30013,8 @@ +@@ -30025,6 +30045,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2540,7 +2539,7 @@ index 9cbf876e258fb97cdc8a36651f4b72054fd9c643..a42613a9b94fee39404514724641242c 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -32302,6 +32324,7 @@ +@@ -32334,6 +32356,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2548,7 +2547,7 @@ index 9cbf876e258fb97cdc8a36651f4b72054fd9c643..a42613a9b94fee39404514724641242c 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -33313,6 +33336,7 @@ +@@ -33345,6 +33368,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2556,7 +2555,7 @@ index 9cbf876e258fb97cdc8a36651f4b72054fd9c643..a42613a9b94fee39404514724641242c 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -35438,6 +35462,7 @@ +@@ -35470,6 +35494,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2564,7 +2563,7 @@ index 9cbf876e258fb97cdc8a36651f4b72054fd9c643..a42613a9b94fee39404514724641242c 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -36549,6 +36574,7 @@ +@@ -36581,6 +36606,7 @@ 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, @@ -2572,7 +2571,7 @@ index 9cbf876e258fb97cdc8a36651f4b72054fd9c643..a42613a9b94fee39404514724641242c CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, CD1F9B032700323D00617EB6 /* PlatformVideoMatrixCoefficients.h in Headers */, -@@ -38582,6 +38608,7 @@ +@@ -38619,6 +38645,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2580,7 +2579,7 @@ index 9cbf876e258fb97cdc8a36651f4b72054fd9c643..a42613a9b94fee39404514724641242c 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -38653,6 +38680,7 @@ +@@ -38691,6 +38718,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2588,7 +2587,7 @@ index 9cbf876e258fb97cdc8a36651f4b72054fd9c643..a42613a9b94fee39404514724641242c 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -38701,6 +38729,7 @@ +@@ -38739,6 +38767,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2596,7 +2595,7 @@ index 9cbf876e258fb97cdc8a36651f4b72054fd9c643..a42613a9b94fee39404514724641242c DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -39233,6 +39262,7 @@ +@@ -39271,6 +39300,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2605,7 +2604,7 @@ index 9cbf876e258fb97cdc8a36651f4b72054fd9c643..a42613a9b94fee39404514724641242c 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 95db0f344fd847ccf6144260f257fc7bf996b68e..72741e339c2d4aa7f5df4f36393570d4bdc0a03c 100644 +index ed1c65b61c0eed1be35c8d2d6641887c74cafd80..ed5d78d7c073f8647311d3be6600b30c16357b2e 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -61,6 +61,7 @@ @@ -2616,7 +2615,7 @@ index 95db0f344fd847ccf6144260f257fc7bf996b68e..72741e339c2d4aa7f5df4f36393570d4 #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3616,10 +3617,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -3617,10 +3618,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (useParentData ? m_isIgnoredFromParentData.isPresentationalChildOfAriaRole : isPresentationalChildOfAriaRole()) return AccessibilityObjectInclusion::IgnoreObject; @@ -5353,7 +5352,7 @@ index 16edb3bc689b8e2dde17597b642b706c1343e1f5..f363b2ca2410f22cff8d6ad908a88527 private: diff --git a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp -index 9f9c10efd706b48e08cd26828fee8acb873ce376..89e423d712201bb2e3f1df595f6344144f8d6538 100644 +index c85b7b875b81c6da4b3ddcf60df0f330bff2acf1..2e5d880289422e432308f8f1740156b657a11016 100644 --- a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp +++ b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp @@ -307,7 +307,7 @@ void LineLayout::updateFormattingRootGeometryAndInvalidate() @@ -5401,7 +5400,7 @@ index 359b63851868423c37a10063501a4df06d9adbaa..3e5593c61d5a73eff267423080c29b2a } diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h -index c2bea6f6a69b836472c0aff7a0d7070396ba6c2b..80af07d2f4327a400c85b65b640bcfa2ab2f430a 100644 +index 123d04213f75354949837089d2065966f929c9e6..976b4266690d08df1b4defc023f720283a10b091 100644 --- a/Source/WebCore/loader/DocumentLoader.h +++ b/Source/WebCore/loader/DocumentLoader.h @@ -179,9 +179,13 @@ public: @@ -5568,7 +5567,7 @@ index 284967df462545fe06cc2eb66a2716282053f2f3..54a62a348579e54013e23f9d65c55b54 #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 16d5389dfffac3254fcef4fa79a07655dd003302..9f97272d7a67e0c655784e3ac2db67e1aa7ef51e 100644 +index 27517c22e7709eaae55123f99ee697ed6685a901..90d55bd1e045b12b1b0e7a2367978395a536b164 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -140,6 +140,7 @@ @@ -6311,7 +6310,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 f264fadbba1b035ae06d39bc0f25c8ecbfffe169..63502c3b93573ef5a8130cebf757e1f33ff706c4 100644 +index 83a50e2421ee0d0c6fcb75007a804a6edd711975..858e02caa87de9739cf03aad914617f294ac55d8 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp @@ -471,6 +471,37 @@ void Page::setOverrideViewportArguments(const std::optional& @@ -6381,10 +6380,10 @@ index f264fadbba1b035ae06d39bc0f25c8ecbfffe169..63502c3b93573ef5a8130cebf757e1f3 { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index 08f85e896998d491d3d2c9bf49457a4106587bde..12f892016a2f1f690535f263e4afe28594a9e4f5 100644 +index 8fd51eb67d1eba2ff0a9cd5881a7ce767e22abb9..0b51d4b0bfc01e93b3cffa5f1d592b8f4ffb5a84 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h -@@ -271,6 +271,9 @@ public: +@@ -273,6 +273,9 @@ public: const std::optional& overrideViewportArguments() const { return m_overrideViewportArguments; } WEBCORE_EXPORT void setOverrideViewportArguments(const std::optional&); @@ -6394,7 +6393,7 @@ index 08f85e896998d491d3d2c9bf49457a4106587bde..12f892016a2f1f690535f263e4afe285 static void refreshPlugins(bool reload); WEBCORE_EXPORT PluginData& pluginData(); void clearPluginData(); -@@ -323,6 +326,10 @@ public: +@@ -325,6 +328,10 @@ public: DragCaretController& dragCaretController() const { return *m_dragCaretController; } #if ENABLE(DRAG_SUPPORT) DragController& dragController() const { return *m_dragController; } @@ -6405,7 +6404,7 @@ index 08f85e896998d491d3d2c9bf49457a4106587bde..12f892016a2f1f690535f263e4afe285 #endif FocusController& focusController() const { return *m_focusController; } #if ENABLE(CONTEXT_MENUS) -@@ -485,6 +492,8 @@ public: +@@ -487,6 +494,8 @@ public: WEBCORE_EXPORT void effectiveAppearanceDidChange(bool useDarkAppearance, bool useElevatedUserInterfaceLevel); bool defaultUseDarkAppearance() const { return m_useDarkAppearance; } void setUseDarkAppearanceOverride(std::optional); @@ -6414,7 +6413,7 @@ index 08f85e896998d491d3d2c9bf49457a4106587bde..12f892016a2f1f690535f263e4afe285 #if ENABLE(TEXT_AUTOSIZING) float textAutosizingWidth() const { return m_textAutosizingWidth; } -@@ -888,6 +897,11 @@ public: +@@ -890,6 +899,11 @@ public: WEBCORE_EXPORT Vector> editableElementsInRect(const FloatRect&) const; @@ -6426,7 +6425,7 @@ index 08f85e896998d491d3d2c9bf49457a4106587bde..12f892016a2f1f690535f263e4afe285 #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -994,6 +1008,9 @@ private: +@@ -996,6 +1010,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -6436,7 +6435,7 @@ index 08f85e896998d491d3d2c9bf49457a4106587bde..12f892016a2f1f690535f263e4afe285 #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1073,6 +1090,7 @@ private: +@@ -1075,6 +1092,7 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6444,7 +6443,7 @@ index 08f85e896998d491d3d2c9bf49457a4106587bde..12f892016a2f1f690535f263e4afe285 #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1251,6 +1269,11 @@ private: +@@ -1253,6 +1271,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -6986,10 +6985,10 @@ index 0000000000000000000000000000000000000000..f0c3a183e5bc44bdfa4201e0db2067b4 + +#endif // ENABLE(SPEECH_SYNTHESIS) diff --git a/Source/WebCore/platform/graphics/FontCascade.h b/Source/WebCore/platform/graphics/FontCascade.h -index babe96684e7c15cb9ca9693ba3560a8aa3d2c96c..6a8f9095415441a4e253ac791e26166e5d63349d 100644 +index 24cfb7137431a77ecb01fedaa4473c69784476c3..9c1413baafa7675fd62d8eb85a267575f47c99be 100644 --- a/Source/WebCore/platform/graphics/FontCascade.h +++ b/Source/WebCore/platform/graphics/FontCascade.h -@@ -301,7 +301,8 @@ private: +@@ -304,7 +304,8 @@ private: return true; if (textRenderingMode == TextRenderingMode::OptimizeSpeed) return false; @@ -8733,7 +8732,7 @@ index 2e90534ffd8da83b7dc54d46fa7def16319bbb43..2493c00d58957751c65c37eb409fa8d6 int innerLineHeight() const override; #endif diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp -index f5b7db1603cabf8594f48c8f23a426ab972b7f39..131688cb854503eab1d51572aa52d29dc0843a7e 100644 +index a34f79bde3e081696d73a55fbf59058bf6d8f379..dd0004e8281c53877f4133a0caf4b94ef6b006b7 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp @@ -77,6 +77,11 @@ @@ -8759,7 +8758,7 @@ index f5b7db1603cabf8594f48c8f23a426ab972b7f39..131688cb854503eab1d51572aa52d29d m_networkSocketStreams.add(identifier, NetworkSocketStream::create(m_networkProcess.get(), WTFMove(url), m_sessionID, cachePartition, identifier, m_connection, WTFMove(token), acceptInsecureCertificates)); } -@@ -1008,6 +1017,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) +@@ -1011,6 +1020,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) #endif } @@ -8775,7 +8774,7 @@ index f5b7db1603cabf8594f48c8f23a426ab972b7f39..131688cb854503eab1d51572aa52d29d void NetworkConnectionToWebProcess::removeStorageAccessForFrame(FrameIdentifier frameID, PageIdentifier pageID) { diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -index 0a6e684012f399ca1f2e1e6581441c0b5b6aa08a..a97221e53302e650eb550a37605bab0251954831 100644 +index ab96657d0df4a2331040ac51fc43c06847848047..c284d1a4eb98e10f43a10acf8a776c306f3fa7fb 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h @@ -294,6 +294,8 @@ private: @@ -8801,7 +8800,7 @@ index 242835050b24970c5eac1e26bf86b5b025a80e53..7e5277d3613d45054d349ce4935202ff 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 310c6c51a309c4548c2fd0dcb99319ca9ab84ee9..1422b8acf9f21fdc6b32957412f77a539521b708 100644 +index 7c79e2a20976a139c7f667f113c48946dedd5641..9b699a12467f20f029c0f933d0e3e343f168475c 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -26,7 +26,6 @@ @@ -9006,10 +9005,10 @@ index f57a72b6bdc3382469d69adb1b1201c7a9f07a84..c501211b094312ca44f0bf92de5d6ebc void clear(); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 0a3c1b81902ce2a82a96a08aea42aa911789c1ef..d0ec4d3febee0b702b232116673d0f9b9c8c008f 100644 +index 834e5261733119e70e1ef20d177a73819feffc91..565b653f77e70e63679e9c6128539fb37e334b8c 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -@@ -735,7 +735,7 @@ void NetworkSessionCocoa::setClientAuditToken(const WebCore::AuthenticationChall +@@ -736,7 +736,7 @@ void NetworkSessionCocoa::setClientAuditToken(const WebCore::AuthenticationChall if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { sessionCocoa->setClientAuditToken(challenge); @@ -9018,7 +9017,7 @@ index 0a3c1b81902ce2a82a96a08aea42aa911789c1ef..d0ec4d3febee0b702b232116673d0f9b return completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]); NSURLSessionTaskTransactionMetrics *metrics = task._incompleteTaskMetrics.transactionMetrics.lastObject; -@@ -968,6 +968,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END +@@ -974,6 +974,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData(taskMetrics, networkDataTask->networkLoadMetrics())); @@ -9029,11 +9028,11 @@ index 0a3c1b81902ce2a82a96a08aea42aa911789c1ef..d0ec4d3febee0b702b232116673d0f9b + }]; + resourceResponse.m_httpRequestHeaderFields = WTFMove(requestHeaders); + - networkDataTask->didReceiveResponse(WTFMove(resourceResponse), negotiatedLegacyTLS, [completionHandler = makeBlockPtr(completionHandler), taskIdentifier](WebCore::PolicyAction policyAction) { + networkDataTask->didReceiveResponse(WTFMove(resourceResponse), negotiatedLegacyTLS, privateRelayed, [completionHandler = makeBlockPtr(completionHandler), taskIdentifier](WebCore::PolicyAction policyAction) { #if !LOG_DISABLED LOG(NetworkSession, "%llu didReceiveResponse completionHandler (%d)", taskIdentifier, policyAction); diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp -index 13fcc7bd48a55a093912926ba4484cf5e355132b..013327f235abf03a6411ccc034b5dcc8b1514d66 100644 +index 06ccec621a05a7c309b89e210424de7daf307136..6a433ccd3ad4dbd5d8e42c693bb80655b887d55a 100644 --- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp +++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp @@ -26,9 +26,13 @@ @@ -9047,10 +9046,10 @@ index 13fcc7bd48a55a093912926ba4484cf5e355132b..013327f235abf03a6411ccc034b5dcc8 +#include "Download.h" #include "NetworkSessionCurl.h" +#include "NetworkProcess.h" + #include "PrivateRelayed.h" #include #include - #include -@@ -41,6 +45,7 @@ +@@ -42,6 +46,7 @@ #include #include #include @@ -9058,7 +9057,7 @@ index 13fcc7bd48a55a093912926ba4484cf5e355132b..013327f235abf03a6411ccc034b5dcc8 namespace WebKit { -@@ -78,6 +83,8 @@ NetworkDataTaskCurl::NetworkDataTaskCurl(NetworkSession& session, NetworkDataTas +@@ -79,6 +84,8 @@ NetworkDataTaskCurl::NetworkDataTaskCurl(NetworkSession& session, NetworkDataTas m_curlRequest->setUserPass(m_initialCredential.user(), m_initialCredential.password()); m_curlRequest->setAuthenticationScheme(ProtectionSpace::AuthenticationScheme::HTTPBasic); } @@ -9067,7 +9066,7 @@ index 13fcc7bd48a55a093912926ba4484cf5e355132b..013327f235abf03a6411ccc034b5dcc8 m_curlRequest->start(); } -@@ -107,6 +114,9 @@ void NetworkDataTaskCurl::cancel() +@@ -108,6 +115,9 @@ void NetworkDataTaskCurl::cancel() if (m_curlRequest) m_curlRequest->cancel(); @@ -9077,7 +9076,7 @@ index 13fcc7bd48a55a093912926ba4484cf5e355132b..013327f235abf03a6411ccc034b5dcc8 } void NetworkDataTaskCurl::invalidateAndCancel() -@@ -151,6 +161,7 @@ void NetworkDataTaskCurl::curlDidReceiveResponse(CurlRequest& request, CurlRespo +@@ -152,6 +162,7 @@ void NetworkDataTaskCurl::curlDidReceiveResponse(CurlRequest& request, CurlRespo m_response = ResourceResponse(receivedResponse); m_response.setCertificateInfo(WTFMove(receivedResponse.certificateInfo)); m_response.setDeprecatedNetworkLoadMetrics(Box::create(WTFMove(receivedResponse.networkLoadMetrics))); @@ -9085,7 +9084,7 @@ index 13fcc7bd48a55a093912926ba4484cf5e355132b..013327f235abf03a6411ccc034b5dcc8 handleCookieHeaders(request.resourceRequest(), receivedResponse); -@@ -178,7 +189,12 @@ void NetworkDataTaskCurl::curlDidReceiveData(CurlRequest&, const SharedBuffer& b +@@ -179,7 +190,12 @@ void NetworkDataTaskCurl::curlDidReceiveData(CurlRequest&, const SharedBuffer& b Ref protectedThis { *this }; if (state() == State::Canceling || state() == State::Completed || (!m_client && !isDownload())) return; @@ -9099,7 +9098,7 @@ index 13fcc7bd48a55a093912926ba4484cf5e355132b..013327f235abf03a6411ccc034b5dcc8 m_client->didReceiveData(buffer); } -@@ -187,9 +203,26 @@ void NetworkDataTaskCurl::curlDidComplete(CurlRequest&, NetworkLoadMetrics&& net +@@ -188,9 +204,26 @@ void NetworkDataTaskCurl::curlDidComplete(CurlRequest&, NetworkLoadMetrics&& net if (state() == State::Canceling || state() == State::Completed || (!m_client && !isDownload())) return; @@ -9126,7 +9125,7 @@ index 13fcc7bd48a55a093912926ba4484cf5e355132b..013327f235abf03a6411ccc034b5dcc8 void NetworkDataTaskCurl::curlDidFailWithError(CurlRequest& request, ResourceError&& resourceError, CertificateInfo&& certificateInfo) { if (state() == State::Canceling || state() == State::Completed || (!m_client && !isDownload())) -@@ -200,6 +233,14 @@ void NetworkDataTaskCurl::curlDidFailWithError(CurlRequest& request, ResourceErr +@@ -201,6 +234,14 @@ void NetworkDataTaskCurl::curlDidFailWithError(CurlRequest& request, ResourceErr return; } @@ -9141,7 +9140,7 @@ index 13fcc7bd48a55a093912926ba4484cf5e355132b..013327f235abf03a6411ccc034b5dcc8 m_client->didCompleteWithError(resourceError); } -@@ -237,6 +278,19 @@ void NetworkDataTaskCurl::invokeDidReceiveResponse() +@@ -238,6 +279,19 @@ void NetworkDataTaskCurl::invokeDidReceiveResponse() case PolicyAction::Ignore: invalidateAndCancel(); break; @@ -9161,7 +9160,7 @@ index 13fcc7bd48a55a093912926ba4484cf5e355132b..013327f235abf03a6411ccc034b5dcc8 default: notImplemented(); break; -@@ -316,6 +370,8 @@ void NetworkDataTaskCurl::willPerformHTTPRedirection() +@@ -317,6 +371,8 @@ void NetworkDataTaskCurl::willPerformHTTPRedirection() m_curlRequest->setUserPass(m_initialCredential.user(), m_initialCredential.password()); m_curlRequest->setAuthenticationScheme(ProtectionSpace::AuthenticationScheme::HTTPBasic); } @@ -9208,10 +9207,10 @@ index e55864a95f7bcbc085c46628bff058573573286c..d82268c1877a29e3e9e848185e4df4e7 WebCore::ShouldRelaxThirdPartyCookieBlocking m_shouldRelaxThirdPartyCookieBlocking { WebCore::ShouldRelaxThirdPartyCookieBlocking::No }; diff --git a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp -index 60a49c6d404c52563d87fc2cd1cb22444671d1cd..6184a79c62057390aa6fa7473a4117e8428bc597 100644 +index 81d990d2b653d8e8018afdec45c79f271d4c1c9c..79e7d85c2576eb355e5cf1b5077ab66d6fdaa18c 100644 --- a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp +++ b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp -@@ -493,6 +493,8 @@ void NetworkDataTaskSoup::didSendRequest(GRefPtr&& inputStream) +@@ -494,6 +494,8 @@ void NetworkDataTaskSoup::didSendRequest(GRefPtr&& inputStream) m_networkLoadMetrics.failsTAOCheck = !passesTimingAllowOriginCheck(m_response, *origin); } @@ -9220,7 +9219,7 @@ index 60a49c6d404c52563d87fc2cd1cb22444671d1cd..6184a79c62057390aa6fa7473a4117e8 dispatchDidReceiveResponse(); } -@@ -590,6 +592,8 @@ bool NetworkDataTaskSoup::acceptCertificate(GTlsCertificate* certificate, GTlsCe +@@ -591,6 +593,8 @@ bool NetworkDataTaskSoup::acceptCertificate(GTlsCertificate* certificate, GTlsCe { ASSERT(m_soupMessage); URL url = soupURIToURL(soup_message_get_uri(m_soupMessage.get())); @@ -9229,7 +9228,7 @@ index 60a49c6d404c52563d87fc2cd1cb22444671d1cd..6184a79c62057390aa6fa7473a4117e8 auto error = static_cast(*m_session).soupNetworkSession().checkTLSErrors(url, certificate, tlsErrors); if (!error) return true; -@@ -1217,6 +1221,12 @@ WebCore::AdditionalNetworkLoadMetricsForWebInspector& NetworkDataTaskSoup::addit +@@ -1218,6 +1222,12 @@ WebCore::AdditionalNetworkLoadMetricsForWebInspector& NetworkDataTaskSoup::addit return *m_networkLoadMetrics.additionalNetworkLoadMetricsForWebInspector; } @@ -9242,7 +9241,7 @@ index 60a49c6d404c52563d87fc2cd1cb22444671d1cd..6184a79c62057390aa6fa7473a4117e8 void NetworkDataTaskSoup::didGetHeaders() { // We are a bit more conservative with the persistent credential storage than the session store, -@@ -1262,6 +1272,20 @@ void NetworkDataTaskSoup::didGetHeaders() +@@ -1263,6 +1273,20 @@ void NetworkDataTaskSoup::didGetHeaders() additionalMetrics.tlsProtocol = tlsProtocolVersionToString(soup_message_get_tls_protocol_version(m_soupMessage.get())); additionalMetrics.tlsCipher = String::fromUTF8(soup_message_get_tls_ciphersuite_name(m_soupMessage.get())); additionalMetrics.responseHeaderBytesReceived = soup_message_metrics_get_response_header_bytes_received(metrics); @@ -10181,7 +10180,7 @@ index 85d6f74114f4e7f82d9502d1b99d69098d6a49b6..6896c9756edb233dda46c7031e1af699 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index df47c786c8def624f43fc946ddc82d343229994e..473e2f048492ddd99b61093e50543f8ed074a025 100644 +index 57ef3b14eaf2c1092098ee9432f508c611e58e35..782a0547ad06f0c72d8cad1f2457d1117ad3e021 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt @@ -393,11 +393,14 @@ Shared/XR/XRDeviceProxy.cpp @@ -10229,10 +10228,10 @@ index df47c786c8def624f43fc946ddc82d343229994e..473e2f048492ddd99b61093e50543f8e UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 7bfee083fcf9227c7f5f8496d97ee8ab90e5aa1f..0fbd5c21e6cac0aeddcae4b2bde3557a1bb24ed8 100644 +index 3a72596a4d7a5cab4566277136564ba015b196cd..aecfb624b16bb5dc37b76e3c5f2b84647d5aa377 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -271,6 +271,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm +@@ -273,6 +273,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -10240,7 +10239,7 @@ index 7bfee083fcf9227c7f5f8496d97ee8ab90e5aa1f..0fbd5c21e6cac0aeddcae4b2bde3557a UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -445,6 +446,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -447,6 +448,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -10446,7 +10445,7 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0 } #endif diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp -index 509b9b25f394f6b367cbb8d687587c14d2885b60..056556f991ee15e8096c48359cda72b9058ce902 100644 +index 20a1e302ddbd2a61e3c5a2cd5ef11d35c94bffba..f682c0b9d17c47a6b9dd410e1f42c2bf0d96f6ae 100644 --- a/Source/WebKit/UIProcess/API/C/WKPage.cpp +++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp @@ -1775,6 +1775,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient @@ -11155,7 +11154,7 @@ index 78d1578f94793e9e59a3d4d2b33e79ea8530fa04..493cdadac3873508b3efa3048638e73a #endif +int webkitWebContextExistingCount(); diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp -index 10a109fb921f5dc20f08ace52595eeda55d7181a..1ff2154a7c14ef74a15c8edbba37dda7ce58fdb4 100644 +index c893e91c3971b7e771b0751e5df025d415f9ab87..41401a4f72e1eba38412075eba1ad29f59fef0ff 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp @@ -32,6 +32,7 @@ @@ -11370,10 +11369,10 @@ index 0000000000000000000000000000000000000000..9f1a0173a5641d6f158d815b8f7b9ea6 + +#endif diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp -index 8c066161aebe9517df27e9aa793da28e054f0c2c..394c068b546ed46c360123625ec4fc3c1c441b60 100644 +index 27a770ecbfc69b96d693a8662df1dbaead44d7e2..81b150bac8ca394282c5f2146ef3ce41241a8101 100644 --- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp +++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp -@@ -2537,6 +2537,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase) +@@ -2539,6 +2539,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase) #endif } @@ -12157,7 +12156,7 @@ index b0dd19a8fe284f48ce07e2da604612077619a0c3..451b5ab76b204246d0479627f44c357a #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index fc71cb3b238ee42fd9e3c07c89caf669a5c4437d..17b26bb30cfd6c0caeaa61f5a2c6c1d6a8d609f7 100644 +index cc5f6b0722c4061d53ff6405af79ef3d45b560f7..074c87276777c12b6e9a2611b02b7a02464f11b5 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm @@ -396,7 +396,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process @@ -12169,7 +12168,7 @@ index fc71cb3b238ee42fd9e3c07c89caf669a5c4437d..17b26bb30cfd6c0caeaa61f5a2c6c1d6 #endif #if PLATFORM(IOS) -@@ -698,8 +698,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -697,8 +697,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -12181,7 +12180,7 @@ index fc71cb3b238ee42fd9e3c07c89caf669a5c4437d..17b26bb30cfd6c0caeaa61f5a2c6c1d6 m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSApp queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h -index e851cab82c7429f5b946e9aba7d2d88005965620..ce66175b9cdf1e866454834cfe4eaf3f87840989 100644 +index d64a7dba42d94db24efa8f60ae499a76423d85e9..4364cae8ec64acde543be9c8ec18175fa21f1692 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h @@ -503,6 +503,9 @@ public: @@ -12195,10 +12194,10 @@ index e851cab82c7429f5b946e9aba7d2d88005965620..ce66175b9cdf1e866454834cfe4eaf3f void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -index 921e196026cc651de65cd7644c8ae22cf82a9bde..9b5c47dd840f799a88f276ccc758aeb04c75facf 100644 +index bec2ecbd2d849ab8535a1e8f96dca647e1b62631..42037cb1b4a10498430b8bd1faecf420c81fe11f 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -@@ -2645,6 +2645,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() +@@ -2644,6 +2644,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() if (!m_colorSpace) m_colorSpace = [NSColorSpace sRGBColorSpace]; } @@ -12210,7 +12209,7 @@ index 921e196026cc651de65cd7644c8ae22cf82a9bde..9b5c47dd840f799a88f276ccc758aeb0 ASSERT(m_colorSpace); return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] }; -@@ -4624,6 +4629,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu +@@ -4625,6 +4630,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu return adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions)); } @@ -12386,7 +12385,7 @@ index b23a45ff7d313317d8ba64fb430ebba3b6adef71..8419b69c5e278cf88a3ab6b98c335edd } // namespace WebKit diff --git a/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp b/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp -index 7f5868577fd5bb251bd9eb25f2edeaa225ee0845..b7a08b3876921495afc88de35960803ecdb9e2f1 100644 +index 7f5868577fd5bb251bd9eb25f2edeaa225ee0845..9894d5fcd9ee69ecdbdc5fc58a2d99779ec8794f 100644 --- a/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp +++ b/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp @@ -42,8 +42,10 @@ @@ -12404,7 +12403,7 @@ index 7f5868577fd5bb251bd9eb25f2edeaa225ee0845..b7a08b3876921495afc88de35960803e , m_request(resourceRequest) , m_originatingPage(originatingPage) , m_frameInfo(API::FrameInfo::create(FrameInfoData { frameInfoData }, originatingPage)) -+ , m_uuid(createCanonicalUUIDString()) ++ , m_uuid(createVersion4UUIDString()) { + if (auto* instrumentation = m_dataStore->downloadInstrumentation()) + instrumentation->downloadCreated(m_uuid, m_request, frameInfoData, originatingPage, this); @@ -12799,7 +12798,7 @@ index 0000000000000000000000000000000000000000..4ec8b96bbbddf8a7b042f53a8068754a +cairo_status_t cairo_image_surface_write_to_jpeg_mem(cairo_surface_t *sfc, unsigned char **data, size_t *len, int quality); diff --git a/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..d33d2423fd7ca230e40acecc581cfee611cd113c +index 0000000000000000000000000000000000000000..68f4dfb777dc4b51d4e3e2f3f849131d40dd9879 --- /dev/null +++ b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp @@ -0,0 +1,302 @@ @@ -12963,7 +12962,7 @@ index 0000000000000000000000000000000000000000..d33d2423fd7ca230e40acecc581cfee6 + if (!m_encoder) + return makeUnexpected(errorString); + -+ m_currentScreencastID = createCanonicalUUIDString(); ++ m_currentScreencastID = createVersion4UUIDString(); + +#if PLATFORM(MAC) + m_encoder->setOffsetTop(toolbarHeight); @@ -15748,7 +15747,7 @@ index 7a14cfba15c103a2d4fe263fa49d25af3c396ec2..3ee0e154349661632799057c71f1d1f1 BOOL result = ::CreateProcess(0, commandLine.data(), 0, 0, true, 0, 0, 0, &startupInfo, &processInformation); diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h -index 0fc6187a4fc034b6246bf8cd1a2bb4b88c97a9dd..e8a32c134bd00a6ae933ddd2ba43691c9439b814 100644 +index 2e5f6073c7ed8eefe6cbf847318e8e4aed40382e..0c6327776cae234141a017f33d439977bb4a8969 100644 --- a/Source/WebKit/UIProcess/PageClient.h +++ b/Source/WebKit/UIProcess/PageClient.h @@ -324,6 +324,11 @@ public: @@ -16795,7 +16794,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index c42e1cbd9beaeb0cfaae04b41c0b4f7cad970cb1..d1da4786256007849cedf1b4508af179645509cf 100644 +index e49935c325f69f343440caa0add7bffe1c005282..37aa17314a303faf69f2114fe7021f6bd3afe67f 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -248,6 +248,9 @@ @@ -17315,7 +17314,7 @@ index c42e1cbd9beaeb0cfaae04b41c0b4f7cad970cb1..d1da4786256007849cedf1b4508af179 // 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 b2577687d9f8da7823141cac7fbcc42fba2b4e85..8eb1f671ec6396971ca71142798408e5dc8ddcce 100644 +index 507eac8a9652ae0fe0a13b226deff882dec38f31..93e17bebb8f02a6cd14e45ab2934d492982b8f2b 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17512,10 +17511,10 @@ index 15cd0e3d5968bc6617ea5c4a28f017a114dab95b..c3d27602c67eb6740180dd5c679e4205 DidPerformDragOperation(bool handled) #endif diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index 66d49fac3ea64159b1c824a20fee419f70de3457..311a06964cf2ca6c1c6adbab5c59b4493031fbfd 100644 +index afc23ee53f12842193d2eaef20f25962eed73fa2..a31a99922b3f8076a3825eeeb3d8965adde790be 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp -@@ -539,6 +539,14 @@ void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkPro +@@ -539,6 +539,14 @@ void WebProcessPool::establishServiceWorkerContextConnectionToNetworkProcess(Net // Arbitrarily choose the first process pool to host the service worker process. auto* processPool = processPools()[0]; @@ -17546,7 +17545,7 @@ index 66d49fac3ea64159b1c824a20fee419f70de3457..311a06964cf2ca6c1c6adbab5c59b449 parameters.urlSchemesRegisteredAsEmptyDocument = copyToVector(m_schemesToRegisterAsEmptyDocument); parameters.urlSchemesRegisteredAsSecure = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsSecure()); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp -index 3bbe03a7dae2ed6779468332c0c45c7430bd857b..e08178580e5a890867c704a9c9193c7ff5004bec 100644 +index 057d4992418a0043d84c59d7b6e52f9e02658a71..2329d11783b07a426b39f04e1544832e8db01c93 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp @@ -143,6 +143,11 @@ HashMap& WebProcessProxy::allProcesses() @@ -17562,7 +17561,7 @@ index 3bbe03a7dae2ed6779468332c0c45c7430bd857b..e08178580e5a890867c704a9c9193c7f { return allProcesses().get(identifier); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h -index f514b9916ad4082a7f071f657378fef3ed22a831..7ff2168724c20bbacbdb597ed121985fca1201c3 100644 +index f8b795b1d343535e8092e01dbab379af33461dbe..cb4bf4fdab5aeced74e054cb81636911dbd839a7 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.h +++ b/Source/WebKit/UIProcess/WebProcessProxy.h @@ -143,6 +143,7 @@ public: @@ -18305,7 +18304,7 @@ index 0000000000000000000000000000000000000000..d0f9827544994e450e24e3f7a427c35e + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm -index 92126cdc69a7fd3cdae6aa0f4be8743e2b0c70b2..d64a10ca21bf43961ab35992763dc148378df3b3 100644 +index 0ec2088fabdf470899fd0359af5cb97e68d5f4a2..8aa97e9356a933c47e639b918e7dc702f91b91f7 100644 --- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm +++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm @@ -437,6 +437,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect) @@ -19630,10 +19629,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd40398b2d 100644 +index dc02f89412df46f85006a3460b7f4ccae85d01d1..4cc2af1d3e2257073f7810780daecce23464b44b 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1238,6 +1238,7 @@ +@@ -1242,6 +1242,7 @@ 5CABDC8722C40FED001EDE8E /* APIMessageListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CABDC8322C40FA7001EDE8E /* APIMessageListener.h */; }; 5CADDE05215046BD0067D309 /* WKWebProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C74300E21500492004BFA17 /* WKWebProcess.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5CAECB6627465AE400AB78D0 /* UnifiedSource115.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CAECB5E27465AE300AB78D0 /* UnifiedSource115.cpp */; }; @@ -19641,7 +19640,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd 5CAF7AA726F93AB00003F19E /* adattributiond.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CAF7AA526F93A950003F19E /* adattributiond.cpp */; }; 5CAFDE452130846300B1F7E1 /* _WKInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE422130843500B1F7E1 /* _WKInspector.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5CAFDE472130846A00B1F7E1 /* _WKInspectorInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE442130843600B1F7E1 /* _WKInspectorInternal.h */; }; -@@ -1933,6 +1934,18 @@ +@@ -1937,6 +1938,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 */; }; @@ -19660,9 +19659,9 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd 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 */; }; -@@ -1996,6 +2009,9 @@ - E5CBA76827A318E100DF7858 /* UnifiedSource117.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA76227A3187900DF7858 /* UnifiedSource117.cpp */; }; - E5DEFA6826F8F42600AB68DB /* PhotosUISPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E5DEFA6726F8F42600AB68DB /* PhotosUISPI.h */; }; +@@ -2007,6 +2020,9 @@ + EBA8D3B627A5E33F00CB7900 /* MockPushServiceConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = EBA8D3B027A5E33F00CB7900 /* MockPushServiceConnection.mm */; }; + EBA8D3B727A5E33F00CB7900 /* PushServiceConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = EBA8D3B127A5E33F00CB7900 /* PushServiceConnection.mm */; }; ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; }; + F303B849249A8D640031DE5C /* ScreencastEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = F303B848249A8D3A0031DE5C /* ScreencastEncoder.h */; }; + F33C7AC7249AD79C0018BE41 /* libwebrtc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F33C7AC6249AD79C0018BE41 /* libwebrtc.dylib */; }; @@ -19670,7 +19669,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd F409BA181E6E64BC009DA28E /* WKDragDestinationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */; settings = {ATTRIBUTES = (Private, ); }; }; F4299507270E234D0032298B /* StreamMessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = F4299506270E234C0032298B /* StreamMessageReceiver.h */; }; F42D634122A0EFDF00D2FB3A /* WebAutocorrectionData.h in Headers */ = {isa = PBXBuildFile; fileRef = F42D633F22A0EFD300D2FB3A /* WebAutocorrectionData.h */; }; -@@ -4899,6 +4915,7 @@ +@@ -4920,6 +4936,7 @@ 5CABDC8522C40FCC001EDE8E /* WKMessageListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMessageListener.h; sourceTree = ""; }; 5CADDE0D2151AA010067D309 /* AuthenticationChallengeDisposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallengeDisposition.h; sourceTree = ""; }; 5CAECB5E27465AE300AB78D0 /* UnifiedSource115.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource115.cpp; path = "DerivedSources/WebKit/unified-sources/UnifiedSource115.cpp"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -19678,7 +19677,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd 5CAF7AA426F93A750003F19E /* adattributiond */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = adattributiond; sourceTree = BUILT_PRODUCTS_DIR; }; 5CAF7AA526F93A950003F19E /* adattributiond.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = adattributiond.cpp; sourceTree = ""; }; 5CAF7AA626F93AA50003F19E /* adattributiond.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = adattributiond.xcconfig; sourceTree = ""; }; -@@ -6311,6 +6328,19 @@ +@@ -6332,6 +6349,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 = ""; }; @@ -19698,7 +19697,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd 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 = ""; }; -@@ -6442,6 +6472,14 @@ +@@ -6470,6 +6500,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 = ""; }; @@ -19713,7 +19712,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDragDestinationAction.h; sourceTree = ""; }; F40D1B68220BDC0F00B49A01 /* WebAutocorrectionContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WebAutocorrectionContext.h; path = ios/WebAutocorrectionContext.h; sourceTree = ""; }; F41056612130699A0092281D /* APIAttachmentCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = APIAttachmentCocoa.mm; sourceTree = ""; }; -@@ -6586,6 +6624,7 @@ +@@ -6614,6 +6652,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -19721,7 +19720,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -8655,6 +8694,7 @@ +@@ -8685,6 +8724,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -19729,7 +19728,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -9792,6 +9832,7 @@ +@@ -9831,6 +9871,7 @@ children = ( DDE992F4278D06D900F60D26 /* libWebKitAdditions.a */, 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -19737,7 +19736,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, 51F7BB7E274564A100C45A72 /* Security.framework */, -@@ -10298,6 +10339,12 @@ +@@ -10343,6 +10384,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -19750,7 +19749,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd ); path = Agents; sourceTree = ""; -@@ -10306,6 +10353,7 @@ +@@ -10351,6 +10398,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -19758,7 +19757,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -10854,6 +10902,12 @@ +@@ -10899,6 +10947,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -19771,7 +19770,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -11159,6 +11213,7 @@ +@@ -11204,6 +11258,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -19779,7 +19778,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -11747,6 +11802,11 @@ +@@ -11792,6 +11847,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -19791,7 +19790,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, 07EF07592745A8160066EA04 /* DisplayCaptureSessionManager.h */, -@@ -12663,6 +12723,7 @@ +@@ -12708,6 +12768,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -19799,7 +19798,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -12971,6 +13032,7 @@ +@@ -13018,6 +13079,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -19807,7 +19806,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -12986,6 +13048,7 @@ +@@ -13033,6 +13095,7 @@ 410F0D4C2701EFF900F96DFC /* GPUProcessConnectionInitializationParameters.h in Headers */, 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -19815,7 +19814,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -13132,6 +13195,7 @@ +@@ -13180,6 +13243,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -19823,7 +19822,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, 93085DE026E5BCFD000EC6A7 /* NetworkStorageManager.h in Headers */, -@@ -13197,6 +13261,7 @@ +@@ -13245,6 +13309,7 @@ BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -19831,7 +19830,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, 517B5F81275E97B6002DC22D /* PushAppBundle.h in Headers */, -@@ -13222,6 +13287,7 @@ +@@ -13271,6 +13336,7 @@ CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, @@ -19839,7 +19838,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -13557,6 +13623,7 @@ +@@ -13608,6 +13674,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -19847,7 +19846,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -13693,6 +13760,7 @@ +@@ -13746,6 +13813,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -19855,7 +19854,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -13746,6 +13814,7 @@ +@@ -13799,6 +13867,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -19863,7 +19862,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -13902,6 +13971,7 @@ +@@ -13955,6 +14024,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -19871,7 +19870,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -15416,6 +15486,8 @@ +@@ -15471,6 +15541,8 @@ C1A152D724E5A29A00978C8B /* HandleXPCEndpointMessages.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -19880,7 +19879,7 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */, C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */, 2984F588164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp in Sources */, -@@ -15742,6 +15814,8 @@ +@@ -15799,6 +15871,8 @@ 51F060E11654318500F3282F /* WebMDNSRegisterMessageReceiver.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -19890,10 +19889,10 @@ index 779118bd2f3e032ca87c074d2e6b0dbe549b67eb..a341f24c8b03998aed561bdce5dcdccd 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 1bd6f347eef54b00eebaa453fe778e74f877dd35..f88f8142be023270ba2194af087c36a12954d961 100644 +index d85f495a108af473849e0be7a16adcb6d7ba2157..ab6f199f645d5c0339f729d3a3f547443ada2c3d 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 +@@ -231,6 +231,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou } #endif @@ -19905,7 +19904,7 @@ index 1bd6f347eef54b00eebaa453fe778e74f877dd35..f88f8142be023270ba2194af087c36a1 if (!tryLoadingUsingURLSchemeHandler(resourceLoader, trackingParameters)) { WEBLOADERSTRATEGY_RELEASE_LOG("scheduleLoad: URL will be scheduled with the NetworkProcess"); -@@ -294,7 +299,8 @@ static void addParametersShared(const Frame* frame, NetworkResourceLoadParameter +@@ -298,7 +303,8 @@ static void addParametersShared(const Frame* frame, NetworkResourceLoadParameter } } @@ -19915,7 +19914,7 @@ index 1bd6f347eef54b00eebaa453fe778e74f877dd35..f88f8142be023270ba2194af087c36a1 { auto identifier = resourceLoader.identifier(); ASSERT(identifier); -@@ -310,7 +316,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -314,7 +320,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL RunLoop::main().dispatch([resourceLoader = Ref { resourceLoader }] { resourceLoader->didFail(resourceLoader->blockedError()); }); @@ -19924,7 +19923,7 @@ index 1bd6f347eef54b00eebaa453fe778e74f877dd35..f88f8142be023270ba2194af087c36a1 } } -@@ -320,7 +326,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -324,7 +330,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be scheduled with the NetworkProcess with priority %d, storedCredentialsPolicy %i", resourceLoader.url().string().latin1().data(), static_cast(resourceLoader.request().priority()), (int)storedCredentialsPolicy); @@ -19932,7 +19931,7 @@ index 1bd6f347eef54b00eebaa453fe778e74f877dd35..f88f8142be023270ba2194af087c36a1 loadParameters.identifier = identifier; loadParameters.webPageProxyID = trackingParameters.webPageProxyID; loadParameters.webPageID = trackingParameters.pageID; -@@ -405,14 +410,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -409,14 +414,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL if (loadParameters.options.mode != FetchOptions::Mode::Navigate) { ASSERT(loadParameters.sourceOrigin); @@ -19950,7 +19949,7 @@ index 1bd6f347eef54b00eebaa453fe778e74f877dd35..f88f8142be023270ba2194af087c36a1 loadParameters.isMainFrameNavigation = resourceLoader.frame() && resourceLoader.frame()->isMainFrame() && resourceLoader.options().mode == FetchOptions::Mode::Navigate; if (loadParameters.isMainFrameNavigation && document) -@@ -451,6 +453,17 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -455,6 +457,17 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL } ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == ClientCredentialPolicy::CannotAskClientForCredentials); @@ -19968,7 +19967,7 @@ index 1bd6f347eef54b00eebaa453fe778e74f877dd35..f88f8142be023270ba2194af087c36a1 std::optional existingNetworkResourceLoadIdentifierToResume; if (loadParameters.isMainFrameNavigation) -@@ -465,7 +478,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -469,7 +482,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL } auto loader = WebResourceLoader::create(resourceLoader, trackingParameters); @@ -19977,7 +19976,7 @@ index 1bd6f347eef54b00eebaa453fe778e74f877dd35..f88f8142be023270ba2194af087c36a1 } void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader) -@@ -872,7 +885,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier +@@ -876,7 +889,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier bool WebLoaderStrategy::isOnLine() const { @@ -19986,7 +19985,7 @@ index 1bd6f347eef54b00eebaa453fe778e74f877dd35..f88f8142be023270ba2194af087c36a1 } void WebLoaderStrategy::addOnlineStateChangeListener(Function&& listener) -@@ -892,6 +905,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet +@@ -896,6 +909,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet void WebLoaderStrategy::setOnLineState(bool isOnLine) { @@ -19998,7 +19997,7 @@ index 1bd6f347eef54b00eebaa453fe778e74f877dd35..f88f8142be023270ba2194af087c36a1 if (m_isOnLine == isOnLine) return; -@@ -900,6 +918,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) +@@ -904,6 +922,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) listener(isOnLine); } @@ -20042,10 +20041,10 @@ index 2290d987c36f68245b08fb2b86319d4d5a68e4a3..f22b3a7c855918b11582dd1ea9be00b2 } // namespace WebKit diff --git a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp -index eadd84730f11b773b0352dbaafe8ddacda876093..3d37ef89dcdd2c50bbfd15cbb9d56bcbcda3cce0 100644 +index efe2755ee12a7667bf7812f50bc8b42e5bae11fe..609082c4425ddc2b44e37c7355882b379b432998 100644 --- a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp +++ b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp -@@ -175,9 +175,6 @@ void WebResourceLoader::didReceiveResponse(const ResourceResponse& response, boo +@@ -191,9 +191,6 @@ void WebResourceLoader::didReceiveResponse(const ResourceResponse& response, Pri } m_coreLoader->didReceiveResponse(inspectorResponse, [this, protectedThis = WTFMove(protectedThis), interceptedRequestIdentifier, policyDecisionCompletionHandler = WTFMove(policyDecisionCompletionHandler), overrideData = WTFMove(overrideData)]() mutable { @@ -20055,7 +20054,7 @@ index eadd84730f11b773b0352dbaafe8ddacda876093..3d37ef89dcdd2c50bbfd15cbb9d56bcb if (!m_coreLoader || !m_coreLoader->identifier()) { m_interceptController.continueResponse(interceptedRequestIdentifier); return; -@@ -195,6 +192,8 @@ void WebResourceLoader::didReceiveResponse(const ResourceResponse& response, boo +@@ -211,6 +208,8 @@ void WebResourceLoader::didReceiveResponse(const ResourceResponse& response, Pri } }); }); @@ -20512,7 +20511,7 @@ index f127d64d005ab7b93875591b94a5899205e91579..df0de26e4dc449a0fbf93e7037444df4 uint64_t m_navigationID; }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -index 9b7a2504f5dd1f4cedd62112178ba005341a1444..fb0cea6377bf2d339ead4ace7ea4713e001bfbda 100644 +index 6548507869ceaf50d187ed693e6d917d23fd00f9..3b99c1e193987df3d7809d22880090029ef886b5 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp @@ -916,6 +916,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) @@ -20630,7 +20629,7 @@ index 9b7a2504f5dd1f4cedd62112178ba005341a1444..fb0cea6377bf2d339ead4ace7ea4713e } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3303,6 +3312,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3305,6 +3314,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -20735,7 +20734,7 @@ index 9b7a2504f5dd1f4cedd62112178ba005341a1444..fb0cea6377bf2d339ead4ace7ea4713e #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3379,6 +3486,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3381,6 +3488,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -20747,7 +20746,7 @@ index 9b7a2504f5dd1f4cedd62112178ba005341a1444..fb0cea6377bf2d339ead4ace7ea4713e void WebPage::insertNewlineInQuotedContent() { Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame(); -@@ -3617,6 +3729,7 @@ void WebPage::didCompletePageTransition() +@@ -3619,6 +3731,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -20755,7 +20754,7 @@ index 9b7a2504f5dd1f4cedd62112178ba005341a1444..fb0cea6377bf2d339ead4ace7ea4713e } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4436,7 +4549,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4439,7 +4552,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -20764,7 +20763,7 @@ index 9b7a2504f5dd1f4cedd62112178ba005341a1444..fb0cea6377bf2d339ead4ace7ea4713e void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6796,6 +6909,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6799,6 +6912,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -20775,7 +20774,7 @@ index 9b7a2504f5dd1f4cedd62112178ba005341a1444..fb0cea6377bf2d339ead4ace7ea4713e return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index 6c7923267959105d531c11e81bb3a9cad8186ea0..f637fe12945a37734eea227d60c5b05595aea212 100644 +index 67d48fed2995bc1a1171a9e995a6a7b6e7950170..1e2d18dc74d9eedef0f88904eae7cfa71cea2fee 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -122,6 +122,10 @@ typedef struct _AtkObject AtkObject; @@ -20789,7 +20788,7 @@ index 6c7923267959105d531c11e81bb3a9cad8186ea0..f637fe12945a37734eea227d60c5b055 #if PLATFORM(GTK) || PLATFORM(WPE) #include "InputMethodState.h" #endif -@@ -987,11 +991,11 @@ public: +@@ -988,11 +992,11 @@ public: void clearSelection(); void restoreSelectionInFocusedEditableElement(); @@ -20803,7 +20802,7 @@ index 6c7923267959105d531c11e81bb3a9cad8186ea0..f637fe12945a37734eea227d60c5b055 void performDragControllerAction(DragControllerAction, const WebCore::DragData&, SandboxExtension::Handle&&, Vector&&); #endif -@@ -1005,6 +1009,9 @@ public: +@@ -1006,6 +1010,9 @@ public: void didStartDrag(); void dragCancelled(); OptionSet allowedDragSourceActions() const { return m_allowedDragSourceActions; } @@ -20813,7 +20812,7 @@ index 6c7923267959105d531c11e81bb3a9cad8186ea0..f637fe12945a37734eea227d60c5b055 #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); @@ -20821,7 +20820,7 @@ index 6c7923267959105d531c11e81bb3a9cad8186ea0..f637fe12945a37734eea227d60c5b055 void insertNewlineInQuotedContent(); -@@ -1598,6 +1606,7 @@ private: +@@ -1602,6 +1610,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -20829,7 +20828,7 @@ index 6c7923267959105d531c11e81bb3a9cad8186ea0..f637fe12945a37734eea227d60c5b055 void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1635,6 +1644,7 @@ private: +@@ -1639,6 +1648,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -20837,7 +20836,7 @@ index 6c7923267959105d531c11e81bb3a9cad8186ea0..f637fe12945a37734eea227d60c5b055 #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1768,9 +1778,7 @@ private: +@@ -1772,9 +1782,7 @@ private: void requestRectForFoundTextRange(const WebFoundTextRange&, CompletionHandler&&); @@ -20847,7 +20846,7 @@ index 6c7923267959105d531c11e81bb3a9cad8186ea0..f637fe12945a37734eea227d60c5b055 void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2305,6 +2313,7 @@ private: +@@ -2309,6 +2317,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -20856,7 +20855,7 @@ index 6c7923267959105d531c11e81bb3a9cad8186ea0..f637fe12945a37734eea227d60c5b055 bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 6cce7f4b95cbb42689027f14f49e80d8464227af..3b35d5b31abfca5a77aecc7c417e10d7fecef003 100644 +index 1191837c351ea2795df9b1a5bf2a4643658e0d4e..058eed0658640b5e278ba1a04c8c388e42d5c058 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in @@ -133,6 +133,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType @@ -21000,10 +20999,10 @@ index bb512aec34506aa588a736b6dcf6b6f3b669e342..fbcad974ad70113d527f7cac688e47d5 } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index ee1434bda87b4391145c4689537096d06ae39880..0e20719bb128b968a5ca98d77f258f5961f62231 100644 +index dd8d581ac5b24d5d94062b9c65c242f0c51ec984..057cdb7f7de86946bfef599a172c69f2bcb7cfdf 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp -@@ -88,6 +88,7 @@ +@@ -89,6 +89,7 @@ #include "WebsiteData.h" #include "WebsiteDataStoreParameters.h" #include "WebsiteDataType.h" @@ -21011,7 +21010,7 @@ index ee1434bda87b4391145c4689537096d06ae39880..0e20719bb128b968a5ca98d77f258f59 #include #include #include -@@ -349,6 +350,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter +@@ -350,6 +351,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter platformInitializeProcess(parameters); updateCPULimit(); @@ -21102,12 +21101,12 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 7c12863eba8dd5106490d0e797309a727d332192..e47d35318c62091bb3694f472ed7c6d50cecbd90 100644 +index 2260d519347ff8ef62b32da566b496b61d572b10..e771bb505761f5cb705eec3dafbc25a572639a91 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -5,6 +5,7 @@ WEBKIT_OPTION_BEGIN() - SET_PROJECT_VERSION(2 35 1) + SET_PROJECT_VERSION(2 35 2) +set(ENABLE_WEBKIT_LEGACY OFF) @@ -21162,13 +21161,12 @@ index 7c12863eba8dd5106490d0e797309a727d332192..e47d35318c62091bb3694f472ed7c6d5 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) -@@ -171,6 +176,16 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) +@@ -171,6 +176,15 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_API_STATISTICS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) +# Playwright +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLICATION_MANIFEST PRIVATE ON) -+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_TRAILING_WORD PRIVATE ON) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CURSOR_VISIBILITY PRIVATE ON) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PRIVATE ON) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PRIVATE ON) @@ -21180,7 +21178,7 @@ index 7c12863eba8dd5106490d0e797309a727d332192..e47d35318c62091bb3694f472ed7c6d5 # 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 023fbaab4f707d9d133a9ea073820e2a467e4cac..dc076b170b2963cdd11db2fca8f652d08ffc41c8 100644 +index 79b46b20c0ca45536777dce7018c8619c7906452..46411c864a9ba597b4071a78ba04cb0af0b905d0 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -3,6 +3,7 @@ include(VersioningUtils) @@ -21200,13 +21198,12 @@ index 023fbaab4f707d9d133a9ea073820e2a467e4cac..dc076b170b2963cdd11db2fca8f652d0 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) -@@ -69,17 +70,36 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE ON) +@@ -69,17 +70,35 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBXR PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) +# Playwright +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLICATION_MANIFEST PRIVATE ON) -+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_TRAILING_WORD PRIVATE ON) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CURSOR_VISIBILITY PRIVATE ON) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DARK_MODE_CSS PRIVATE ON) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PRIVATE ON) @@ -21242,7 +21239,7 @@ index 023fbaab4f707d9d133a9ea073820e2a467e4cac..dc076b170b2963cdd11db2fca8f652d0 # Private options specific to the WPE port. diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake -index 04869b0d67226fb9f7951298f32f952c94cb2837..6ceb1dafd51d4f34c2f20f4f44a1dd99ca900d72 100644 +index 04869b0d67226fb9f7951298f32f952c94cb2837..dce1628048dec7c861ff9aeeaacb2c62d88431bb 100644 --- a/Source/cmake/OptionsWin.cmake +++ b/Source/cmake/OptionsWin.cmake @@ -7,8 +7,9 @@ add_definitions(-D_WINDOWS -DWINVER=0x601 -D_WIN32_WINNT=0x601) @@ -21276,13 +21273,12 @@ index 04869b0d67226fb9f7951298f32f952c94cb2837..6ceb1dafd51d4f34c2f20f4f44a1dd99 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBASSEMBLY PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PUBLIC OFF) -@@ -90,6 +88,17 @@ if (${WTF_PLATFORM_WIN_CAIRO}) +@@ -90,6 +88,16 @@ if (${WTF_PLATFORM_WIN_CAIRO}) # No support planned WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF) + # Playwright + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_CONIC_GRADIENTS PRIVATE ON) -+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_TRAILING_WORD PRIVATE ON) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DARK_MODE_CSS PRIVATE ON) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PRIVATE ON) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PRIVATE ON) @@ -21928,7 +21924,7 @@ index 2014ba2e11644b5d19f5f979d02485d488765ecc..3ab1dd0e1ae697d5c95895b8193f4ff3 list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp -index d95f685f8157e63b53f6e431b444bda6b5149767..7901e5387989322326d5f8e6a22a426c724f0df9 100644 +index 270509ce94c95a0c2c257c5437a1fb4a9c26692f..7ff81bc742cc572649afbe1b27fd2311e015b7e2 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp @@ -808,6 +808,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options) @@ -22030,10 +22026,19 @@ index 52605867b9302d1afcc56c5e9b0c54acf0827900..6edf24ab60249241ba2969531ef55f4b } diff --git a/Tools/wpe/backends/HeadlessViewBackend.cpp b/Tools/wpe/backends/HeadlessViewBackend.cpp -index 39f0e26d1bb3cd486346a400c700a9d84e99bc2e..16bc0f9bf376c530082be6f20d5e5d247ceb6816 100644 +index f648e718b51dcc4afe433c812956ea8960232b3c..b849dd178d0d463c0a8afff9bfe0b7aacb74fa67 100644 --- a/Tools/wpe/backends/HeadlessViewBackend.cpp +++ b/Tools/wpe/backends/HeadlessViewBackend.cpp -@@ -149,27 +149,24 @@ void HeadlessViewBackend::updateSnapshot(struct wpe_fdo_shm_exported_buffer* exp +@@ -52,3 +52,4 @@ void HeadlessViewBackend::dispatchFullscreenEvent() + #endif + + } // namespace WPEToolingBackends ++ +diff --git a/Tools/wpe/backends/fdo/HeadlessViewBackendFdo.cpp b/Tools/wpe/backends/fdo/HeadlessViewBackendFdo.cpp +index 4b3d262528d33800ac46e4e9fc342b11f2744979..39d72bd2c04e79b94a5c7634b6abc9b227d5c148 100644 +--- a/Tools/wpe/backends/fdo/HeadlessViewBackendFdo.cpp ++++ b/Tools/wpe/backends/fdo/HeadlessViewBackendFdo.cpp +@@ -149,27 +149,25 @@ void HeadlessViewBackend::updateSnapshot(PlatformBuffer exportedBuffer) return; } @@ -22061,7 +22066,7 @@ index 39f0e26d1bb3cd486346a400c700a9d84e99bc2e..16bc0f9bf376c530082be6f20d5e5d24 - wl_shm_buffer_begin_access(shmBuffer); auto* data = static_cast(wl_shm_buffer_get_data(shmBuffer)); -- + - for (uint32_t y = 0; y < height; ++y) { - for (uint32_t x = 0; x < width; ++x) { - buffer[bufferStride * y + 4 * x + 0] = data[stride * y + 4 * x + 0]; @@ -22075,7 +22080,7 @@ index 39f0e26d1bb3cd486346a400c700a9d84e99bc2e..16bc0f9bf376c530082be6f20d5e5d24 wl_shm_buffer_end_access(shmBuffer); } -@@ -177,7 +174,7 @@ void HeadlessViewBackend::updateSnapshot(struct wpe_fdo_shm_exported_buffer* exp +@@ -177,7 +175,7 @@ void HeadlessViewBackend::updateSnapshot(PlatformBuffer exportedBuffer) cairo_surface_destroy(m_snapshot); m_snapshot = cairo_image_surface_create_for_data(buffer, CAIRO_FORMAT_ARGB32,