diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index f148617c59..1365c5f0b0 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1592 -Changed: yurys@chromium.org Fri 07 Jan 2022 12:11:24 PM PST +1593 +Changed: yurys@chromium.org Mon 10 Jan 2022 11:36:44 PM PST diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 1dd26c4649..aa218423c9 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="0e8b8397ffef0f1b9e6f67d02739ff3e50fc0f6f" +BASE_REVISION="b9b7466dd3bb860bc4e48b100204ea07088c166d" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 49660212d9..067e5c36d5 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 f48b7ac917f9bf8450494d5ac7a54852ba3a9bf3..15e637f563d165b51713d25df8a78c302308db6c 100644 +index b98712175c9a7d9e4437ff35729a84c41ee8c64f..5b5ce85775b85502adb28fcabe4693ad59a4b8ba 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1358,22 +1358,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1341,22 +1341,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json @@ -31,10 +31,10 @@ index f48b7ac917f9bf8450494d5ac7a54852ba3a9bf3..15e637f563d165b51713d25df8a78c30 ${JAVASCRIPTCORE_DIR}/inspector/protocol/ServiceWorker.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Target.json diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make -index dee7344e6b12635ba4f90dc1faa9c00be4682d72..15d7e73a0aa248625180fecca3cf5ae6876adab4 100644 +index 8292e51ded17d08c3a7c6273003ed5d86262f030..3557cd4fdb757b1c06c67c02150351cfbc560cfe 100644 --- a/Source/JavaScriptCore/DerivedSources.make +++ b/Source/JavaScriptCore/DerivedSources.make -@@ -290,22 +290,27 @@ INSPECTOR_DOMAINS := \ +@@ -284,22 +284,27 @@ INSPECTOR_DOMAINS := \ $(JavaScriptCore)/inspector/protocol/CSS.json \ $(JavaScriptCore)/inspector/protocol/Canvas.json \ $(JavaScriptCore)/inspector/protocol/Console.json \ @@ -1912,7 +1912,7 @@ index dfe8ba87c6bed689f7f044d388b7c21b19936518..3de753ce55f0626e98d19a71c31f81f2 +_vpx_codec_version_str +_vpx_codec_vp8_cx diff --git a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig -index 09d2b903fbb47f0a1b995e9da970b394f4a74eef..6f59a25c1b8f1f69768bb2a8d4d12e91c6c2b34c 100644 +index 9acf4efd5918bc82271bc112c29d17a4babf40b3..ccb7d9aec31c97b49cb3e7472b06b11f61421cfe 100644 --- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig +++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig @@ -51,7 +51,7 @@ OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_P @@ -2038,7 +2038,7 @@ index feb5a80e0a27f12e5577582c3abdcf3c91932b1d..80392f95a6e39c4b8d314f48c4ac81ed type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index 48069370ebb2464f2e31162116cca29f59cc4667..0b165bc852fa468cbc0d6aa924d650daaf32a2f2 100644 +index 46c4093838619d40578e2d07ec61bf35e4d3eb38..a785a2890a0e012a315b17522f876c5bbb67baf2 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -457,7 +457,7 @@ CrossOriginOpenerPolicyEnabled: @@ -2206,7 +2206,7 @@ index 07ddf3854633cb5e4ca9679359c048f13395e4ab..a0be72ba35e7afa09e8ea5976ebf600b WTF_EXPORT_PRIVATE LocalTimeOffset calculateLocalTimeOffset(double utcInMilliseconds, TimeType = UTCTime); diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index 0103e1324c129aba2e876ebe0739f2787f16503e..7faf8390719e6826c99ad5a467c60e3d62e47206 100644 +index 664b0e29f6ba3ce4826e5109d73f86cc9bc6adfd..95e9875d933ff7b9219b2a1d89029b8aede0a73c 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h @@ -412,7 +412,7 @@ @@ -2228,7 +2228,7 @@ index 0103e1324c129aba2e876ebe0739f2787f16503e..7faf8390719e6826c99ad5a467c60e3d #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index 3f1cd334a7ac0894aaddd90a0a4ab0322b013317..f9042b94a52ccd223a4ec3d1bdaf8b4f8b293352 100644 +index 0213ba5bff79592226f14015534641cd0836cd62..e5cdb16cb1b126645d13b458e366f217b98bd0bd 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h @@ -224,7 +224,7 @@ @@ -2253,10 +2253,10 @@ index 3901bfb0f5479064f4e7b67c90621ff26d74b580..5b3615a871d0d7123822394c94d5ce10 if (Journald_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index db9bd84e7ed5c907bd34db09af6eb9dd0c72d058..eb996a09baa0c81d339c752bb355630c29954a3c 100644 +index 328edacb99219b8c91c44d12fe961098d4b6577c..e154d64ea24e6ca3f75d726e0e08f0cca1579a3b 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h -@@ -384,7 +384,7 @@ +@@ -395,7 +395,7 @@ #define HAVE_FOUNDATION_WITH_SAME_SITE_COOKIE_SUPPORT 1 #endif @@ -2278,7 +2278,7 @@ index f8bedf1af5d20d9c93a96af565e416bfb0df6faa..a072e5e130822d3658cbab453aef8d16 if (Journald_FOUND) diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index 49adbc24360b169eca1e3233602350964593ae62..93a727058dc3d4dd01f4890975be169894131b87 100644 +index f30720dcdf997b5738368ce54e9197fbf2ca1e8b..b800b045c6392ead8b037c5e4bd43c9144f4aad1 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make @@ -957,6 +957,10 @@ JS_BINDING_IDLS := \ @@ -2379,10 +2379,10 @@ index cfbfe4f66dbc339e68179f4ceb48a02c3c122926..66050a7c29254f73d04273510b5e0642 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index cad11d30469e842ccd74e2fedbac1d983a3e25b8..2578c8aa423dae3ffccee22a1e9ba0518c19729b 100644 +index 2c3b4f81a52f56699cbfd412dfac0943666aeae7..7042354a987b2263b62c64772dde49e4f731a8a6 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt -@@ -612,3 +612,9 @@ platform/graphics/angle/ANGLEUtilities.cpp @no-unify +@@ -611,3 +611,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 @@ -2444,10 +2444,10 @@ index 33ac35df7d3d583c86d275654cadc1caf75b079a..2697718f3a9309df08493cdf78ef0abd __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 823fd6743985d6337b5c97b7d5c9f47baffd61f2..27327a2585861d23026c7240cb460b576ee6ab54 100644 +index 8f7bcbda467a21af62abb195666e589b4762bc7a..99ba919adbdbb205772d75940ad4ebffb2b673e9 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5462,6 +5462,13 @@ +@@ -5469,6 +5469,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, ); }; }; @@ -2461,7 +2461,7 @@ index 823fd6743985d6337b5c97b7d5c9f47baffd61f2..27327a2585861d23026c7240cb460b57 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, ); }; }; -@@ -17648,6 +17655,14 @@ +@@ -17666,6 +17673,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 = ""; }; @@ -2476,7 +2476,7 @@ index 823fd6743985d6337b5c97b7d5c9f47baffd61f2..27327a2585861d23026c7240cb460b57 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 = ""; }; -@@ -23939,7 +23954,12 @@ +@@ -23967,7 +23982,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2489,7 +2489,7 @@ index 823fd6743985d6337b5c97b7d5c9f47baffd61f2..27327a2585861d23026c7240cb460b57 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -29887,6 +29907,8 @@ +@@ -29917,6 +29937,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2498,7 +2498,7 @@ index 823fd6743985d6337b5c97b7d5c9f47baffd61f2..27327a2585861d23026c7240cb460b57 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -32197,6 +32219,7 @@ +@@ -32227,6 +32249,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2506,7 +2506,7 @@ index 823fd6743985d6337b5c97b7d5c9f47baffd61f2..27327a2585861d23026c7240cb460b57 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -33215,6 +33238,7 @@ +@@ -33245,6 +33268,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2514,7 +2514,7 @@ index 823fd6743985d6337b5c97b7d5c9f47baffd61f2..27327a2585861d23026c7240cb460b57 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -35338,6 +35362,7 @@ +@@ -35371,6 +35395,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2522,15 +2522,15 @@ index 823fd6743985d6337b5c97b7d5c9f47baffd61f2..27327a2585861d23026c7240cb460b57 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -36442,6 +36467,7 @@ - 1AD8F81B11CAB9E900E93E54 /* PlatformStrategies.h in Headers */, +@@ -36480,6 +36505,7 @@ 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, + CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, + F050E16823AC9C080011CE47 /* PlatformTouchEvent.h in Headers */, CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, CD1F9B032700323D00617EB6 /* PlatformVideoMatrixCoefficients.h in Headers */, -@@ -38471,6 +38497,7 @@ +@@ -38509,6 +38535,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2538,7 +2538,7 @@ index 823fd6743985d6337b5c97b7d5c9f47baffd61f2..27327a2585861d23026c7240cb460b57 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -38541,6 +38568,7 @@ +@@ -38579,6 +38606,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2546,7 +2546,7 @@ index 823fd6743985d6337b5c97b7d5c9f47baffd61f2..27327a2585861d23026c7240cb460b57 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -38589,6 +38617,7 @@ +@@ -38627,6 +38655,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2554,7 +2554,7 @@ index 823fd6743985d6337b5c97b7d5c9f47baffd61f2..27327a2585861d23026c7240cb460b57 DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -39121,6 +39150,7 @@ +@@ -39159,6 +39188,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2563,7 +2563,7 @@ index 823fd6743985d6337b5c97b7d5c9f47baffd61f2..27327a2585861d23026c7240cb460b57 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 1dccd86aba239cd93d102e0fb492626e5fb49eb6..804dd8dde6ae557c8abcf7e290a50540c0f2013d 100644 +index 4ef813a55621ff69f282e91d93977999bcbe90e7..41dcdd3e240d95bad6a399620c62b7b9f4d7a941 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -61,6 +61,7 @@ @@ -2574,7 +2574,7 @@ index 1dccd86aba239cd93d102e0fb492626e5fb49eb6..804dd8dde6ae557c8abcf7e290a50540 #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3540,10 +3541,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -3554,10 +3555,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (useParentData ? m_isIgnoredFromParentData.isPresentationalChildOfAriaRole : isPresentationalChildOfAriaRole()) return AccessibilityObjectInclusion::IgnoreObject; @@ -2936,7 +2936,7 @@ index f6fec7cfbcbd2d7fba30bdd3138e0edfb3f69054..519786c307944a5ca4ba468513ba257b } // namespace WebCore diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp -index 5c5bb2aea839918b069775881ce3a369a428e5b9..7ca973a49f21318f13d9d13d6be5cdd5e02c3785 100644 +index 3c978e3f4421cf35a2061dfce0d1e0aae511349a..065b18a11d25066139aae51b8c534b9020cbf108 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.cpp +++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp @@ -572,6 +572,13 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents& i @@ -3068,7 +3068,7 @@ index 5c5bb2aea839918b069775881ce3a369a428e5b9..7ca973a49f21318f13d9d13d6be5cdd5 { if (is(context)) diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h -index d2957810d8382c9351d5a93f144aed1493bcc651..8669933013d7972e355eacc358646d65f43e223f 100644 +index 82acced20cfd5131b2502f099a9c4fa2fdd616eb..af1f80b79646bee52e19af88e84efc5d2f488e21 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.h +++ b/Source/WebCore/inspector/InspectorInstrumentation.h @@ -31,6 +31,7 @@ @@ -3104,7 +3104,7 @@ index d2957810d8382c9351d5a93f144aed1493bcc651..8669933013d7972e355eacc358646d65 static void willSendRequest(Frame*, ResourceLoaderIdentifier, DocumentLoader*, ResourceRequest&, const ResourceResponse& redirectResponse, const CachedResource*); @@ -196,6 +200,7 @@ public: - static void didReceiveData(Frame*, ResourceLoaderIdentifier, const uint8_t* data, int dataLength, int encodedDataLength); + static void didReceiveData(Frame*, ResourceLoaderIdentifier, const SharedBuffer&, int encodedDataLength); static void didFinishLoading(Frame*, DocumentLoader*, ResourceLoaderIdentifier, const NetworkLoadMetrics&, ResourceLoader*); static void didFailLoading(Frame*, DocumentLoader*, ResourceLoaderIdentifier, const ResourceError&); + static void didReceiveMainResourceError(Frame&, const ResourceError&); @@ -3155,7 +3155,7 @@ index d2957810d8382c9351d5a93f144aed1493bcc651..8669933013d7972e355eacc358646d65 static void willSendRequestImpl(InstrumentingAgents&, ResourceLoaderIdentifier, DocumentLoader*, ResourceRequest&, const ResourceResponse& redirectResponse, const CachedResource*); @@ -417,6 +431,7 @@ private: - static void didReceiveDataImpl(InstrumentingAgents&, ResourceLoaderIdentifier, const uint8_t* data, int dataLength, int encodedDataLength); + static void didReceiveDataImpl(InstrumentingAgents&, ResourceLoaderIdentifier, const SharedBuffer&, int encodedDataLength); static void didFinishLoadingImpl(InstrumentingAgents&, ResourceLoaderIdentifier, DocumentLoader*, const NetworkLoadMetrics&, ResourceLoader*); static void didFailLoadingImpl(InstrumentingAgents&, ResourceLoaderIdentifier, DocumentLoader*, const ResourceError&); + static void didReceiveMainResourceErrorImpl(InstrumentingAgents&, Frame&, const ResourceError&); @@ -3202,15 +3202,6 @@ index d2957810d8382c9351d5a93f144aed1493bcc651..8669933013d7972e355eacc358646d65 inline void InspectorInstrumentation::applyEmulatedMedia(Frame& frame, String& media) { FAST_RETURN_IF_NO_FRONTENDS(void()); -@@ -1081,7 +1109,7 @@ inline void InspectorInstrumentation::didReceiveThreadableLoaderResponse(Documen - if (auto* agents = instrumentingAgents(documentThreadableLoader.document())) - didReceiveThreadableLoaderResponseImpl(*agents, documentThreadableLoader, identifier); - } -- -+ - inline void InspectorInstrumentation::didReceiveData(Frame* frame, ResourceLoaderIdentifier identifier, const uint8_t* data, int dataLength, int encodedDataLength) - { - FAST_RETURN_IF_NO_FRONTENDS(void()); @@ -1119,6 +1147,13 @@ inline void InspectorInstrumentation::didFailLoading(WorkerOrWorkletGlobalScope& didFailLoadingImpl(instrumentingAgents(globalScope), identifier, nullptr, error); } @@ -3691,7 +3682,7 @@ index 3386cb879f1178c1b9635775c9a0e864f5b94c52..d2350182f5f061855e8ca172779ad60e class Page; class SecurityOrigin; diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp -index 3ceb4b47f1068a0afeaf00f179c2800c476bd6b1..b32967718d63a9c39826eefc98c28978b183e8d9 100644 +index 0c2970e838a7015cc9ec65bb5cd8ed48046902ca..7b75363b20d5ca7ad1a8b50db9325cc7e9e153dc 100644 --- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp @@ -45,6 +45,7 @@ @@ -3710,7 +3701,7 @@ index 3ceb4b47f1068a0afeaf00f179c2800c476bd6b1..b32967718d63a9c39826eefc98c28978 #include "Page.h" #include "PlatformStrategies.h" #include "ProgressTracker.h" -@@ -307,8 +309,8 @@ static Ref buildObjectForResourceRequest(const Resou +@@ -304,8 +306,8 @@ static Ref buildObjectForResourceRequest(const Resou .setHeaders(buildObjectForHeaders(request.httpHeaderFields())) .release(); if (request.httpBody() && !request.httpBody()->isEmpty()) { @@ -3721,7 +3712,7 @@ index 3ceb4b47f1068a0afeaf00f179c2800c476bd6b1..b32967718d63a9c39826eefc98c28978 } return requestObject; } -@@ -353,6 +355,8 @@ RefPtr InspectorNetworkAgent::buildObjectForResourc +@@ -350,6 +352,8 @@ RefPtr InspectorNetworkAgent::buildObjectForResourc .setSource(responseSource(response.source())) .release(); @@ -3730,7 +3721,7 @@ index 3ceb4b47f1068a0afeaf00f179c2800c476bd6b1..b32967718d63a9c39826eefc98c28978 if (resourceLoader) { auto* metrics = response.deprecatedNetworkLoadMetricsOrNull(); responseObject->setTiming(buildObjectForTiming(metrics ? *metrics : NetworkLoadMetrics::emptyMetrics(), *resourceLoader)); -@@ -490,9 +494,15 @@ static InspectorPageAgent::ResourceType resourceTypeForLoadType(InspectorInstrum +@@ -487,9 +491,15 @@ static InspectorPageAgent::ResourceType resourceTypeForLoadType(InspectorInstrum void InspectorNetworkAgent::willSendRequest(ResourceLoaderIdentifier identifier, DocumentLoader* loader, ResourceRequest& request, const ResourceResponse& redirectResponse, const CachedResource* cachedResource) { @@ -3749,7 +3740,7 @@ index 3ceb4b47f1068a0afeaf00f179c2800c476bd6b1..b32967718d63a9c39826eefc98c28978 } void InspectorNetworkAgent::willSendRequestOfType(ResourceLoaderIdentifier identifier, DocumentLoader* loader, ResourceRequest& request, InspectorInstrumentation::LoadType loadType) -@@ -1190,6 +1200,9 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptWithRequest(const +@@ -1186,6 +1196,9 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptWithRequest(const return makeUnexpected("Missing pending intercept request for given requestId"_s); auto& loader = *pendingRequest->m_loader; @@ -3759,7 +3750,7 @@ index 3ceb4b47f1068a0afeaf00f179c2800c476bd6b1..b32967718d63a9c39826eefc98c28978 ResourceRequest request = loader.request(); if (!!url) request.setURL(URL({ }, url)); -@@ -1289,14 +1302,25 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptRequestWithRespons +@@ -1285,14 +1298,25 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptRequestWithRespons response.setHTTPStatusCode(status); response.setHTTPStatusText(statusText); HTTPHeaderMap explicitHeaders; @@ -3775,18 +3766,19 @@ index 3ceb4b47f1068a0afeaf00f179c2800c476bd6b1..b32967718d63a9c39826eefc98c28978 } response.setHTTPHeaderFields(WTFMove(explicitHeaders)); response.setHTTPHeaderField(HTTPHeaderName::ContentType, response.mimeType()); +- loader->didReceiveResponse(response, [loader, buffer = data.releaseNonNull()]() { + + auto* frame = loader->frame(); + if (!setCookieValue.isEmpty() && frame && frame->page()) + frame->page()->cookieJar().setCookieFromResponse(*loader.get(), setCookieValue); + - loader->didReceiveResponse(response, [loader, buffer = data.releaseNonNull()]() mutable { ++ loader->didReceiveResponse(response, [loader, buffer = data.releaseNonNull()]() mutable { + if (loader->reachedTerminalState()) + return; if (buffer->size()) - loader->didReceiveBuffer(WTFMove(buffer), buffer->size(), DataPayloadWholeResource); + loader->didReceiveData(buffer, buffer->size(), DataPayloadWholeResource); loader->didFinishLoading(NetworkLoadMetrics()); -@@ -1337,6 +1361,12 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptRequestWithError(c +@@ -1333,6 +1357,12 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptRequestWithError(c return { }; } @@ -3799,7 +3791,7 @@ index 3ceb4b47f1068a0afeaf00f179c2800c476bd6b1..b32967718d63a9c39826eefc98c28978 bool InspectorNetworkAgent::shouldTreatAsText(const String& mimeType) { return startsWithLettersIgnoringASCIICase(mimeType, "text/") -@@ -1378,6 +1408,12 @@ std::optional InspectorNetworkAgent::textContentForCachedResource(Cached +@@ -1374,6 +1404,12 @@ std::optional InspectorNetworkAgent::textContentForCachedResource(Cached return std::nullopt; } @@ -3813,7 +3805,7 @@ index 3ceb4b47f1068a0afeaf00f179c2800c476bd6b1..b32967718d63a9c39826eefc98c28978 { ASSERT(result); diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.h b/Source/WebCore/inspector/agents/InspectorNetworkAgent.h -index 6bcd87ddcd8b0441308d1d01eca6b0e6da1413d4..a855687249c48266331e7a2db61cc08d0a3d6601 100644 +index 72f423ff61277eef4bd356328c46d3bd9131ff65..ede5b6605b1e661b9d5d73e02fe6ae4c1a2fa419 100644 --- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.h +++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.h @@ -34,6 +34,8 @@ @@ -5319,7 +5311,7 @@ index 16edb3bc689b8e2dde17597b642b706c1343e1f5..f363b2ca2410f22cff8d6ad908a88527 private: diff --git a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp -index 657c7e038706cc3181acf2fd0fd1137d5b7c42d7..c641675dad3fa7319526865facc97b3a1c041a86 100644 +index f1ea196876b22deafe196f6558a8e9779421ebd1..cb10cdd881060fa744cda9d3080d28b827cc291f 100644 --- a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp +++ b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp @@ -307,7 +307,7 @@ void LineLayout::updateFormattingRootGeometryAndInvalidate() @@ -5354,10 +5346,10 @@ 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 6bf3ac297ec6b263a078640bcf3ad5779db0fedb..bca7ac699a84d8eb0e76e57081b39a5edc9bbbec 100644 +index 32c88b5d36db07389b7fc60384ae2c671c818091..2d7eea17ea835dd53e791f1445485d6103fa8106 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp -@@ -1473,8 +1473,6 @@ void DocumentLoader::detachFromFrame() +@@ -1456,8 +1456,6 @@ void DocumentLoader::detachFromFrame() if (!m_frame) return; @@ -5367,10 +5359,10 @@ index 6bf3ac297ec6b263a078640bcf3ad5779db0fedb..bca7ac699a84d8eb0e76e57081b39a5e } diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h -index b46981d750b25c1fd307f16fda74b7ee306a4c39..a48ccb58b7fb1be21b601646ffdf7a7596a7a115 100644 +index 28e28a688ae6b57e0f0d14c4e7a0c2558cb67e41..67dd3394a343a6e21faeb8b1965178e6efaea103 100644 --- a/Source/WebCore/loader/DocumentLoader.h +++ b/Source/WebCore/loader/DocumentLoader.h -@@ -178,9 +178,13 @@ public: +@@ -179,9 +179,13 @@ public: WEBCORE_EXPORT virtual void detachFromFrame(); @@ -5385,7 +5377,7 @@ index b46981d750b25c1fd307f16fda74b7ee306a4c39..a48ccb58b7fb1be21b601646ffdf7a75 DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index fdc97dc462c87526aa188f7968d60a0c83d680d9..211d323fc7b359ffa3c8431af2bdc1d83565a13d 100644 +index 59f2bd88796a64277fa3ae492288f9e50682a1fd..a7cb63e974647f5d3c4db5d5c10c645572bea510 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp @@ -1154,6 +1154,7 @@ void FrameLoader::loadInSameDocument(const URL& url, SerializedScriptValue* stat @@ -5414,7 +5406,7 @@ index fdc97dc462c87526aa188f7968d60a0c83d680d9..211d323fc7b359ffa3c8431af2bdc1d8 RefPtr oldDocumentLoader = m_documentLoader; NavigationAction action { *m_frame.document(), loader->request(), InitiatedByMainFrame::Unknown, policyChecker().loadType(), isFormSubmission }; -@@ -2796,12 +2801,17 @@ String FrameLoader::userAgent(const URL& url) const +@@ -2795,12 +2800,17 @@ String FrameLoader::userAgent(const URL& url) const String FrameLoader::navigatorPlatform() const { @@ -5486,7 +5478,7 @@ index 29d2e3f46140aaa51160e6a28562f370e371eb21..676ddc9369050c19454fbf5faffac2b2 virtual bool shouldPerformSecurityChecks() const { return false; } virtual bool havePerformedSecurityChecks(const ResourceResponse&) const { return false; } diff --git a/Source/WebCore/loader/PolicyChecker.cpp b/Source/WebCore/loader/PolicyChecker.cpp -index d0805795af21d39fc6858d4ac0168745f011fec4..34db61fe02ea27453f2e4646415a97bf0fcb647a 100644 +index c3fbb569999a0667188eabe1a460e6f076684f0d..06fc4aa4b23661befa9e689a8010c6826826eb2d 100644 --- a/Source/WebCore/loader/PolicyChecker.cpp +++ b/Source/WebCore/loader/PolicyChecker.cpp @@ -46,6 +46,7 @@ @@ -5567,7 +5559,7 @@ index 352e03f0c416b63800e71429e8c28ae3cdc26093..db1391b66afcfbc2299eefbdee22848e #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 8e4e100a46e3985ac3ace014328ee8a8b0a9b152..f3fbe03a72ecb6b5b921ceb5e3d7d979de3a85b7 100644 +index 16d5389dfffac3254fcef4fa79a07655dd003302..9f97272d7a67e0c655784e3ac2db67e1aa7ef51e 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -140,6 +140,7 @@ @@ -5760,7 +5752,7 @@ index 6b359e7556a2d6a1485e04e8c20fa5f470c5a04a..4eda11b09ed371ff7bafd6d6f37a96b5 bool m_mouseDownMayStartDrag { false }; bool m_dragMayStartSelectionInstead { false }; diff --git a/Source/WebCore/page/EventSource.cpp b/Source/WebCore/page/EventSource.cpp -index 602631bb7cd10860b1a3121043c97d8efe44761d..867320c576201d35124a186ac60c2927d9511afb 100644 +index 3c49571e419dd0ae9e6b7662d2129ab58b5e74d0..6a2e4e1fcf6fb1de0e4a6fbb26d8d8c6b7c99a0f 100644 --- a/Source/WebCore/page/EventSource.cpp +++ b/Source/WebCore/page/EventSource.cpp @@ -36,6 +36,7 @@ @@ -5771,7 +5763,7 @@ index 602631bb7cd10860b1a3121043c97d8efe44761d..867320c576201d35124a186ac60c2927 #include "MessageEvent.h" #include "ResourceError.h" #include "ResourceRequest.h" -@@ -94,6 +95,7 @@ void EventSource::connect() +@@ -95,6 +96,7 @@ void EventSource::connect() ASSERT(!m_requestInFlight); ResourceRequest request { m_url }; @@ -6310,10 +6302,10 @@ 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 3fb2b67cf2b549d24a8379f81842629399b1afb1..ecd4557ae4f50e335ee42de68972a693110f75a7 100644 +index b5392dc379c13aa3c67e35b2ca66c586bb9bb07a..55cdb3633a2c365693ce00642b18ce4212f492ab 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp -@@ -472,6 +472,37 @@ void Page::setOverrideViewportArguments(const std::optional& +@@ -470,6 +470,37 @@ void Page::setOverrideViewportArguments(const std::optional& document->updateViewportArguments(); } @@ -6351,7 +6343,7 @@ index 3fb2b67cf2b549d24a8379f81842629399b1afb1..ecd4557ae4f50e335ee42de68972a693 ScrollingCoordinator* Page::scrollingCoordinator() { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { -@@ -1307,10 +1338,6 @@ void Page::didCommitLoad() +@@ -1305,10 +1336,6 @@ void Page::didCommitLoad() m_isEditableRegionEnabled = false; #endif @@ -6362,7 +6354,7 @@ index 3fb2b67cf2b549d24a8379f81842629399b1afb1..ecd4557ae4f50e335ee42de68972a693 resetSeenPlugins(); resetSeenMediaEngines(); -@@ -3326,6 +3353,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3332,6 +3359,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -6380,10 +6372,10 @@ index 3fb2b67cf2b549d24a8379f81842629399b1afb1..ecd4557ae4f50e335ee42de68972a693 { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index d6d5ae2c56644e253898a04a0f9cb3ccaa536af2..a192815caa8bf7bab29877be1b5305724ff1658f 100644 +index bdf0034e6b4246f5ca47a9ce88054cbfc1dfa392..af4aa68217b00d56e58a378affbe281dd2f2a722 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h -@@ -272,6 +272,9 @@ public: +@@ -271,6 +271,9 @@ public: const std::optional& overrideViewportArguments() const { return m_overrideViewportArguments; } WEBCORE_EXPORT void setOverrideViewportArguments(const std::optional&); @@ -6393,7 +6385,7 @@ index d6d5ae2c56644e253898a04a0f9cb3ccaa536af2..a192815caa8bf7bab29877be1b530572 static void refreshPlugins(bool reload); WEBCORE_EXPORT PluginData& pluginData(); void clearPluginData(); -@@ -326,6 +329,10 @@ public: +@@ -323,6 +326,10 @@ public: DragCaretController& dragCaretController() const { return *m_dragCaretController; } #if ENABLE(DRAG_SUPPORT) DragController& dragController() const { return *m_dragController; } @@ -6404,7 +6396,7 @@ index d6d5ae2c56644e253898a04a0f9cb3ccaa536af2..a192815caa8bf7bab29877be1b530572 #endif FocusController& focusController() const { return *m_focusController; } #if ENABLE(CONTEXT_MENUS) -@@ -486,6 +493,8 @@ public: +@@ -483,6 +490,8 @@ public: WEBCORE_EXPORT void effectiveAppearanceDidChange(bool useDarkAppearance, bool useElevatedUserInterfaceLevel); bool defaultUseDarkAppearance() const { return m_useDarkAppearance; } void setUseDarkAppearanceOverride(std::optional); @@ -6413,7 +6405,7 @@ index d6d5ae2c56644e253898a04a0f9cb3ccaa536af2..a192815caa8bf7bab29877be1b530572 #if ENABLE(TEXT_AUTOSIZING) float textAutosizingWidth() const { return m_textAutosizingWidth; } -@@ -886,6 +895,11 @@ public: +@@ -884,6 +893,11 @@ public: WEBCORE_EXPORT Vector> editableElementsInRect(const FloatRect&) const; @@ -6425,7 +6417,7 @@ index d6d5ae2c56644e253898a04a0f9cb3ccaa536af2..a192815caa8bf7bab29877be1b530572 #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -986,6 +1000,9 @@ private: +@@ -984,6 +998,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -6435,7 +6427,7 @@ index d6d5ae2c56644e253898a04a0f9cb3ccaa536af2..a192815caa8bf7bab29877be1b530572 #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1065,6 +1082,7 @@ private: +@@ -1063,6 +1080,7 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6443,7 +6435,7 @@ index d6d5ae2c56644e253898a04a0f9cb3ccaa536af2..a192815caa8bf7bab29877be1b530572 #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1239,6 +1257,11 @@ private: +@@ -1237,6 +1255,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -6568,21 +6560,8 @@ index 7ac11c8289347e3a2f3e7316cf9e32932b9544ed..764b2d4fe36ac2e5588bd22595424ac1 return static_cast(screenAvailableRect(frame->view()).width()); } -diff --git a/Source/WebCore/page/SocketProvider.cpp b/Source/WebCore/page/SocketProvider.cpp -index 3bec0aef174336939838fb1069fffbcb9f3d5604..566ef3806be3c5ccf1bb951251c2a90dba7071a3 100644 ---- a/Source/WebCore/page/SocketProvider.cpp -+++ b/Source/WebCore/page/SocketProvider.cpp -@@ -33,7 +33,7 @@ namespace WebCore { - - Ref SocketProvider::createSocketStreamHandle(const URL& url, SocketStreamHandleClient& client, WebSocketIdentifier, PAL::SessionID sessionID, const String& credentialPartition, const StorageSessionProvider* provider) - { -- return SocketStreamHandleImpl::create(url, client, sessionID, credentialPartition, { }, provider); -+ return SocketStreamHandleImpl::create(url, false, client, sessionID, credentialPartition, { }, provider); - } - - RefPtr SocketProvider::createWebSocketChannel(Document&, WebSocketChannelClient&) diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp -index e4209bca7749d9b0c2f95afbdd2a9f28387dd371..1501490f77da0eefd409f7f38f33630516560a6b 100644 +index 2100768446bd3854b40b6450f20be5ae253dc8a8..5817d653dd031df24a406d95200fae445013acf9 100644 --- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp @@ -294,6 +294,8 @@ bool ContentSecurityPolicy::protocolMatchesSelf(const URL& url) const @@ -6899,7 +6878,7 @@ index be373f080140728d3e0bfc1e7db9f163ed3aedc8..12f49cdf02ec892acef95e524e72929c #endif diff --git a/Source/WebCore/platform/ScrollableArea.h b/Source/WebCore/platform/ScrollableArea.h -index 1acdf55bbef3d3fa5942a4efa6bdcbfb3cfaab08..6c9d2ef0691ea6eb6d86dc0d5aceb53881410481 100644 +index a36e198c695b1b8465ac050fe1c34a68e1e985ae..ebed9d692157d1e310568eb19dda68e4addc0d32 100644 --- a/Source/WebCore/platform/ScrollableArea.h +++ b/Source/WebCore/platform/ScrollableArea.h @@ -103,7 +103,7 @@ public: @@ -7135,6 +7114,18 @@ index 70a084bd9eb6375bcec4ac89b95092aad8c146b4..6bc9698129073a49e474537905600743 namespace WebCore { +diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h +index d82cd3e18ece04761d6ad4ec2d52e2ad9dc38468..6f39094ba425855b7d701f224708748d9ae294a4 100644 +--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h ++++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h +@@ -389,7 +389,6 @@ public: + { + return m_iter == other.m_iter && m_done == other.m_done; + } +- bool operator!=(const iterator& other) { return !(*this == other); } + + private: + GstIterator* m_iter; diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp index 68b6cd3f524bf6a09eaf7fd6848fbac1da733ab3..991d7f20c21290db6732f02f8455974167e34bcf 100644 --- a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp @@ -7149,10 +7140,10 @@ index 68b6cd3f524bf6a09eaf7fd6848fbac1da733ab3..991d7f20c21290db6732f02f84559741 #include "ExtensionsGLOpenGL.h" #include "IntRect.h" diff --git a/Source/WebCore/platform/graphics/win/ComplexTextControllerUniscribe.cpp b/Source/WebCore/platform/graphics/win/ComplexTextControllerUniscribe.cpp -index 774a52a28693bc51dde10a0875ea379afb06fd3c..cd714a7298fe4f5d2c9b580697a5c4cd22d25870 100644 +index 6d6820fc22f9a7102bbdad6c4b5e3e7e9645f66c..f44797b8c197bf1b3daaa9b59dad2a8e250c4791 100644 --- a/Source/WebCore/platform/graphics/win/ComplexTextControllerUniscribe.cpp +++ b/Source/WebCore/platform/graphics/win/ComplexTextControllerUniscribe.cpp -@@ -172,6 +172,33 @@ static Vector stringIndicesFromClusters(const Vector& clusters, +@@ -170,6 +170,33 @@ static Vector stringIndicesFromClusters(const Vector& clusters, return stringIndices; } @@ -7186,7 +7177,7 @@ index 774a52a28693bc51dde10a0875ea379afb06fd3c..cd714a7298fe4f5d2c9b580697a5c4cd void ComplexTextController::collectComplexTextRunsForCharacters(const UChar* cp, unsigned stringLength, unsigned stringLocation, const Font* font) { if (!font) { -@@ -201,6 +228,8 @@ void ComplexTextController::collectComplexTextRunsForCharacters(const UChar* cp, +@@ -199,6 +226,8 @@ void ComplexTextController::collectComplexTextRunsForCharacters(const UChar* cp, } items.resize(numItems + 1); @@ -7937,66 +7928,18 @@ index 262e53180d6dd7c4d133ddc1daf5652bd6f31c76..d09aed9c9c58afe3c2040e1d5d683374 // The networkLoadMetrics info is only send over IPC and not stored in disk cache. if constexpr (Decoder::isIPCDecoder) { std::optional> networkLoadMetrics; -diff --git a/Source/WebCore/platform/network/cf/SocketStreamHandleImpl.h b/Source/WebCore/platform/network/cf/SocketStreamHandleImpl.h -index 7330aa933924791f1292c0847921e3b367493d96..a5238a748d1fb4bfa5b3e0882fe62f4029f84e5f 100644 ---- a/Source/WebCore/platform/network/cf/SocketStreamHandleImpl.h -+++ b/Source/WebCore/platform/network/cf/SocketStreamHandleImpl.h -@@ -47,7 +47,7 @@ class SocketStreamHandleClient; +diff --git a/Source/WebCore/platform/network/SynchronousLoaderClient.cpp b/Source/WebCore/platform/network/SynchronousLoaderClient.cpp +index 30b4bb0fdaef7ae2cc74ac609f7b00997e5a6dcc..6a21c2644fc86685773c3434b64b1f3cd4b4ff28 100644 +--- a/Source/WebCore/platform/network/SynchronousLoaderClient.cpp ++++ b/Source/WebCore/platform/network/SynchronousLoaderClient.cpp +@@ -29,6 +29,7 @@ + #include "AuthenticationChallenge.h" + #include "ResourceHandle.h" + #include "ResourceRequest.h" ++#include "SharedBuffer.h" + #include - class SocketStreamHandleImpl : public SocketStreamHandle { - public: -- static Ref create(const URL& url, SocketStreamHandleClient& client, PAL::SessionID sessionID, const String& credentialPartition, SourceApplicationAuditToken&& auditData, const StorageSessionProvider* provider) { return adoptRef(*new SocketStreamHandleImpl(url, client, sessionID, credentialPartition, WTFMove(auditData), provider)); } -+ static Ref create(const URL& url, bool ignoreCertificateErrors, SocketStreamHandleClient& client, PAL::SessionID sessionID, const String& credentialPartition, SourceApplicationAuditToken&& auditData, const StorageSessionProvider* provider) { return adoptRef(*new SocketStreamHandleImpl(url, ignoreCertificateErrors, client, sessionID, credentialPartition, WTFMove(auditData), provider)); } - - virtual ~SocketStreamHandleImpl(); - -@@ -61,7 +61,7 @@ private: - std::optional platformSendInternal(const uint8_t*, size_t); - bool sendPendingData(); - -- WEBCORE_EXPORT SocketStreamHandleImpl(const URL&, SocketStreamHandleClient&, PAL::SessionID, const String& credentialPartition, SourceApplicationAuditToken&&, const StorageSessionProvider*); -+ WEBCORE_EXPORT SocketStreamHandleImpl(const URL&, bool ignoreCertificateErrors, SocketStreamHandleClient&, PAL::SessionID, const String& credentialPartition, SourceApplicationAuditToken&&, const StorageSessionProvider*); - void createStreams(); - void scheduleStreams(); - void chooseProxy(); -@@ -106,6 +106,7 @@ private: - String m_credentialPartition; - SourceApplicationAuditToken m_auditData; - RefPtr m_storageSessionProvider; -+ bool m_ignoreCertificateErrors { false }; - - StreamBuffer m_buffer; - static const unsigned maxBufferSize = 100 * 1024 * 1024; -diff --git a/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp b/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp -index 6961e7983067a1865b4afbe3fa7ac5ce695a4d35..a834a02100c32c2eb0799e9b4fd07777d5f069d2 100644 ---- a/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp -+++ b/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp -@@ -96,7 +96,7 @@ static inline auto callbacksRunLoopMode() - #endif - } - --SocketStreamHandleImpl::SocketStreamHandleImpl(const URL& url, SocketStreamHandleClient& client, PAL::SessionID sessionID, const String& credentialPartition, SourceApplicationAuditToken&& auditData, const StorageSessionProvider* provider) -+SocketStreamHandleImpl::SocketStreamHandleImpl(const URL& url, bool ignoreCertificateErrors, SocketStreamHandleClient& client, PAL::SessionID sessionID, const String& credentialPartition, SourceApplicationAuditToken&& auditData, const StorageSessionProvider* provider) - : SocketStreamHandle(url, client) - , m_connectingSubstate(New) - , m_connectionType(Unknown) -@@ -104,6 +104,7 @@ SocketStreamHandleImpl::SocketStreamHandleImpl(const URL& url, SocketStreamHandl - , m_credentialPartition(credentialPartition) - , m_auditData(WTFMove(auditData)) - , m_storageSessionProvider(provider) -+ , m_ignoreCertificateErrors(ignoreCertificateErrors) - { - LOG(Network, "SocketStreamHandle %p new client %p", this, &m_client); - -@@ -357,7 +358,7 @@ void SocketStreamHandleImpl::createStreams() - } - - if (shouldUseSSL()) { -- CFBooleanRef validateCertificateChain = DeprecatedGlobalSettings::allowsAnySSLCertificate() ? kCFBooleanFalse : kCFBooleanTrue; -+ CFBooleanRef validateCertificateChain = m_ignoreCertificateErrors || DeprecatedGlobalSettings::allowsAnySSLCertificate() ? kCFBooleanFalse : kCFBooleanTrue; - const void* keys[] = { - kCFStreamSSLPeerName, - kCFStreamSSLLevel, + namespace WebCore { diff --git a/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm b/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm index b28ebbddea4fba00a321d18d20bef45bd0392ac7..7291be7bb171ad99142147270389152b1bd34eb5 100644 --- a/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm @@ -8038,10 +7981,10 @@ 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 c0704f0cdd6442373f7b70bfe61539bf5b37d625..02fb139ccd854642242fef2c75d8fd15db8fe42d 100644 +index 36658f91dc9d67230b239e497c0000ac62aae981..de09412ef68a0d21e16b3c958254768e8b7eda87 100644 --- a/Source/WebCore/platform/network/curl/CurlStream.cpp +++ b/Source/WebCore/platform/network/curl/CurlStream.cpp -@@ -33,7 +33,7 @@ +@@ -34,7 +34,7 @@ namespace WebCore { @@ -8050,7 +7993,7 @@ index c0704f0cdd6442373f7b70bfe61539bf5b37d625..02fb139ccd854642242fef2c75d8fd15 : m_scheduler(scheduler) , m_streamID(streamID) { -@@ -45,6 +45,9 @@ CurlStream::CurlStream(CurlStreamScheduler& scheduler, CurlStreamID streamID, UR +@@ -46,6 +46,9 @@ CurlStream::CurlStream(CurlStreamScheduler& scheduler, CurlStreamID streamID, UR m_curlHandle->setUrl(WTFMove(url)); m_curlHandle->enableConnectionOnly(); @@ -8061,10 +8004,10 @@ index c0704f0cdd6442373f7b70bfe61539bf5b37d625..02fb139ccd854642242fef2c75d8fd15 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 4f59b20e8db27903994b33154ce64b0994f3a0ba..e18315445ee05d47b81f00b47ab84ec5d5ae032b 100644 +index e8a32c26461b4308ea227c6df8c972439905d0bc..5da1a95615b04fca8402f53ecd7f05a006640372 100644 --- a/Source/WebCore/platform/network/curl/CurlStream.h +++ b/Source/WebCore/platform/network/curl/CurlStream.h -@@ -50,12 +50,12 @@ public: +@@ -51,12 +51,12 @@ public: virtual void didFail(CurlStreamID, CURLcode) = 0; }; @@ -8135,15 +8078,15 @@ index e7b8ebce073536c148eafaca9d751ec8fb244232..2212618a8980afdd9237669f946a1a8c { switch (cookieDatabase().acceptPolicy()) { diff --git a/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h b/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h -index b804fde0973bbfb28331cf7c3a1f20b043e74fe8..af3005261593b5fa91484c98c43d021227716231 100644 +index 950cd1b1ac6800212e8192b5cb53e69b34409111..58b1f55543f1bdcfc8e6b19b06633c0c4c45095a 100644 --- a/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h +++ b/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h @@ -44,7 +44,7 @@ class StorageSessionProvider; class SocketStreamHandleImpl : public SocketStreamHandle, public CurlStream::Client { public: -- static Ref create(const URL& url, SocketStreamHandleClient& client, PAL::SessionID, const String&, SourceApplicationAuditToken&&, const StorageSessionProvider* provider) { return adoptRef(*new SocketStreamHandleImpl(url, client, provider)); } -+ static Ref create(const URL& url, bool ignoreCertificateErrors, SocketStreamHandleClient& client, PAL::SessionID, const String&, SourceApplicationAuditToken&&, const StorageSessionProvider* provider) { return adoptRef(*new SocketStreamHandleImpl(url, ignoreCertificateErrors, client, provider)); } +- static Ref create(const URL& url, SocketStreamHandleClient& client, PAL::SessionID, const String&, SourceApplicationAuditToken&&, const StorageSessionProvider* provider, bool) { return adoptRef(*new SocketStreamHandleImpl(url, client, provider)); } ++ static Ref create(const URL& url, SocketStreamHandleClient& client, PAL::SessionID, const String&, SourceApplicationAuditToken&&, const StorageSessionProvider* provider, bool ignoreCertificateErrors) { return adoptRef(*new SocketStreamHandleImpl(url, ignoreCertificateErrors, client, provider)); } virtual ~SocketStreamHandleImpl(); @@ -8157,10 +8100,10 @@ index b804fde0973bbfb28331cf7c3a1f20b043e74fe8..af3005261593b5fa91484c98c43d0212 size_t bufferedAmount() final; std::optional platformSendInternal(const uint8_t*, size_t); diff --git a/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp b/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp -index 4b9491c11543f2b60f12d36e9e6a0cbaae34a72e..e907fc00a2a426384ce1e471847911c9ba1739af 100644 +index a8f57a72d0eacca7755be84fcaa1c9bf10958c0b..a5d67b8016a86b9184ded0904e317048e0eb9ea1 100644 --- a/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp +++ b/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp -@@ -43,7 +43,7 @@ +@@ -44,7 +44,7 @@ namespace WebCore { @@ -8169,7 +8112,7 @@ index 4b9491c11543f2b60f12d36e9e6a0cbaae34a72e..e907fc00a2a426384ce1e471847911c9 : SocketStreamHandle(url, client) , m_storageSessionProvider(provider) , m_scheduler(CurlContext::singleton().streamScheduler()) -@@ -52,7 +52,7 @@ SocketStreamHandleImpl::SocketStreamHandleImpl(const URL& url, SocketStreamHandl +@@ -53,7 +53,7 @@ SocketStreamHandleImpl::SocketStreamHandleImpl(const URL& url, SocketStreamHandl if (m_url.protocolIs("wss") && DeprecatedGlobalSettings::allowsAnySSLCertificate()) CurlContext::singleton().sslHandle().setIgnoreSSLErrors(true); @@ -8213,19 +8156,6 @@ index fcfa4e995212ae926f6339d37dbbb3d1051e0fc3..b2341ee77f6b1c2c0b4ebecc6e861f36 void NetworkStorageSession::deleteCookie(const Cookie& cookie) { GUniquePtr targetCookie(cookie.toSoupCookie()); -diff --git a/Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h b/Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h -index 88df3748e980a22e71bd835864caf24b6b7ea50b..f83c7f2535fd1abae7b1cccca946254b9407f86f 100644 ---- a/Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h -+++ b/Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h -@@ -47,7 +47,7 @@ class StorageSessionProvider; - - class SocketStreamHandleImpl final : public SocketStreamHandle { - public: -- static Ref create(const URL&, SocketStreamHandleClient&, PAL::SessionID, const String&, SourceApplicationAuditToken&&, const StorageSessionProvider*) -+ static Ref create(const URL&, bool, SocketStreamHandleClient&, PAL::SessionID, const String&, SourceApplicationAuditToken&&, const StorageSessionProvider*) - { - RELEASE_ASSERT_NOT_REACHED(); - } diff --git a/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp b/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp index 4093537da5579db54326cc88b54e4ab17a2e22e3..0beae7659ed600fc9900d758884c1d70c86bd53e 100644 --- a/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp @@ -8784,10 +8714,10 @@ index 0000000000000000000000000000000000000000..cf2b51f6f02837a1106f4d999f2f130e + +} // namespace WebCore diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp -index 6509f5bfe532ec09b8f3d8c452e8b69af41ce8bb..5f7b482cef1619599255ed56c634aa13ca64d203 100644 +index 991ab4a3f994cdcc9ab41080aa0dcdc3d924fd9d..dbd10c139c5c521eb55958b96abe1af7ce7d460a 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp -@@ -2605,7 +2605,7 @@ LayoutRect RenderLayer::getRectToExpose(const LayoutRect& visibleRect, const Lay +@@ -2606,7 +2606,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(); @@ -8797,10 +8727,10 @@ index 6509f5bfe532ec09b8f3d8c452e8b69af41ce8bb..5f7b482cef1619599255ed56c634aa13 // If the rectangle is partially visible, but over a certain threshold, // then treat it as fully visible to avoid unnecessary horizontal scrolling diff --git a/Source/WebCore/rendering/RenderTextControl.cpp b/Source/WebCore/rendering/RenderTextControl.cpp -index 0f281a057cf65180e4be869906e82c6b17b8020c..3c2bed5a8f01a8b486db6336dde6b38139c2cefa 100644 +index 8a1daa67c777db06b9abe95c5ba01f15c69fbdf7..2f579e5744ea0a12e65a1c4e652d176357d7ce1f 100644 --- a/Source/WebCore/rendering/RenderTextControl.cpp +++ b/Source/WebCore/rendering/RenderTextControl.cpp -@@ -207,13 +207,13 @@ void RenderTextControl::layoutExcludedChildren(bool relayoutChildren) +@@ -212,13 +212,13 @@ void RenderTextControl::layoutExcludedChildren(bool relayoutChildren) } } @@ -8843,7 +8773,7 @@ index 694008e0451edc5770142a0a6d9eed52b04ded80..ec93869f9486bdf7bd3bb56478c62469 WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, ScrollAlignment::Behavior); diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp -index 9c6dd8ce4d8f06a203b640aa22a025e997f31036..8dd790fbfc10c000a61a477e3178b474a7d8c126 100644 +index 8eebd22cfc8a57ac5cf7ddddccb6246bae3099cd..53571361e8cce1028e40404ca43d6cc4e200af2b 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp @@ -77,6 +77,11 @@ @@ -8858,7 +8788,18 @@ index 9c6dd8ce4d8f06a203b640aa22a025e997f31036..8dd790fbfc10c000a61a477e3178b474 #if ENABLE(APPLE_PAY_REMOTE_UI) #include "WebPaymentCoordinatorProxyMessages.h" #endif -@@ -969,6 +974,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) +@@ -435,6 +440,10 @@ void NetworkConnectionToWebProcess::createSocketStream(URL&& url, String cachePa + if (auto* session = networkSession()) + acceptInsecureCertificates = session->shouldAcceptInsecureCertificatesForWebSockets(); + #endif ++ if (auto* session = networkSession()) { ++ if (session->ignoreCertificateErrors()) ++ acceptInsecureCertificates = true; ++ } + m_networkSocketStreams.add(identifier, NetworkSocketStream::create(m_networkProcess.get(), WTFMove(url), m_sessionID, cachePartition, identifier, m_connection, WTFMove(token), acceptInsecureCertificates)); + } + +@@ -978,6 +987,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) #endif } @@ -8874,10 +8815,10 @@ index 9c6dd8ce4d8f06a203b640aa22a025e997f31036..8dd790fbfc10c000a61a477e3178b474 void NetworkConnectionToWebProcess::removeStorageAccessForFrame(FrameIdentifier frameID, PageIdentifier pageID) { diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -index b85bd65fcc011127c4fc2df590d218828646b531..77df8f91895b2ab046403c90a4f0e9cae0ac968b 100644 +index 653fd5eeb51dccb60be98516c160baa8f77e06f2..672a2e836d33d4f5c096e31ec9caee77573c5980 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -@@ -290,6 +290,8 @@ private: +@@ -289,6 +289,8 @@ private: void clearPageSpecificData(WebCore::PageIdentifier); @@ -8887,7 +8828,7 @@ index b85bd65fcc011127c4fc2df590d218828646b531..77df8f91895b2ab046403c90a4f0e9ca void removeStorageAccessForFrame(WebCore::FrameIdentifier, WebCore::PageIdentifier); diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in -index e2847fc0a4c44d2ef2384fe8561c4ba34dc5ddc9..c0b90629e0dfe4b01a98abc44b03f133d1be2caa 100644 +index 650b2aa683709618f589a1bd5326ddcf99173d34..ef552f2f8e7d339a487322de32ce802451c7a633 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in @@ -66,6 +66,8 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver { @@ -9002,10 +8943,10 @@ index 637e159f186393bec5cc05ab5bd5780be8c6fce4..8032679d6f8a585441d4c5984f3cc7cd ClearPrevalentResource(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () Async ClearUserInteraction(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () Async diff --git a/Source/WebKit/NetworkProcess/NetworkSession.h b/Source/WebKit/NetworkProcess/NetworkSession.h -index c2de1dc53562c9026e88b1ec8e2c99c5fdd4dfed..0f7b2144b4b22aa89715decaafbb7fedef734ead 100644 +index 19307cf40be3b2f26057d016c766edce498c9542..091438735aa757887d534d122bb01a1c6144ea7a 100644 --- a/Source/WebKit/NetworkProcess/NetworkSession.h +++ b/Source/WebKit/NetworkProcess/NetworkSession.h -@@ -191,6 +191,9 @@ public: +@@ -192,6 +192,9 @@ public: void lowMemoryHandler(WTF::Critical); @@ -9015,7 +8956,7 @@ index c2de1dc53562c9026e88b1ec8e2c99c5fdd4dfed..0f7b2144b4b22aa89715decaafbb7fed #if ENABLE(SERVICE_WORKER) void addSoftUpdateLoader(std::unique_ptr&& loader) { m_softUpdateLoaders.add(WTFMove(loader)); } void removeSoftUpdateLoader(ServiceWorkerSoftUpdateLoader* loader) { m_softUpdateLoaders.remove(loader); } -@@ -274,6 +277,7 @@ protected: +@@ -279,6 +282,7 @@ protected: bool m_privateClickMeasurementDebugModeEnabled { false }; std::optional m_ephemeralMeasurement; bool m_isRunningEphemeralMeasurementTest { false }; @@ -9023,19 +8964,6 @@ index c2de1dc53562c9026e88b1ec8e2c99c5fdd4dfed..0f7b2144b4b22aa89715decaafbb7fed HashSet> m_keptAliveLoads; -diff --git a/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp b/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp -index 8e30448e0d72c61f60506f758559b790d4a7bda6..77663f51040b4fe368994873d68c19df14073d2d 100644 ---- a/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp -+++ b/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp -@@ -43,7 +43,7 @@ Ref NetworkSocketStream::create(NetworkProcess& networkProc - NetworkSocketStream::NetworkSocketStream(NetworkProcess& networkProcess, URL&& url, PAL::SessionID sessionID, const String& credentialPartition, WebSocketIdentifier identifier, IPC::Connection& connection, SourceApplicationAuditToken&& auditData) - : m_identifier(identifier) - , m_connection(connection) -- , m_impl(SocketStreamHandleImpl::create(url, *this, sessionID, credentialPartition, WTFMove(auditData), NetworkStorageSessionProvider::create(networkProcess, sessionID).ptr())) -+ , m_impl(SocketStreamHandleImpl::create(url, networkProcess.networkSession(sessionID)->ignoreCertificateErrors(), *this, sessionID, credentialPartition, WTFMove(auditData), NetworkStorageSessionProvider::create(networkProcess, sessionID).ptr())) - , m_delayFailTimer(*this, &NetworkSocketStream::sendDelayedFailMessage) - { - } diff --git a/Source/WebKit/NetworkProcess/WebStorage/LocalStorageNamespace.cpp b/Source/WebKit/NetworkProcess/WebStorage/LocalStorageNamespace.cpp index 04c49bb4c914ebd93c7bcc09154e8c1d76e844b3..ace4b6eaa8ff94bdbd9d6aa041233b46f02f4fa1 100644 --- a/Source/WebKit/NetworkProcess/WebStorage/LocalStorageNamespace.cpp @@ -9118,7 +9046,7 @@ index f57a72b6bdc3382469d69adb1b1201c7a9f07a84..c501211b094312ca44f0bf92de5d6ebc void clear(); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 6a53b5d70a0544b8b02b349aff1b4bc60eade208..aeb2f1fbec86cbc95888db2b107b6d3d24595767 100644 +index 0a3c1b81902ce2a82a96a08aea42aa911789c1ef..d0ec4d3febee0b702b232116673d0f9b9c8c008f 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 @@ -9145,7 +9073,7 @@ index 6a53b5d70a0544b8b02b349aff1b4bc60eade208..aeb2f1fbec86cbc95888db2b107b6d3d #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 84669e209d77bf52a36afe2a7dab252a6900dcf7..8785d13d2ff02882704e47659a68871cb9cb511a 100644 +index 13fcc7bd48a55a093912926ba4484cf5e355132b..1796e9bf8ec9bf3c0f5dc1eef44bcf935953efbb 100644 --- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp +++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp @@ -26,9 +26,13 @@ @@ -9162,7 +9090,7 @@ index 84669e209d77bf52a36afe2a7dab252a6900dcf7..8785d13d2ff02882704e47659a68871c #include #include #include -@@ -40,6 +44,7 @@ +@@ -41,6 +45,7 @@ #include #include #include @@ -9170,7 +9098,7 @@ index 84669e209d77bf52a36afe2a7dab252a6900dcf7..8785d13d2ff02882704e47659a68871c namespace WebKit { -@@ -77,6 +82,8 @@ NetworkDataTaskCurl::NetworkDataTaskCurl(NetworkSession& session, NetworkDataTas +@@ -78,6 +83,8 @@ NetworkDataTaskCurl::NetworkDataTaskCurl(NetworkSession& session, NetworkDataTas m_curlRequest->setUserPass(m_initialCredential.user(), m_initialCredential.password()); m_curlRequest->setAuthenticationScheme(ProtectionSpace::AuthenticationScheme::HTTPBasic); } @@ -9179,7 +9107,7 @@ index 84669e209d77bf52a36afe2a7dab252a6900dcf7..8785d13d2ff02882704e47659a68871c m_curlRequest->start(); } -@@ -106,6 +113,9 @@ void NetworkDataTaskCurl::cancel() +@@ -107,6 +114,9 @@ void NetworkDataTaskCurl::cancel() if (m_curlRequest) m_curlRequest->cancel(); @@ -9189,7 +9117,7 @@ index 84669e209d77bf52a36afe2a7dab252a6900dcf7..8785d13d2ff02882704e47659a68871c } void NetworkDataTaskCurl::invalidateAndCancel() -@@ -150,6 +160,7 @@ void NetworkDataTaskCurl::curlDidReceiveResponse(CurlRequest& request, CurlRespo +@@ -151,6 +161,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))); @@ -9197,7 +9125,7 @@ index 84669e209d77bf52a36afe2a7dab252a6900dcf7..8785d13d2ff02882704e47659a68871c handleCookieHeaders(request.resourceRequest(), receivedResponse); -@@ -177,7 +188,12 @@ void NetworkDataTaskCurl::curlDidReceiveBuffer(CurlRequest&, RefdidReceiveData(WTFMove(buffer)); + m_client->didReceiveData(buffer); } -@@ -186,9 +202,26 @@ void NetworkDataTaskCurl::curlDidComplete(CurlRequest&, NetworkLoadMetrics&& net +@@ -187,9 +203,26 @@ void NetworkDataTaskCurl::curlDidComplete(CurlRequest&, NetworkLoadMetrics&& net if (state() == State::Canceling || state() == State::Completed || (!m_client && !isDownload())) return; @@ -9238,7 +9166,7 @@ index 84669e209d77bf52a36afe2a7dab252a6900dcf7..8785d13d2ff02882704e47659a68871c void NetworkDataTaskCurl::curlDidFailWithError(CurlRequest& request, ResourceError&& resourceError, CertificateInfo&& certificateInfo) { if (state() == State::Canceling || state() == State::Completed || (!m_client && !isDownload())) -@@ -199,6 +232,14 @@ void NetworkDataTaskCurl::curlDidFailWithError(CurlRequest& request, ResourceErr +@@ -200,6 +233,14 @@ void NetworkDataTaskCurl::curlDidFailWithError(CurlRequest& request, ResourceErr return; } @@ -9253,7 +9181,7 @@ index 84669e209d77bf52a36afe2a7dab252a6900dcf7..8785d13d2ff02882704e47659a68871c m_client->didCompleteWithError(resourceError); } -@@ -236,6 +277,19 @@ void NetworkDataTaskCurl::invokeDidReceiveResponse() +@@ -237,6 +278,19 @@ void NetworkDataTaskCurl::invokeDidReceiveResponse() case PolicyAction::Ignore: invalidateAndCancel(); break; @@ -9273,7 +9201,7 @@ index 84669e209d77bf52a36afe2a7dab252a6900dcf7..8785d13d2ff02882704e47659a68871c default: notImplemented(); break; -@@ -315,6 +369,8 @@ void NetworkDataTaskCurl::willPerformHTTPRedirection() +@@ -316,6 +370,8 @@ void NetworkDataTaskCurl::willPerformHTTPRedirection() m_curlRequest->setUserPass(m_initialCredential.user(), m_initialCredential.password()); m_curlRequest->setAuthenticationScheme(ProtectionSpace::AuthenticationScheme::HTTPBasic); } @@ -9283,7 +9211,7 @@ index 84669e209d77bf52a36afe2a7dab252a6900dcf7..8785d13d2ff02882704e47659a68871c if (m_state != State::Suspended) { diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h -index 45be5ce184325271d5c080dd34f1ee4a16642a1f..4e2f05c6f882d60e21b05616249d0435274da408 100644 +index e55864a95f7bcbc085c46628bff058573573286c..d82268c1877a29e3e9e848185e4df4e7e2324c99 100644 --- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h +++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h @@ -32,6 +32,7 @@ @@ -9294,7 +9222,7 @@ index 45be5ce184325271d5c080dd34f1ee4a16642a1f..4e2f05c6f882d60e21b05616249d0435 #include namespace WebCore { -@@ -85,13 +86,13 @@ private: +@@ -86,13 +87,13 @@ private: void appendCookieHeader(WebCore::ResourceRequest&); void handleCookieHeaders(const WebCore::ResourceRequest&, const WebCore::CurlResponse&); @@ -9310,7 +9238,7 @@ index 45be5ce184325271d5c080dd34f1ee4a16642a1f..4e2f05c6f882d60e21b05616249d0435 State m_state { State::Suspended }; -@@ -103,6 +104,8 @@ private: +@@ -104,6 +105,8 @@ private: WebCore::FrameIdentifier m_frameID; WebCore::PageIdentifier m_pageID; @@ -9376,7 +9304,7 @@ index 60a49c6d404c52563d87fc2cd1cb22444671d1cd..6184a79c62057390aa6fa7473a4117e8 } diff --git a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp -index 2bc74b941b23e0df0a6efc84257ac1bb880bc3ef..a0579fabb264c378238c6bd92a61c991d198cd08 100644 +index 7f1469d820cf1d1f12b50cecc577bd5414643a65..dd90505286a9e126b0c8ceacc2ed8c0af8059d01 100644 --- a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp +++ b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp @@ -109,6 +109,11 @@ static gboolean webSocketAcceptCertificateCallback(GTlsConnection* connection, G @@ -9404,7 +9332,7 @@ index 2bc74b941b23e0df0a6efc84257ac1bb880bc3ef..a0579fabb264c378238c6bd92a61c991 + g_signal_connect(connection, "accept-certificate", G_CALLBACK(webSocketAcceptCertificateCallbackIgnoreTLSErrors), soupMessage); +} + - std::unique_ptr NetworkSessionSoup::createWebSocketTask(WebPageProxyIdentifier, NetworkSocketChannel& channel, const ResourceRequest& request, const String& protocol) + std::unique_ptr NetworkSessionSoup::createWebSocketTask(WebPageProxyIdentifier, NetworkSocketChannel& channel, const ResourceRequest& request, const String& protocol, const ClientOrigin&) { GRefPtr soupMessage = request.createSoupMessage(blobRegistry()); @@ -127,14 +141,21 @@ std::unique_ptr NetworkSessionSoup::createWebSocketTask(WebPagePr @@ -9721,10 +9649,10 @@ index f2f3979fcac9dfd97d0e0ead600fe35eb8defd40..ac91412e1a96bdf521b1890a66e465dc NSEvent* nativeEvent() const { return m_nativeEvent.get(); } #elif PLATFORM(GTK) diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -index c898687b226cce4b4f3b8b1a85cbec7958b67ab6..821916c717bd1d19fe1d3ed6494932f56a558c76 100644 +index 45ece51a50366da34ff90e91d57e5a88e2db8850..152e5bbf59a01a68522139fdec0f7c223a0a7804 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -@@ -119,6 +119,10 @@ +@@ -117,6 +117,10 @@ #include #endif @@ -9735,7 +9663,7 @@ index c898687b226cce4b4f3b8b1a85cbec7958b67ab6..821916c717bd1d19fe1d3ed6494932f5 // FIXME: Seems like we could use std::tuple to cut down the code below a lot! namespace IPC { -@@ -1379,6 +1383,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature +@@ -1402,6 +1406,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature encoder << windowFeatures.resizable; encoder << windowFeatures.fullscreen; encoder << windowFeatures.dialog; @@ -9745,7 +9673,7 @@ index c898687b226cce4b4f3b8b1a85cbec7958b67ab6..821916c717bd1d19fe1d3ed6494932f5 } bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& windowFeatures) -@@ -1407,6 +1414,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win +@@ -1430,6 +1437,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win return false; if (!decoder.decode(windowFeatures.dialog)) return false; @@ -9758,7 +9686,7 @@ index c898687b226cce4b4f3b8b1a85cbec7958b67ab6..821916c717bd1d19fe1d3ed6494932f5 return true; } -@@ -1420,6 +1433,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) +@@ -1443,6 +1456,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) #if PLATFORM(COCOA) encoder << dragData.pasteboardName(); encoder << dragData.fileNames(); @@ -9770,7 +9698,7 @@ index c898687b226cce4b4f3b8b1a85cbec7958b67ab6..821916c717bd1d19fe1d3ed6494932f5 #endif encoder << dragData.dragDestinationActionMask(); encoder << dragData.pageID(); -@@ -1443,9 +1461,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1466,9 +1484,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(applicationFlags)) return false; @@ -9788,7 +9716,7 @@ index c898687b226cce4b4f3b8b1a85cbec7958b67ab6..821916c717bd1d19fe1d3ed6494932f5 if (!decoder.decode(pasteboardName)) return false; -@@ -1461,8 +1486,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1484,8 +1509,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(pageID)) return false; @@ -9979,10 +9907,10 @@ index ebd51f5461fd35aa408fcde6927a16186374f6a9..fc2274d0f5b03f5ff3eb5b20060b24c4 GtkSettingsState gtkSettings; #endif diff --git a/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp b/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp -index be054e9c7e807a67a33d28406238fe8e5692eec3..9a958c55d9cb87efb4c1f4880740fedda9d9c9ae 100644 +index fa0df4dee312b35a2f0906d486c031aa4827c0cd..a62103448444508ea03c21ac66f8a48e8feb60bf 100644 --- a/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp +++ b/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp -@@ -162,7 +162,9 @@ bool defaultOfflineWebApplicationCacheEnabled() +@@ -161,7 +161,9 @@ bool defaultOfflineWebApplicationCacheEnabled() bool defaultUseGPUProcessForCanvasRenderingEnabled() { @@ -9993,7 +9921,7 @@ index be054e9c7e807a67a33d28406238fe8e5692eec3..9a958c55d9cb87efb4c1f4880740fedd bool defaultValue = true; #else bool defaultValue = false; -@@ -190,7 +192,7 @@ bool defaultUseGPUProcessForMediaEnabled() +@@ -189,7 +191,7 @@ bool defaultUseGPUProcessForMediaEnabled() bool defaultUseGPUProcessForWebGLEnabled() { #if PLATFORM(WIN) @@ -10306,10 +10234,10 @@ index 85d6f74114f4e7f82d9502d1b99d69098d6a49b6..6896c9756edb233dda46c7031e1af699 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index 67963789fa347bf8ad564f95d3af1c9b9a7fc397..833ede887c6bf0ad0b2ab8156eec47a4996cab6f 100644 +index 44573109ae3323d69e0227bd7aa415a3cb8793f6..66b0ca8dcd4f79f56646cbb0db2408246e93d2c6 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -391,11 +391,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -390,11 +390,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -10324,7 +10252,7 @@ index 67963789fa347bf8ad564f95d3af1c9b9a7fc397..833ede887c6bf0ad0b2ab8156eec47a4 UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -404,6 +407,7 @@ UIProcess/PageLoadState.cpp +@@ -403,6 +406,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -10332,7 +10260,7 @@ index 67963789fa347bf8ad564f95d3af1c9b9a7fc397..833ede887c6bf0ad0b2ab8156eec47a4 UIProcess/ResponsivenessTimer.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp -@@ -445,6 +449,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp +@@ -444,6 +448,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp UIProcess/WebPageDiagnosticLoggingClient.cpp UIProcess/WebPageGroup.cpp UIProcess/WebPageInjectedBundleClient.cpp @@ -10341,7 +10269,7 @@ index 67963789fa347bf8ad564f95d3af1c9b9a7fc397..833ede887c6bf0ad0b2ab8156eec47a4 UIProcess/WebPageProxy.cpp UIProcess/WebPasteboardProxy.cpp UIProcess/WebPreferences.cpp -@@ -566,7 +572,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp +@@ -565,7 +571,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp UIProcess/Inspector/WebPageDebuggable.cpp UIProcess/Inspector/WebPageInspectorController.cpp @@ -10571,7 +10499,7 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0 } #endif diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp -index 5b2b2b148c2a3d8bbe9c36be478c74c36ff4db7b..f9c9b8116f2eb0459ad6a3e65ce7e0e6e97535a8 100644 +index 509b9b25f394f6b367cbb8d687587c14d2885b60..056556f991ee15e8096c48359cda72b9058ce902 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 @@ -10680,7 +10608,7 @@ index afa925f36c29db9c23921298dead9cce737500d6..42d396342acdb6d39830f611df0ee40e NS_ASSUME_NONNULL_END diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm -index f656d261655b73eba04b50aaa9892faae5f31859..8496ea19296ee4e1fee9a064231adac40ba3fce9 100644 +index f913483deda04127638afbadf1dd72eb84b38218..52ed5e019ca152a671a4fefb84bee2e187c97e98 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm @@ -45,6 +45,7 @@ @@ -10690,7 +10618,7 @@ index f656d261655b73eba04b50aaa9892faae5f31859..8496ea19296ee4e1fee9a064231adac4 +#import #import #import - #import + #import @@ -206,6 +207,11 @@ static WallTime toSystemClockTime(NSDate *date) }); } @@ -11495,7 +11423,7 @@ index 0000000000000000000000000000000000000000..9f1a0173a5641d6f158d815b8f7b9ea6 + +#endif diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp -index 3a96753c9cf9e6d3a3d277ad82ec6f4a98635cbd..530927447170960bec796908174efff308fd5912 100644 +index eabfd1805ade8b6557996af0502f65abf20ae4a5..3ff10d3e603dee743ebf235180ff7d273b5893ae 100644 --- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp +++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp @@ -2472,6 +2472,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase) @@ -12203,7 +12131,7 @@ index ddfc67d695731931eca4eb39926fb5b6e874a5a6..bf4d9f9b5caa1c93ae7d7ce650b3f9c9 { if (!m_uiDelegate) diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -index 29f91774596cf004cd0d57b5ea386b5cb233b30a..fd1b24fb32fddd65ccb5358a6add81ca865ffb7c 100644 +index b0dd19a8fe284f48ce07e2da604612077619a0c3..451b5ab76b204246d0479627f44c357a9f57ca45 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm @@ -37,6 +37,7 @@ @@ -12214,7 +12142,7 @@ index 29f91774596cf004cd0d57b5ea386b5cb233b30a..fd1b24fb32fddd65ccb5358a6add81ca #import "QuarantineSPI.h" #import "QuickLookThumbnailLoader.h" #import "SafeBrowsingSPI.h" -@@ -237,9 +238,66 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting() +@@ -236,9 +237,66 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting() void WebPageProxy::startDrag(const DragItem& dragItem, const ShareableBitmap::Handle& dragImageHandle) { @@ -12282,10 +12210,10 @@ index 29f91774596cf004cd0d57b5ea386b5cb233b30a..fd1b24fb32fddd65ccb5358a6add81ca #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index 4925e35329e814fc89ce4a83bfa576ae9898c4c5..3f46b6a9666aa0617aef227d77442c3655baa0b3 100644 +index 1103ae00b3320d53739788f277041a775195e238..0a79fcb7dec0b2c1dcf2832938f2a4bcdaf56458 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -@@ -397,7 +397,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process +@@ -396,7 +396,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process auto screenProperties = WebCore::collectScreenProperties(); parameters.screenProperties = WTFMove(screenProperties); #if PLATFORM(MAC) @@ -12294,7 +12222,7 @@ index 4925e35329e814fc89ce4a83bfa576ae9898c4c5..3f46b6a9666aa0617aef227d77442c36 #endif #if PLATFORM(IOS) -@@ -697,8 +697,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -696,8 +696,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -12320,7 +12248,7 @@ 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 29026329364d84c3ddc1982f3a4093d100244308..fe310f0d9b89dd0f2333cff11cec603c95a936d6 100644 +index 2f80bf612d8d5a387b50a1704a2a62240d466d67..ab3be899713f97d9db91504cb703ab8e2e14adec 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm @@ -2653,6 +2653,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() @@ -15889,7 +15817,7 @@ index 5b529ffd8c22d6de032cc89ea709b12c378b1340..8ac4ae4b5f69fa5c22a5889f78526c4f virtual RefPtr takeViewSnapshot(std::optional&&) = 0; #endif diff --git a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp -index 2e06addf7e87566323448e1fd3d89998731a4db4..f3d3e7d12fb318c8c60b6f86f8b97cf3104bd0e7 100644 +index f38122a34a1cba9c4f4abc6835425969d411739a..8f7fa65c7fc548db74c4581cb69f17638075b966 100644 --- a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp +++ b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp @@ -644,3 +644,5 @@ bool ProvisionalPageProxy::sendMessage(UniqueRef&& encoder, Option @@ -16920,7 +16848,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index baa4387bf0e0875fa6e270f6c363ee13e3844132..93db01ad2cbcb041142b1cac06182ceac460719c 100644 +index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..2a1f524685e8d6010ecb78ff4d1e351720f82a2a 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -246,6 +246,9 @@ @@ -16933,7 +16861,7 @@ index baa4387bf0e0875fa6e270f6c363ee13e3844132..93db01ad2cbcb041142b1cac06182cea #include #endif -@@ -616,6 +619,10 @@ WebPageProxy::~WebPageProxy() +@@ -612,6 +615,10 @@ WebPageProxy::~WebPageProxy() if (m_preferences->mediaSessionCoordinatorEnabled()) GroupActivitiesSessionNotifier::sharedNotifier().removeWebPage(*this); #endif @@ -16944,7 +16872,7 @@ index baa4387bf0e0875fa6e270f6c363ee13e3844132..93db01ad2cbcb041142b1cac06182cea } void WebPageProxy::addAllMessageReceivers() -@@ -1017,6 +1024,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) +@@ -1013,6 +1020,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) m_pageLoadState.didSwapWebProcesses(); if (reason != ProcessLaunchReason::InitialProcess) m_drawingArea->waitForBackingStoreUpdateOnNextPaint(); @@ -16952,7 +16880,7 @@ index baa4387bf0e0875fa6e270f6c363ee13e3844132..93db01ad2cbcb041142b1cac06182cea } void WebPageProxy::didAttachToRunningProcess() -@@ -1370,6 +1378,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1366,6 +1374,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -16974,7 +16902,7 @@ index baa4387bf0e0875fa6e270f6c363ee13e3844132..93db01ad2cbcb041142b1cac06182cea RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1918,6 +1941,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1914,6 +1937,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -17006,7 +16934,7 @@ index baa4387bf0e0875fa6e270f6c363ee13e3844132..93db01ad2cbcb041142b1cac06182cea void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2108,6 +2156,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2104,6 +2152,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -17032,7 +16960,7 @@ index baa4387bf0e0875fa6e270f6c363ee13e3844132..93db01ad2cbcb041142b1cac06182cea if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2686,6 +2753,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2682,6 +2749,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -17041,7 +16969,7 @@ index baa4387bf0e0875fa6e270f6c363ee13e3844132..93db01ad2cbcb041142b1cac06182cea #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2696,6 +2765,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2692,6 +2761,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -17050,7 +16978,7 @@ index baa4387bf0e0875fa6e270f6c363ee13e3844132..93db01ad2cbcb041142b1cac06182cea send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2711,18 +2782,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2731,6 +2825,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2727,6 +2821,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -17120,7 +17048,7 @@ index baa4387bf0e0875fa6e270f6c363ee13e3844132..93db01ad2cbcb041142b1cac06182cea void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2743,8 +2855,18 @@ void WebPageProxy::didStartDrag() +@@ -2739,8 +2851,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17140,7 +17068,7 @@ index baa4387bf0e0875fa6e270f6c363ee13e3844132..93db01ad2cbcb041142b1cac06182cea void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2849,16 +2971,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2845,16 +2967,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17186,7 +17114,7 @@ index baa4387bf0e0875fa6e270f6c363ee13e3844132..93db01ad2cbcb041142b1cac06182cea } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3022,7 +3166,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3018,7 +3162,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17195,7 +17123,7 @@ index baa4387bf0e0875fa6e270f6c363ee13e3844132..93db01ad2cbcb041142b1cac06182cea const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -3055,7 +3199,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3051,7 +3195,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -17204,7 +17132,7 @@ index baa4387bf0e0875fa6e270f6c363ee13e3844132..93db01ad2cbcb041142b1cac06182cea } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3444,6 +3588,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3440,6 +3584,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -17213,7 +17141,7 @@ index baa4387bf0e0875fa6e270f6c363ee13e3844132..93db01ad2cbcb041142b1cac06182cea receivedPolicyDecision(policyAction, navigation, WTFMove(policies), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3512,6 +3658,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3508,6 +3654,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) { @@ -17221,7 +17149,7 @@ index baa4387bf0e0875fa6e270f6c363ee13e3844132..93db01ad2cbcb041142b1cac06182cea if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4248,6 +4395,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4244,6 +4391,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17440,7 +17368,7 @@ index baa4387bf0e0875fa6e270f6c363ee13e3844132..93db01ad2cbcb041142b1cac06182cea // 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 8de9f824c4e1794a6b0459cbfb64390f881d4309..f97ca1c101065f6ce1a4858046b9fd3fb04e65a3 100644 +index 0552b7ba5e5c65738b6bc4859a9b3cfb39790b8c..8f5ae35b288cff2cf4d4109e9e7469a80d5218a2 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17478,7 +17406,7 @@ index 8de9f824c4e1794a6b0459cbfb64390f881d4309..f97ca1c101065f6ce1a4858046b9fd3f #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY) #include #include -@@ -251,6 +263,7 @@ class AuthenticationChallenge; +@@ -247,6 +259,7 @@ class AuthenticationChallenge; class CertificateInfo; class Cursor; class DragData; @@ -17486,7 +17414,7 @@ index 8de9f824c4e1794a6b0459cbfb64390f881d4309..f97ca1c101065f6ce1a4858046b9fd3f class FloatRect; class FontAttributeChanges; class FontChanges; -@@ -258,7 +271,6 @@ class GraphicsLayer; +@@ -254,7 +267,6 @@ class GraphicsLayer; class IntSize; class ProtectionSpace; class RunLoopObserver; @@ -17494,7 +17422,7 @@ index 8de9f824c4e1794a6b0459cbfb64390f881d4309..f97ca1c101065f6ce1a4858046b9fd3f class SharedBuffer; class SpeechRecognitionRequest; class TextIndicator; -@@ -545,6 +557,8 @@ public: +@@ -541,6 +553,8 @@ public: void setControlledByAutomation(bool); WebPageInspectorController& inspectorController() { return *m_inspectorController; } @@ -17503,7 +17431,7 @@ index 8de9f824c4e1794a6b0459cbfb64390f881d4309..f97ca1c101065f6ce1a4858046b9fd3f #if PLATFORM(IOS_FAMILY) void showInspectorIndication(); -@@ -648,6 +662,11 @@ public: +@@ -644,6 +658,11 @@ public: void setPageLoadStateObserver(std::unique_ptr&&); @@ -17515,7 +17443,7 @@ index 8de9f824c4e1794a6b0459cbfb64390f881d4309..f97ca1c101065f6ce1a4858046b9fd3f void initializeWebPage(); void setDrawingArea(std::unique_ptr&&); -@@ -675,6 +694,7 @@ public: +@@ -671,6 +690,7 @@ public: void closePage(); void addPlatformLoadParameters(WebProcessProxy&, LoadParameters&); @@ -17523,7 +17451,7 @@ index 8de9f824c4e1794a6b0459cbfb64390f881d4309..f97ca1c101065f6ce1a4858046b9fd3f RefPtr loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemesButNotAppLinks, API::Object* userData = nullptr); RefPtr loadFile(const String& fileURL, const String& resourceDirectoryURL, bool isAppInitiated = true, 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); -@@ -1195,6 +1215,7 @@ public: +@@ -1187,6 +1207,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -17531,7 +17459,7 @@ index 8de9f824c4e1794a6b0459cbfb64390f881d4309..f97ca1c101065f6ce1a4858046b9fd3f void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1271,14 +1292,20 @@ public: +@@ -1263,14 +1284,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -17553,7 +17481,7 @@ index 8de9f824c4e1794a6b0459cbfb64390f881d4309..f97ca1c101065f6ce1a4858046b9fd3f #endif void processDidBecomeUnresponsive(); -@@ -1525,6 +1552,8 @@ public: +@@ -1517,6 +1544,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -17562,7 +17490,7 @@ index 8de9f824c4e1794a6b0459cbfb64390f881d4309..f97ca1c101065f6ce1a4858046b9fd3f #endif #if ENABLE(WEB_CRYPTO) -@@ -2645,6 +2674,7 @@ private: +@@ -2637,6 +2666,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17570,7 +17498,7 @@ index 8de9f824c4e1794a6b0459cbfb64390f881d4309..f97ca1c101065f6ce1a4858046b9fd3f #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2909,6 +2939,20 @@ private: +@@ -2901,6 +2931,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17591,7 +17519,7 @@ index 8de9f824c4e1794a6b0459cbfb64390f881d4309..f97ca1c101065f6ce1a4858046b9fd3f #endif PageLoadState m_pageLoadState; -@@ -3121,6 +3165,9 @@ private: +@@ -3110,6 +3154,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17637,10 +17565,10 @@ index 942c93dd2f926925dc843fda796844d487129005..44486ce1ff4247d282396dd2634b35db DidPerformDragOperation(bool handled) #endif diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index 0961367a61e89647c40c03962a4ba3d0ea6b1ab9..fd2b1c6e37a933ffb8b9e4467c7eca8ff6a88580 100644 +index 60b9411d6091208186f6075af2997ac6dcd07588..1f4ae44aa932d20650930488133ce97e4bc32a5a 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp -@@ -523,6 +523,14 @@ void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkPro +@@ -532,6 +532,14 @@ void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkPro // Arbitrarily choose the first process pool to host the service worker process. auto* processPool = processPools()[0]; @@ -17655,7 +17583,7 @@ index 0961367a61e89647c40c03962a4ba3d0ea6b1ab9..fd2b1c6e37a933ffb8b9e4467c7eca8f ASSERT(processPool); WebProcessProxy* serviceWorkerProcessProxy { nullptr }; -@@ -795,8 +803,12 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa +@@ -804,8 +812,12 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa #endif parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel(); @@ -17671,7 +17599,7 @@ index 0961367a61e89647c40c03962a4ba3d0ea6b1ab9..fd2b1c6e37a933ffb8b9e4467c7eca8f 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 fdfd48ca1ebc0a74772f58bf90f5b8a4e79b3aad..f14e10ce82025ce22767e9b4497effd3e7796153 100644 +index 4c1c4b4a50efa40c7b1af78b8b84a4f7919b10e1..5684dc51ee130b500ca802868149db5ea0c46ce1 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp @@ -143,6 +143,11 @@ HashMap& WebProcessProxy::allProcesses() @@ -17687,7 +17615,7 @@ index fdfd48ca1ebc0a74772f58bf90f5b8a4e79b3aad..f14e10ce82025ce22767e9b4497effd3 { return allProcesses().get(identifier); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h -index edc5090ecf29c032d3c2d78558f669a36f0d3dbb..0b5ee06e4f3e2b4f10b8f51687f68a0bbc537541 100644 +index f514b9916ad4082a7f071f657378fef3ed22a831..7ff2168724c20bbacbdb597ed121985fca1201c3 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.h +++ b/Source/WebKit/UIProcess/WebProcessProxy.h @@ -143,6 +143,7 @@ public: @@ -17699,10 +17627,10 @@ index edc5090ecf29c032d3c2d78558f669a36f0d3dbb..0b5ee06e4f3e2b4f10b8f51687f68a0b WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index 71cf9207efd9ca295ab890d676e2d39d492d6658..48a161acba75caec0c79ffe4bae493e69ad4903b 100644 +index 42e118c6aaf3658f16a82f89e9918bd29630b11c..c6e12f12308647a47bd96b04e505a0d82fbc5949 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -2038,6 +2038,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O +@@ -2041,6 +2041,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O networkProcess().renameOriginInWebsiteData(m_sessionID, oldName, newName, dataTypes, WTFMove(completionHandler)); } @@ -18430,7 +18358,7 @@ index 0000000000000000000000000000000000000000..d0f9827544994e450e24e3f7a427c35e + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm -index fac9e7fb78bee0f62945672e3bb74b9e0520e30f..9b2a0d4acaa90efb00aa4d8dd981890c085cedaf 100644 +index 92126cdc69a7fd3cdae6aa0f4be8743e2b0c70b2..d64a10ca21bf43961ab35992763dc148378df3b3 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) @@ -19767,7 +19695,7 @@ index 1b9d97c38c412a7cc8d3ffc4a52ca5ce656755f2..11541664ef8af36f43cee3cc1d2d8f4a $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/unified-sources/UnifiedSource12.cpp $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/unified-sources/UnifiedSource13-mm.mm diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0dca0075ee 100644 +index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76065b227a 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj @@ -1236,6 +1236,7 @@ @@ -19807,7 +19735,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d 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 */; }; -@@ -4858,6 +4874,7 @@ +@@ -4857,6 +4873,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; }; @@ -19815,7 +19743,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d 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 = ""; }; -@@ -6262,6 +6279,19 @@ +@@ -6263,6 +6280,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 = ""; }; @@ -19835,7 +19763,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d 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 = ""; }; -@@ -6383,6 +6413,14 @@ +@@ -6384,6 +6414,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 = ""; }; @@ -19850,7 +19778,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d 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 = ""; }; -@@ -6529,6 +6567,7 @@ +@@ -6528,6 +6566,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -19858,7 +19786,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -8223,6 +8262,7 @@ +@@ -8224,6 +8263,7 @@ 3CAECB5E27465AE300AB78D0 /* UnifiedSource113.cpp */, 4CAECB5E27465AE300AB78D0 /* UnifiedSource114.cpp */, 5CAECB5E27465AE300AB78D0 /* UnifiedSource115.cpp */, @@ -19866,7 +19794,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d ); name = "unified-sources"; path = "DerivedSources/WebKit/unified-sources"; -@@ -8583,6 +8623,7 @@ +@@ -8584,6 +8624,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -19874,7 +19802,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -9719,6 +9760,7 @@ +@@ -9718,6 +9759,7 @@ isa = PBXGroup; children = ( 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -19882,7 +19810,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, 51F7BB7E274564A100C45A72 /* Security.framework */, -@@ -10227,6 +10269,12 @@ +@@ -10226,6 +10268,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -19895,7 +19823,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d ); path = Agents; sourceTree = ""; -@@ -10235,6 +10283,7 @@ +@@ -10234,6 +10282,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -19903,7 +19831,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -10781,6 +10830,12 @@ +@@ -10780,6 +10829,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -19916,7 +19844,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -11086,6 +11141,7 @@ +@@ -11085,6 +11140,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -19924,7 +19852,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -11674,6 +11730,11 @@ +@@ -11673,6 +11729,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -19936,7 +19864,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, C1817362205844A900DFDA65 /* DisplayLink.cpp */, -@@ -12594,6 +12655,7 @@ +@@ -12593,6 +12654,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -19944,7 +19872,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -12903,6 +12965,7 @@ +@@ -12901,6 +12963,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -19952,7 +19880,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -12918,6 +12981,7 @@ +@@ -12916,6 +12979,7 @@ 410F0D4C2701EFF900F96DFC /* GPUProcessConnectionInitializationParameters.h in Headers */, 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -19960,7 +19888,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -13064,6 +13128,7 @@ +@@ -13062,6 +13126,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -19968,7 +19896,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, 93085DE026E5BCFD000EC6A7 /* NetworkStorageManager.h in Headers */, -@@ -13129,6 +13194,7 @@ +@@ -13127,6 +13192,7 @@ BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -19976,7 +19904,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, 517B5F81275E97B6002DC22D /* PushAppBundle.h in Headers */, -@@ -13154,6 +13220,7 @@ +@@ -13152,6 +13218,7 @@ CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, @@ -19984,7 +19912,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -13486,6 +13553,7 @@ +@@ -13484,6 +13551,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -19992,7 +19920,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -13622,6 +13690,7 @@ +@@ -13620,6 +13688,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -20000,7 +19928,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -13675,6 +13744,7 @@ +@@ -13673,6 +13742,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -20008,7 +19936,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -13831,6 +13901,7 @@ +@@ -13829,6 +13899,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -20016,7 +19944,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -15431,6 +15502,8 @@ +@@ -15429,6 +15500,8 @@ C1A152D724E5A29A00978C8B /* HandleXPCEndpointMessages.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -20025,7 +19953,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */, C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */, 2984F588164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp in Sources */, -@@ -15704,6 +15777,7 @@ +@@ -15702,6 +15775,7 @@ 3CAECB6627465AE400AB78D0 /* UnifiedSource113.cpp in Sources */, 4CAECB6627465AE400AB78D0 /* UnifiedSource114.cpp in Sources */, 5CAECB6627465AE400AB78D0 /* UnifiedSource115.cpp in Sources */, @@ -20033,7 +19961,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d E38A1FC023A551BF00D2374F /* UserInterfaceIdiom.mm in Sources */, CD491B0D1E732E4D00009066 /* UserMediaCaptureManagerMessageReceiver.cpp in Sources */, CD491B171E73525500009066 /* UserMediaCaptureManagerProxyMessageReceiver.cpp in Sources */, -@@ -15752,6 +15826,8 @@ +@@ -15750,6 +15824,8 @@ 51F060E11654318500F3282F /* WebMDNSRegisterMessageReceiver.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -20043,7 +19971,7 @@ index 22894ab8f47fa46a7fb3c8aba5e0af512fc39af5..842f08cad6eb7d374f285b584e25ad0d 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 c3df153e0e6a27fb670417003a34d30b81c55c29..e7088b465d73f9846393d640d49b457d8348c57b 100644 +index 6f677eef4e6859ce5d4080e1ec95e7b7b9514707..3bda007bc35913a979555c129af7adb1d16bbc25 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 @@ -20068,15 +19996,24 @@ index c3df153e0e6a27fb670417003a34d30b81c55c29..e7088b465d73f9846393d640d49b457d { auto identifier = resourceLoader.identifier(); ASSERT(identifier); -@@ -307,7 +313,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -310,7 +316,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL + RunLoop::main().dispatch([resourceLoader = Ref { resourceLoader }] { + resourceLoader->didFail(resourceLoader->blockedError()); + }); +- return; ++ return false; + } + } - auto* frame = resourceLoader.frame(); +@@ -320,7 +326,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); - NetworkResourceLoadParameters loadParameters; loadParameters.identifier = identifier; loadParameters.webPageProxyID = trackingParameters.webPageProxyID; loadParameters.webPageID = trackingParameters.pageID; -@@ -392,14 +397,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -405,14 +410,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL if (loadParameters.options.mode != FetchOptions::Mode::Navigate) { ASSERT(loadParameters.sourceOrigin); @@ -20094,7 +20031,7 @@ index c3df153e0e6a27fb670417003a34d30b81c55c29..e7088b465d73f9846393d640d49b457d loadParameters.isMainFrameNavigation = resourceLoader.frame() && resourceLoader.frame()->isMainFrame() && resourceLoader.options().mode == FetchOptions::Mode::Navigate; if (loadParameters.isMainFrameNavigation && document) -@@ -431,6 +433,17 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -444,6 +446,17 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL } ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == ClientCredentialPolicy::CannotAskClientForCredentials); @@ -20112,7 +20049,7 @@ index c3df153e0e6a27fb670417003a34d30b81c55c29..e7088b465d73f9846393d640d49b457d std::optional existingNetworkResourceLoadIdentifierToResume; if (loadParameters.isMainFrameNavigation) -@@ -445,7 +458,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -458,7 +471,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL } auto loader = WebResourceLoader::create(resourceLoader, trackingParameters); @@ -20121,7 +20058,7 @@ index c3df153e0e6a27fb670417003a34d30b81c55c29..e7088b465d73f9846393d640d49b457d } void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader) -@@ -852,7 +865,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier +@@ -865,7 +878,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier bool WebLoaderStrategy::isOnLine() const { @@ -20130,7 +20067,7 @@ index c3df153e0e6a27fb670417003a34d30b81c55c29..e7088b465d73f9846393d640d49b457d } void WebLoaderStrategy::addOnlineStateChangeListener(Function&& listener) -@@ -872,6 +885,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet +@@ -885,6 +898,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet void WebLoaderStrategy::setOnLineState(bool isOnLine) { @@ -20142,7 +20079,7 @@ index c3df153e0e6a27fb670417003a34d30b81c55c29..e7088b465d73f9846393d640d49b457d if (m_isOnLine == isOnLine) return; -@@ -880,6 +898,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) +@@ -893,6 +911,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) listener(isOnLine); } @@ -20186,10 +20123,10 @@ index 2290d987c36f68245b08fb2b86319d4d5a68e4a3..f22b3a7c855918b11582dd1ea9be00b2 } // namespace WebKit diff --git a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp -index 310fca7875c32c3cd7478db64f59ac2cf5016392..726e42d3bbf42c1df366cda2b69294da16d29fee 100644 +index eadd84730f11b773b0352dbaafe8ddacda876093..3d37ef89dcdd2c50bbfd15cbb9d56bcbcda3cce0 100644 --- a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp +++ b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp -@@ -163,9 +163,6 @@ void WebResourceLoader::didReceiveResponse(const ResourceResponse& response, boo +@@ -175,9 +175,6 @@ void WebResourceLoader::didReceiveResponse(const ResourceResponse& response, boo } m_coreLoader->didReceiveResponse(inspectorResponse, [this, protectedThis = WTFMove(protectedThis), interceptedRequestIdentifier, policyDecisionCompletionHandler = WTFMove(policyDecisionCompletionHandler), overrideData = WTFMove(overrideData)]() mutable { @@ -20199,7 +20136,7 @@ index 310fca7875c32c3cd7478db64f59ac2cf5016392..726e42d3bbf42c1df366cda2b69294da if (!m_coreLoader || !m_coreLoader->identifier()) { m_interceptController.continueResponse(interceptedRequestIdentifier); return; -@@ -183,6 +180,8 @@ void WebResourceLoader::didReceiveResponse(const ResourceResponse& response, boo +@@ -195,6 +192,8 @@ void WebResourceLoader::didReceiveResponse(const ResourceResponse& response, boo } }); }); @@ -20276,10 +20213,10 @@ index 2eb0886f13ed035a53b8eaa60605de4dfe53fbe3..c46393209cb4f80704bbc9268fad4371 { } diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -index 14a083ca207a9063cf80b1e7e9670a487cf4d399..bac00a81f00ebef2461e040cc6b3e9c06a03fa37 100644 +index 4b6b34857e78e56f526bcf6453c452b7e4324b8f..6341e38b508cf02d2aca45ce2dbda08e385f930f 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -@@ -1574,13 +1574,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() +@@ -1573,13 +1573,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() if (webPage->scrollPinningBehavior() != DoNotPin) view->setScrollPinningBehavior(webPage->scrollPinningBehavior()); @@ -20435,7 +20372,7 @@ index 0000000000000000000000000000000000000000..9b413bb8150a1633d29b6e2606127c9c + +#endif // ENABLE(DRAG_SUPPORT) diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp -index 712b7138a00419f32edc9fa1ee67b6b32bc46486..9dcaa5d97b6d693ac339e2c4ac8c697c768d89a0 100644 +index f9a11c6528888b132c7207a8f3a5dbbc9583d27b..0709dbfa58d5b7261480ce1776432c3d84954601 100644 --- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp +++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp @@ -38,6 +38,7 @@ @@ -20446,7 +20383,7 @@ index 712b7138a00419f32edc9fa1ee67b6b32bc46486..9dcaa5d97b6d693ac339e2c4ac8c697c #include #include #include -@@ -124,6 +125,16 @@ void DrawingAreaCoordinatedGraphics::scroll(const IntRect& scrollRect, const Int +@@ -116,6 +117,16 @@ void DrawingAreaCoordinatedGraphics::scroll(const IntRect& scrollRect, const Int ASSERT(m_scrollRect.isEmpty()); ASSERT(m_scrollOffset.isEmpty()); ASSERT(m_dirtyRegion.isEmpty()); @@ -20463,7 +20400,7 @@ index 712b7138a00419f32edc9fa1ee67b6b32bc46486..9dcaa5d97b6d693ac339e2c4ac8c697c m_layerTreeHost->scrollNonCompositedContents(scrollRect); return; } -@@ -256,6 +267,7 @@ void DrawingAreaCoordinatedGraphics::updatePreferences(const WebPreferencesStore +@@ -248,6 +259,7 @@ void DrawingAreaCoordinatedGraphics::updatePreferences(const WebPreferencesStore settings.setAcceleratedCompositingEnabled(false); } #endif @@ -20471,7 +20408,7 @@ index 712b7138a00419f32edc9fa1ee67b6b32bc46486..9dcaa5d97b6d693ac339e2c4ac8c697c settings.setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey())); // Fixed position elements need to be composited and create stacking contexts // in order to be scrolled by the ScrollingCoordinator. -@@ -669,6 +681,11 @@ void DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode(GraphicsLay +@@ -661,6 +673,11 @@ void DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode(GraphicsLay m_scrollOffset = IntSize(); m_displayTimer.stop(); m_isWaitingForDidUpdate = false; @@ -20483,7 +20420,7 @@ index 712b7138a00419f32edc9fa1ee67b6b32bc46486..9dcaa5d97b6d693ac339e2c4ac8c697c } void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode() -@@ -718,6 +735,11 @@ void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode() +@@ -710,6 +727,11 @@ void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode() // UI process, we still need to let it know about the new contents, so send an Update message. send(Messages::DrawingAreaProxy::Update(m_backingStoreStateID, updateInfo)); } @@ -20656,10 +20593,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 942edc623a4e653bb188aee050644a3f4a032e89..1c9c32505d7c23b7e2754366b4ad49aa153af9a7 100644 +index 6188ec6d486f2a98d241ca5d755cb5b0b5cea9e7..351d76944af30bbc781d9ed5586167bbeb90187a 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -@@ -920,6 +920,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) +@@ -918,6 +918,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) } #endif @@ -20669,7 +20606,7 @@ index 942edc623a4e653bb188aee050644a3f4a032e89..1c9c32505d7c23b7e2754366b4ad49aa updateThrottleState(); } -@@ -1688,6 +1691,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet +@@ -1686,6 +1689,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet } #endif @@ -20692,7 +20629,7 @@ index 942edc623a4e653bb188aee050644a3f4a032e89..1c9c32505d7c23b7e2754366b4ad49aa void WebPage::loadRequest(LoadParameters&& loadParameters) { setLastNavigationWasAppInitiated(loadParameters.request.isAppInitiated()); -@@ -1944,17 +1963,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1942,17 +1961,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -20711,7 +20648,7 @@ index 942edc623a4e653bb188aee050644a3f4a032e89..1c9c32505d7c23b7e2754366b4ad49aa // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -1971,20 +1986,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1969,20 +1984,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -20739,7 +20676,7 @@ index 942edc623a4e653bb188aee050644a3f4a032e89..1c9c32505d7c23b7e2754366b4ad49aa #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -1992,7 +2005,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1990,7 +2003,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -20747,7 +20684,7 @@ index 942edc623a4e653bb188aee050644a3f4a032e89..1c9c32505d7c23b7e2754366b4ad49aa void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2287,6 +2299,7 @@ void WebPage::scaleView(double scale) +@@ -2285,6 +2297,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -20755,7 +20692,7 @@ index 942edc623a4e653bb188aee050644a3f4a032e89..1c9c32505d7c23b7e2754366b4ad49aa scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2391,17 +2404,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2389,17 +2402,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -20774,7 +20711,7 @@ index 942edc623a4e653bb188aee050644a3f4a032e89..1c9c32505d7c23b7e2754366b4ad49aa } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3293,6 +3302,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3291,6 +3300,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -20879,7 +20816,7 @@ index 942edc623a4e653bb188aee050644a3f4a032e89..1c9c32505d7c23b7e2754366b4ad49aa #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3369,6 +3476,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3367,6 +3474,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -20891,7 +20828,7 @@ index 942edc623a4e653bb188aee050644a3f4a032e89..1c9c32505d7c23b7e2754366b4ad49aa void WebPage::insertNewlineInQuotedContent() { Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame(); -@@ -3607,6 +3719,7 @@ void WebPage::didCompletePageTransition() +@@ -3605,6 +3717,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -20899,7 +20836,7 @@ index 942edc623a4e653bb188aee050644a3f4a032e89..1c9c32505d7c23b7e2754366b4ad49aa } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4464,7 +4577,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4421,7 +4534,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -20908,7 +20845,7 @@ index 942edc623a4e653bb188aee050644a3f4a032e89..1c9c32505d7c23b7e2754366b4ad49aa void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6789,6 +6902,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6746,6 +6859,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -20919,7 +20856,7 @@ index 942edc623a4e653bb188aee050644a3f4a032e89..1c9c32505d7c23b7e2754366b4ad49aa return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index a94b5b9d7fe32f24a86daaad44842b0cdd0aeb2f..e67aa04b6ed080ac0c07f12f78f9eed49cf05cac 100644 +index 067f1bb3e3d20f8efa83cafd2e3fae4fc9193ea8..aa36a075496b4b30bac5748a31a4ff26c3e5d54c 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -122,6 +122,10 @@ typedef struct _AtkObject AtkObject; @@ -20933,7 +20870,7 @@ index a94b5b9d7fe32f24a86daaad44842b0cdd0aeb2f..e67aa04b6ed080ac0c07f12f78f9eed4 #if PLATFORM(GTK) || PLATFORM(WPE) #include "InputMethodState.h" #endif -@@ -986,11 +990,11 @@ public: +@@ -983,11 +987,11 @@ public: void clearSelection(); void restoreSelectionInFocusedEditableElement(); @@ -20947,7 +20884,7 @@ index a94b5b9d7fe32f24a86daaad44842b0cdd0aeb2f..e67aa04b6ed080ac0c07f12f78f9eed4 void performDragControllerAction(DragControllerAction, const WebCore::DragData&, SandboxExtension::Handle&&, Vector&&); #endif -@@ -1004,6 +1008,9 @@ public: +@@ -1001,6 +1005,9 @@ public: void didStartDrag(); void dragCancelled(); OptionSet allowedDragSourceActions() const { return m_allowedDragSourceActions; } @@ -20957,7 +20894,7 @@ index a94b5b9d7fe32f24a86daaad44842b0cdd0aeb2f..e67aa04b6ed080ac0c07f12f78f9eed4 #endif void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&); -@@ -1240,6 +1247,7 @@ public: +@@ -1237,6 +1244,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -20965,7 +20902,7 @@ index a94b5b9d7fe32f24a86daaad44842b0cdd0aeb2f..e67aa04b6ed080ac0c07f12f78f9eed4 void insertNewlineInQuotedContent(); -@@ -1598,6 +1606,7 @@ private: +@@ -1595,6 +1603,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -20973,7 +20910,7 @@ index a94b5b9d7fe32f24a86daaad44842b0cdd0aeb2f..e67aa04b6ed080ac0c07f12f78f9eed4 void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1635,6 +1644,7 @@ private: +@@ -1632,6 +1641,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -20981,7 +20918,7 @@ index a94b5b9d7fe32f24a86daaad44842b0cdd0aeb2f..e67aa04b6ed080ac0c07f12f78f9eed4 #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1759,9 +1769,7 @@ private: +@@ -1756,9 +1766,7 @@ private: void findRectsForStringMatches(const String&, OptionSet, uint32_t maxMatchCount, CompletionHandler&&)>&&); void hideFindIndicator(); @@ -20991,7 +20928,7 @@ index a94b5b9d7fe32f24a86daaad44842b0cdd0aeb2f..e67aa04b6ed080ac0c07f12f78f9eed4 void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2294,6 +2302,7 @@ private: +@@ -2291,6 +2299,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -21000,10 +20937,10 @@ index a94b5b9d7fe32f24a86daaad44842b0cdd0aeb2f..e67aa04b6ed080ac0c07f12f78f9eed4 bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index b27229471eae86ee5981983dd57b5e7a8291cd4b..6eba477486aa9289d8ac9ae0e918ff46104fd888 100644 +index c02a90aa65288be2763c684b268e45996c2d8de6..195afea8d7325bf219bde64551cea35eb5a6a145 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -@@ -137,6 +137,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -133,6 +133,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType ConnectInspector(String targetId, Inspector::FrontendChannel::ConnectionType connectionType) DisconnectInspector(String targetId) SendMessageToTargetBackend(String targetId, String message) @@ -21011,7 +20948,7 @@ index b27229471eae86ee5981983dd57b5e7a8291cd4b..6eba477486aa9289d8ac9ae0e918ff46 #if ENABLE(REMOTE_INSPECTOR) SetIndicating(bool indicating); -@@ -148,6 +149,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -144,6 +145,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType #endif #if !ENABLE(IOS_TOUCH_EVENTS) && ENABLE(TOUCH_EVENTS) TouchEvent(WebKit::WebTouchEvent event) @@ -21019,7 +20956,7 @@ index b27229471eae86ee5981983dd57b5e7a8291cd4b..6eba477486aa9289d8ac9ae0e918ff46 #endif CancelPointer(WebCore::PointerID pointerId, WebCore::IntPoint documentPoint) -@@ -177,6 +179,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -173,6 +175,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) @@ -21027,7 +20964,7 @@ index b27229471eae86ee5981983dd57b5e7a8291cd4b..6eba477486aa9289d8ac9ae0e918ff46 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) -@@ -319,10 +322,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -315,10 +318,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType AddMIMETypeWithCustomContentProvider(String mimeType) # Drag and drop. @@ -21040,7 +20977,7 @@ index b27229471eae86ee5981983dd57b5e7a8291cd4b..6eba477486aa9289d8ac9ae0e918ff46 PerformDragControllerAction(enum:uint8_t WebKit::DragControllerAction action, WebCore::DragData dragData, WebKit::SandboxExtension::Handle sandboxExtensionHandle, Vector sandboxExtensionsForUpload) #endif #if ENABLE(DRAG_SUPPORT) -@@ -331,6 +334,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -327,6 +330,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType DragCancelled() #endif @@ -21144,7 +21081,7 @@ index afad4f9b13ab16b092525a84baaed34933c8e51c..c432676686dae42905ef45dfd4957f95 } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index fa993287cfb6d0834de919d18ddde8902ba9466c..9ae38122ec35b93b093302fb8f130b7a96b0b574 100644 +index f816775a7994ab22cc2fbc26000e9d22f2fc2c6a..d0583cc13affd83d34a74a96cf14687c0eb6694d 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -88,6 +88,7 @@ @@ -21155,7 +21092,7 @@ index fa993287cfb6d0834de919d18ddde8902ba9466c..9ae38122ec35b93b093302fb8f130b7a #include #include #include -@@ -351,6 +352,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter +@@ -349,6 +350,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter platformInitializeProcess(parameters); updateCPULimit(); @@ -21180,10 +21117,10 @@ index 8987c3964a9308f2454759de7f8972215a3ae416..bcac0afeb94ed8123d1f9fb0b932c849 SetProcessDPIAware(); return true; diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -index 28d875929ccacdb9a1388a826b2fd5ecf46eccd9..ada055ddcc2c659ba96efbe2739e1c9d8f43ab9f 100644 +index 49899318dc9ac52e3c887b54e789aec60b973050..edf2f4b8ef72eb3812b6447a5a628ba3bb87867a 100644 --- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -@@ -4168,7 +4168,7 @@ static BOOL currentScrollIsBlit(NSView *clipView) +@@ -4169,7 +4169,7 @@ static BOOL currentScrollIsBlit(NSView *clipView) _private->handlingMouseDownEvent = NO; } @@ -21193,10 +21130,10 @@ index 28d875929ccacdb9a1388a826b2fd5ecf46eccd9..ada055ddcc2c659ba96efbe2739e1c9d - (void)touch:(WebEvent *)event { diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm -index 2baab1a34c19b6a2f14371f633d0350084985c0d..ac0a51a3fde5d91510364df122861ccf611d85d4 100644 +index f381b7a3a5acf2fe8be4f79c34fd3b941fab04bc..b0b0a83e1be1d9f4539992f4deb031c57415ac7b 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm -@@ -4057,7 +4057,7 @@ IGNORE_WARNINGS_END +@@ -4058,7 +4058,7 @@ IGNORE_WARNINGS_END } #endif // PLATFORM(IOS_FAMILY) @@ -21205,7 +21142,7 @@ index 2baab1a34c19b6a2f14371f633d0350084985c0d..ac0a51a3fde5d91510364df122861ccf - (NSArray *)_touchEventRegions { -@@ -4099,7 +4099,7 @@ IGNORE_WARNINGS_END +@@ -4100,7 +4100,7 @@ IGNORE_WARNINGS_END }).autorelease(); } @@ -21990,7 +21927,7 @@ index 1e3db5a4d3e39b8d54d1681e05bf6cccb7fcd061..e4b84ef77b85eeeed645701852330f42 # WebInspectorUI must come after JavaScriptCore and WebCore but before WebKit and WebKit2 my $webKitIndex = first { $projects[$_] eq "Source/WebKitLegacy" } 0..$#projects; diff --git a/Tools/WebKitTestRunner/PlatformGTK.cmake b/Tools/WebKitTestRunner/PlatformGTK.cmake -index 6d570521e0952e78ccf73eb01a15f7937a013a78..3b5013eb982a68741ef2be52842b56ef059bc321 100644 +index 44ebbc30033692f13543fdb50a86c921decd6a94..93edbf8c4084ff8400be2a13bbeb539a7a79f949 100644 --- a/Tools/WebKitTestRunner/PlatformGTK.cmake +++ b/Tools/WebKitTestRunner/PlatformGTK.cmake @@ -26,6 +26,7 @@ list(APPEND WebKitTestRunner_LIBRARIES @@ -22014,7 +21951,7 @@ index 6d2fa822376c3c230afcd04ce86e26033c5c2e80..47693c2373e8953a02512a4db8cbf23b list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp -index 21a4736d9b4614ff81d4466c2bf2fc51e75c8b15..ca4e89105880a3dcda53f15a1039d3de55b1cbf4 100644 +index b5ba4f3eaee0c1b09a21b25de03a0e9765e66129..f1829e08ddc32052093b552d4053a13295ae650a 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp @@ -808,6 +808,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)