diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 7da78860e8..bd5612ce42 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1578 -Changed: pavel.feldman@gmail.com Sat, Nov 13, 2021 4:33:41 AM +1579 +Changed: dpino@igalia.com Thu 18 Nov 2021 07:04:08 AM UTC diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 21269ea988..6ea1914470 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="6bd6327f36a6a75781c39b07e430054cad815b4a" +BASE_REVISION="a8d27d2f68e72abd50ed4a142af0d05f9aef662c" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index fbadc09256..57b07dabab 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 a5ded62074a8522f1d55c7226ee90d02043c8251..6edaf1ef307dedfb354c91ffe5b83281890acb09 100644 +index f1a30e2f9552f1ca282f626a82c0a6fbe8b978a0..8085033676c04b5e5124e7f669a3ef0ae35ad749 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1352,22 +1352,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1353,22 +1353,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json @@ -1771,7 +1771,7 @@ index 2decf8a83c80e80ca8677f4c787bf79c6c2995fa..9010384a32f7c2ab69a8fb20eb19cd56 } diff --git a/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp b/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp -index ac300f435286a4cee2aec52a2c6dc90967780140..1cf1ad75c6a08bdc92f089bd80909305f2ac69e1 100644 +index c2d49da98a660bc62b04afe19c578f2592fd4bb9..f27c12db93e099a2dea9ffeb57be72a0eedf656a 100644 --- a/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp +++ b/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp @@ -36,6 +36,7 @@ @@ -2028,7 +2028,7 @@ index a4eef414ab4e495956517320ae72235750e1c5d6..e8942e7e3b9cd57ae8b25e4854df37fe 41323A1D2665288B00B38623 /* packet_sequencer.cc in Sources */, 4131BF2D234B88200028A615 /* rtc_stats_collector.cc in Sources */, diff --git a/Source/WTF/Scripts/Preferences/WebPreferences.yaml b/Source/WTF/Scripts/Preferences/WebPreferences.yaml -index d1673e78a4c97eece29154945bf0b771a4e7ecdb..63e414c9e736759386bd9685972f1f0b69e3a4f7 100644 +index ec82bf5b5a299d712070348ec41bbd9b636769e2..ad4f609159399f4994743a12cc45d0faec16bdde 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferences.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferences.yaml @@ -1031,7 +1031,7 @@ InspectorStartsAttached: @@ -2040,7 +2040,7 @@ index d1673e78a4c97eece29154945bf0b771a4e7ecdb..63e414c9e736759386bd9685972f1f0b InspectorWindowFrame: type: String -@@ -1760,6 +1760,17 @@ PluginsEnabled: +@@ -1771,6 +1771,17 @@ PluginsEnabled: WebCore: default: false @@ -2059,7 +2059,7 @@ index d1673e78a4c97eece29154945bf0b771a4e7ecdb..63e414c9e736759386bd9685972f1f0b type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index 6567e8d94ea4a2368139601cf96d6b59eb415ea4..e4b8bf95eb30f2f15d73b0eb77b1c86c7d8c2f02 100644 +index d14c4b4aae5e9f998ff36aef56103704f2e20e85..5d448c01d9c8d70a3ad42d4831a8f3ffa2b2aafb 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -432,7 +432,7 @@ CrossOriginOpenerPolicyEnabled: @@ -2083,7 +2083,7 @@ index 6567e8d94ea4a2368139601cf96d6b59eb415ea4..e4b8bf95eb30f2f15d73b0eb77b1c86c # FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well. MediaCapabilitiesExtensionsEnabled: -@@ -1260,7 +1260,7 @@ SpeechRecognitionEnabled: +@@ -1273,7 +1273,7 @@ SpeechRecognitionEnabled: WebKitLegacy: default: false WebKit: @@ -2227,7 +2227,7 @@ index 7bb27e9976fb14e06fa4ee48553617fca06d8d7b..79ac2c9e778c1efca4f588edd4271bf8 WTF_EXPORT_PRIVATE LocalTimeOffset calculateLocalTimeOffset(double utcInMilliseconds, TimeType = UTCTime); diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index b49690682ac7918e3a749c87b97301dcfa3574ea..51d78fcf0c3d653baf47c973475d6f5afa1049bc 100644 +index 24cc44a5c88de5f78cd96404f23060ee514301ec..c922489288e827ebd0b249e64609459c2bbe2752 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h @@ -408,7 +408,7 @@ @@ -2274,7 +2274,7 @@ index 3901bfb0f5479064f4e7b67c90621ff26d74b580..5b3615a871d0d7123822394c94d5ce10 if (Journald_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 2d13e825a586c222d505728d0fb5ffb358bdbd9f..07506cc7ab7f63885e79c1431ee536cee03520ec 100644 +index ccec1efd11d29875919255fee7a6ac2364376681..9239b35fb7b1b59f26070d79bcfa96ee095aa530 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -384,7 +384,7 @@ @@ -2388,7 +2388,7 @@ index bc5c6219b5dadc3b1cdc590d65c897b7250b1e21..37d07ef4f59ad450077d90d451cf5120 _hasSentSpeechStart = true; _delegateCallback(SpeechRecognitionUpdate::create(_identifier, SpeechRecognitionUpdateType::SpeechStart)); diff --git a/Source/WebCore/PlatformWPE.cmake b/Source/WebCore/PlatformWPE.cmake -index 9f4daefcd385d534149f0a5a6ce0e8016e25638f..37f64495ec9b316bbf0a5e3212917d43b30ff396 100644 +index cfbfe4f66dbc339e68179f4ceb48a02c3c122926..66050a7c29254f73d04273510b5e0642f79e9173 100644 --- a/Source/WebCore/PlatformWPE.cmake +++ b/Source/WebCore/PlatformWPE.cmake @@ -42,6 +42,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS @@ -2400,10 +2400,10 @@ index 9f4daefcd385d534149f0a5a6ce0e8016e25638f..37f64495ec9b316bbf0a5e3212917d43 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index 612583af688a952423a23c3e29613a7b75cc5779..9443c611ea4606bdd20383f17b6e67a1c9c72aaa 100644 +index b287710cdf0da7084615f2f28a14722221a964a1..484d841b7cb4b621e0160c9207e4bf4f63cdb67c 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt -@@ -605,3 +605,9 @@ platform/graphics/angle/ANGLEUtilities.cpp @no-unify +@@ -609,3 +609,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 @@ -2465,10 +2465,10 @@ index 9f85e4986c53a1cc8d63b3394d3f7295832af387..1228fda7c688c5b24cecaf07e21437d3 __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 299a88660f1eb022cbd8b4edc231b22909bda144..9a602e84a87b0736a0cdd8182980eec06f38e82c 100644 +index 9104f545b2a00b03c27cf71a1691a92808af9ada..dbbc87d407b39c02c102739fb1d4390677a14774 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5412,6 +5412,14 @@ +@@ -5421,6 +5421,14 @@ 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, ); }; }; @@ -2483,7 +2483,7 @@ index 299a88660f1eb022cbd8b4edc231b22909bda144..9a602e84a87b0736a0cdd8182980eec0 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, ); }; }; -@@ -17173,6 +17181,14 @@ +@@ -17209,6 +17217,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 = ""; }; @@ -2498,7 +2498,7 @@ index 299a88660f1eb022cbd8b4edc231b22909bda144..9a602e84a87b0736a0cdd8182980eec0 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 = ""; }; -@@ -23122,7 +23138,12 @@ +@@ -23160,7 +23176,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2511,7 +2511,7 @@ index 299a88660f1eb022cbd8b4edc231b22909bda144..9a602e84a87b0736a0cdd8182980eec0 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -28975,6 +28996,8 @@ +@@ -29055,6 +29076,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2520,7 +2520,7 @@ index 299a88660f1eb022cbd8b4edc231b22909bda144..9a602e84a87b0736a0cdd8182980eec0 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -31226,6 +31249,7 @@ +@@ -31309,6 +31332,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2528,7 +2528,7 @@ index 299a88660f1eb022cbd8b4edc231b22909bda144..9a602e84a87b0736a0cdd8182980eec0 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -32241,6 +32265,7 @@ +@@ -32326,6 +32350,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2536,7 +2536,7 @@ index 299a88660f1eb022cbd8b4edc231b22909bda144..9a602e84a87b0736a0cdd8182980eec0 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -34334,6 +34359,7 @@ +@@ -34423,6 +34448,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2544,7 +2544,7 @@ index 299a88660f1eb022cbd8b4edc231b22909bda144..9a602e84a87b0736a0cdd8182980eec0 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -36458,9 +36484,11 @@ +@@ -36555,9 +36581,11 @@ B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */, @@ -2556,7 +2556,7 @@ index 299a88660f1eb022cbd8b4edc231b22909bda144..9a602e84a87b0736a0cdd8182980eec0 B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -37421,6 +37449,7 @@ +@@ -37518,6 +37546,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2564,7 +2564,7 @@ index 299a88660f1eb022cbd8b4edc231b22909bda144..9a602e84a87b0736a0cdd8182980eec0 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -37490,6 +37519,7 @@ +@@ -37587,6 +37616,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2572,7 +2572,7 @@ index 299a88660f1eb022cbd8b4edc231b22909bda144..9a602e84a87b0736a0cdd8182980eec0 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -37538,6 +37568,7 @@ +@@ -37635,6 +37665,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2580,7 +2580,7 @@ index 299a88660f1eb022cbd8b4edc231b22909bda144..9a602e84a87b0736a0cdd8182980eec0 DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -38070,6 +38101,7 @@ +@@ -38167,6 +38198,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2589,7 +2589,7 @@ index 299a88660f1eb022cbd8b4edc231b22909bda144..9a602e84a87b0736a0cdd8182980eec0 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 3b66232fdce0d23055531d96473d1aee5cf004ef..da28fe4174bb30136fbdb863a5a6366f2b87c0a9 100644 +index 93848e1cab76d7987638db8f3daa638f9990fe09..c8f7c9fa69fd10981f3d63007c9624ff8abb0522 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -60,6 +60,7 @@ @@ -2600,7 +2600,7 @@ index 3b66232fdce0d23055531d96473d1aee5cf004ef..da28fe4174bb30136fbdb863a5a6366f #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3508,10 +3509,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -3476,10 +3477,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (useParentData ? m_isIgnoredFromParentData.isPresentationalChildOfAriaRole : isPresentationalChildOfAriaRole()) return AccessibilityObjectInclusion::IgnoreObject; @@ -2620,7 +2620,7 @@ index 3b66232fdce0d23055531d96473d1aee5cf004ef..da28fe4174bb30136fbdb863a5a6366f { AXComputedObjectAttributeCache* attributeCache = nullptr; diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -index ab59be81511cb7e2172e2d1a1af92d699b547ed1..d83ec1dedc4956bf3f04b363912d04c941dee774 100644 +index 261d89346ffb43466fda3e1551d262ef96a69eb8..777edd5e48943ffcbb8414a70835993cef78d4ca 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h @@ -109,6 +109,8 @@ namespace WebCore { @@ -2875,7 +2875,7 @@ index 9dd41d6366512fd385937a7608bd3fc9b5b90f60..d6bb529fb891a65c8f6dcc6cff1e718c #endif // USE(LIBWPE) diff --git a/Source/WebCore/html/FileInputType.cpp b/Source/WebCore/html/FileInputType.cpp -index 40b012a9adfbd4f5e265880509e36642669a683c..8b8e44114491fff5750bf7ddd5ff685f8c662781 100644 +index b0c9fae7d3da54711a7259f05e3460b46acf4edb..0fc3b7fb34a82c74bc07c554d2ed85859a08c848 100644 --- a/Source/WebCore/html/FileInputType.cpp +++ b/Source/WebCore/html/FileInputType.cpp @@ -36,6 +36,7 @@ @@ -5342,7 +5342,7 @@ index 16edb3bc689b8e2dde17597b642b706c1343e1f5..f363b2ca2410f22cff8d6ad908a88527 private: diff --git a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp -index 8d4446b3e412e139de6515a83cebd1c3ede0b3be..6356070544f9e334400b4ad316b5d1ecae9ac415 100644 +index aef157ed20bd14aa57087c54d8d1c48266a2aac9..4405adbd414c039149f83a90460ad8afdbb5bde4 100644 --- a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp +++ b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp @@ -277,7 +277,7 @@ void LineLayout::updateFormattingRootGeometryAndInvalidate() @@ -5377,7 +5377,7 @@ index 982691dd2dfe2f65201370a12302b5086703c126..4af72beb3b1405ffac78e89e7fbb2b14 protected: static SameSiteInfo sameSiteInfo(const Document&, IsForDOMCookieAccess = IsForDOMCookieAccess::No); diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp -index 067f413f5c1892c53d93ce298af7a0803c64cea2..1d1e160e472cd96901d686540da6446ab8101e4a 100644 +index 39ce5fd41d6699928d8b900cb4f58c9627a695de..189da4e9d4dc65740d140c817ab1cd4f3a028685 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp @@ -1467,8 +1467,6 @@ void DocumentLoader::detachFromFrame() @@ -5576,7 +5576,7 @@ index fa84c366c63175f9fb4730eb85c4677fc3d6368f..ecf5b8dc97e35910baf493424e673155 void ProgressTracker::incrementProgress(ResourceLoaderIdentifier identifier, const ResourceResponse& response) diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h -index 5f6d5b4f2ec50eb17263999096d75cf153597043..64836756158b7c48ed31bca6fc6b0f6823898b3f 100644 +index e13e387d19168ac5fd359b2e616d43dd3f175022..1c6b14b83d4bea3acbff3bbc402474f05b7cebdc 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h @@ -307,7 +307,7 @@ public: @@ -5589,10 +5589,10 @@ index 5f6d5b4f2ec50eb17263999096d75cf153597043..64836756158b7c48ed31bca6fc6b0f68 #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 6ebbc47a46cd12e788888efe477add63cb6d1db7..e93bfb786d89ac4c8c07dd0b714b18791380f114 100644 +index 7c349b7082741df76cf71bcfdb90daa098bbb0a3..83130f06f39846b5850581f21377b0c516aca032 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp -@@ -138,6 +138,7 @@ +@@ -139,6 +139,7 @@ #if ENABLE(TOUCH_EVENTS) && !ENABLE(IOS_TOUCH_EVENTS) #include "PlatformTouchEvent.h" @@ -5600,7 +5600,7 @@ index 6ebbc47a46cd12e788888efe477add63cb6d1db7..e93bfb786d89ac4c8c07dd0b714b1879 #endif #if ENABLE(MAC_GESTURE_EVENTS) -@@ -797,9 +798,7 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve +@@ -798,9 +799,7 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve m_mousePressNode = event.targetNode(); m_frame.document()->setFocusNavigationStartingNode(event.targetNode()); @@ -5610,7 +5610,7 @@ index 6ebbc47a46cd12e788888efe477add63cb6d1db7..e93bfb786d89ac4c8c07dd0b714b1879 m_mousePressed = true; m_selectionInitiationState = HaveNotStartedSelection; -@@ -839,8 +838,6 @@ VisiblePosition EventHandler::selectionExtentRespectingEditingBoundary(const Vis +@@ -840,8 +839,6 @@ VisiblePosition EventHandler::selectionExtentRespectingEditingBoundary(const Vis return adjustedTarget->renderer()->positionForPoint(LayoutPoint(selectionEndPoint), nullptr); } @@ -5619,7 +5619,7 @@ index 6ebbc47a46cd12e788888efe477add63cb6d1db7..e93bfb786d89ac4c8c07dd0b714b1879 #if !PLATFORM(IOS_FAMILY) bool EventHandler::supportsSelectionUpdatesOnMouseDrag() const -@@ -862,8 +859,10 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -863,8 +860,10 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e Ref protectedFrame(m_frame); @@ -5630,7 +5630,7 @@ index 6ebbc47a46cd12e788888efe477add63cb6d1db7..e93bfb786d89ac4c8c07dd0b714b1879 RefPtr targetNode = event.targetNode(); if (event.event().button() != LeftButton || !targetNode) -@@ -884,7 +883,9 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -885,7 +884,9 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e ASSERT(mouseDownMayStartSelect() || m_mouseDownMayStartAutoscroll); #endif @@ -5640,7 +5640,7 @@ index 6ebbc47a46cd12e788888efe477add63cb6d1db7..e93bfb786d89ac4c8c07dd0b714b1879 if (m_mouseDownMayStartAutoscroll && !panScrollInProgress()) { m_autoscrollController->startAutoscrollForSelection(renderer); -@@ -901,6 +902,8 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -902,6 +903,8 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e return true; } @@ -5649,7 +5649,7 @@ index 6ebbc47a46cd12e788888efe477add63cb6d1db7..e93bfb786d89ac4c8c07dd0b714b1879 bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const { // This is a pre-flight check of whether the event might lead to a drag being started. Be careful -@@ -932,6 +935,8 @@ bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const +@@ -933,6 +936,8 @@ bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const return targetElement && page->dragController().draggableElement(&m_frame, targetElement.get(), result.roundedPointInInnerNodeFrame(), state); } @@ -5658,15 +5658,15 @@ index 6ebbc47a46cd12e788888efe477add63cb6d1db7..e93bfb786d89ac4c8c07dd0b714b1879 void EventHandler::updateSelectionForMouseDrag() { if (!supportsSelectionUpdatesOnMouseDrag()) -@@ -1026,7 +1031,6 @@ void EventHandler::updateSelectionForMouseDrag(const HitTestResult& hitTestResul - if (oldSelection != newSelection && HTMLElement::isImageOverlayText(newSelection.start().containerNode()) && HTMLElement::isImageOverlayText(newSelection.end().containerNode())) +@@ -1027,7 +1032,6 @@ void EventHandler::updateSelectionForMouseDrag(const HitTestResult& hitTestResul + if (oldSelection != newSelection && ImageOverlay::isOverlayText(newSelection.start().containerNode()) && ImageOverlay::isOverlayText(newSelection.end().containerNode())) invalidateClick(); } -#endif // ENABLE(DRAG_SUPPORT) void EventHandler::lostMouseCapture() { -@@ -1074,9 +1078,7 @@ bool EventHandler::handleMouseReleaseEvent(const MouseEventWithHitTestResults& e +@@ -1075,9 +1079,7 @@ bool EventHandler::handleMouseReleaseEvent(const MouseEventWithHitTestResults& e // on the selection, the selection goes away. However, if we are // editing, place the caret. if (m_mouseDownWasSingleClickInSelection && m_selectionInitiationState != ExtendedSelection @@ -5676,7 +5676,7 @@ index 6ebbc47a46cd12e788888efe477add63cb6d1db7..e93bfb786d89ac4c8c07dd0b714b1879 && m_frame.selection().isRange() && event.event().button() != RightButton) { VisibleSelection newSelection; -@@ -2043,10 +2045,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE +@@ -2044,10 +2046,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE swallowEvent = !dispatchMouseEvent(eventNames().mousemoveEvent, mouseEvent.targetNode(), 0, platformMouseEvent, FireMouseOverOut::Yes); @@ -5687,7 +5687,7 @@ index 6ebbc47a46cd12e788888efe477add63cb6d1db7..e93bfb786d89ac4c8c07dd0b714b1879 return swallowEvent; } -@@ -4100,7 +4100,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr +@@ -4101,7 +4101,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr if (!m_frame.document()) return false; @@ -5703,7 +5703,7 @@ index 6ebbc47a46cd12e788888efe477add63cb6d1db7..e93bfb786d89ac4c8c07dd0b714b1879 auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; if (dragState().shouldDispatchEvents) { -@@ -4511,7 +4518,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4512,7 +4519,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) allTouchReleased = false; } @@ -5713,7 +5713,7 @@ index 6ebbc47a46cd12e788888efe477add63cb6d1db7..e93bfb786d89ac4c8c07dd0b714b1879 PlatformTouchPoint::State pointState = point.state(); LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); -@@ -4638,6 +4646,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4639,6 +4647,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) changedTouches[pointState].m_touches->append(WTFMove(touch)); changedTouches[pointState].m_targets.add(touchTarget); } @@ -6332,10 +6332,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 1acd59697a4469aa2af94522dbfde29a7272ae9b..4602358e73fbf9a32a1b5e9667d667fb1b55a322 100644 +index 5706ad8628fb9bb2c4986535c632d9d2dac913ef..cf5423977557246093b0fced615919d9e740d04c 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp -@@ -465,6 +465,37 @@ void Page::setOverrideViewportArguments(const std::optional& +@@ -468,6 +468,37 @@ void Page::setOverrideViewportArguments(const std::optional& document->updateViewportArguments(); } @@ -6373,7 +6373,7 @@ index 1acd59697a4469aa2af94522dbfde29a7272ae9b..4602358e73fbf9a32a1b5e9667d667fb ScrollingCoordinator* Page::scrollingCoordinator() { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { -@@ -1301,10 +1332,6 @@ void Page::didCommitLoad() +@@ -1304,10 +1335,6 @@ void Page::didCommitLoad() m_isEditableRegionEnabled = false; #endif @@ -6384,7 +6384,7 @@ index 1acd59697a4469aa2af94522dbfde29a7272ae9b..4602358e73fbf9a32a1b5e9667d667fb resetSeenPlugins(); resetSeenMediaEngines(); -@@ -3308,6 +3335,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3311,6 +3338,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -6402,10 +6402,10 @@ index 1acd59697a4469aa2af94522dbfde29a7272ae9b..4602358e73fbf9a32a1b5e9667d667fb { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index 5a4c214014ccfc39aea38c9e50fa37d18cced861..939c9009578aae8fb801dd56c4072ddb8da5ef33 100644 +index f1e08bc4fec074916a3733adff62071da4ed3856..2872273bc99139f04c2b6e3fed90090aa48100db 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h -@@ -268,6 +268,9 @@ public: +@@ -270,6 +270,9 @@ public: const std::optional& overrideViewportArguments() const { return m_overrideViewportArguments; } WEBCORE_EXPORT void setOverrideViewportArguments(const std::optional&); @@ -6415,7 +6415,7 @@ index 5a4c214014ccfc39aea38c9e50fa37d18cced861..939c9009578aae8fb801dd56c4072ddb static void refreshPlugins(bool reload); WEBCORE_EXPORT PluginData& pluginData(); void clearPluginData(); -@@ -320,6 +323,10 @@ public: +@@ -322,6 +325,10 @@ public: DragCaretController& dragCaretController() const { return *m_dragCaretController; } #if ENABLE(DRAG_SUPPORT) DragController& dragController() const { return *m_dragController; } @@ -6426,7 +6426,7 @@ index 5a4c214014ccfc39aea38c9e50fa37d18cced861..939c9009578aae8fb801dd56c4072ddb #endif FocusController& focusController() const { return *m_focusController; } #if ENABLE(CONTEXT_MENUS) -@@ -480,6 +487,8 @@ public: +@@ -482,6 +489,8 @@ public: WEBCORE_EXPORT void effectiveAppearanceDidChange(bool useDarkAppearance, bool useElevatedUserInterfaceLevel); bool defaultUseDarkAppearance() const { return m_useDarkAppearance; } void setUseDarkAppearanceOverride(std::optional); @@ -6435,7 +6435,7 @@ index 5a4c214014ccfc39aea38c9e50fa37d18cced861..939c9009578aae8fb801dd56c4072ddb #if ENABLE(TEXT_AUTOSIZING) float textAutosizingWidth() const { return m_textAutosizingWidth; } -@@ -870,6 +879,11 @@ public: +@@ -877,6 +886,11 @@ public: WEBCORE_EXPORT Vector> editableElementsInRect(const FloatRect&) const; @@ -6447,7 +6447,7 @@ index 5a4c214014ccfc39aea38c9e50fa37d18cced861..939c9009578aae8fb801dd56c4072ddb #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -961,6 +975,9 @@ private: +@@ -970,6 +984,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -6457,7 +6457,7 @@ index 5a4c214014ccfc39aea38c9e50fa37d18cced861..939c9009578aae8fb801dd56c4072ddb #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1040,6 +1057,7 @@ private: +@@ -1049,6 +1066,7 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6465,7 +6465,7 @@ index 5a4c214014ccfc39aea38c9e50fa37d18cced861..939c9009578aae8fb801dd56c4072ddb #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1209,6 +1227,11 @@ private: +@@ -1222,6 +1240,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -6539,7 +6539,7 @@ index f90b8e6de036986779294cbb03c753ffcaf71801..af9672ae6605c341f2cbda8559e5441c #endif diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h -index cfc7731777a37f6ba2d2ac28056544e79c260ef2..b754bf8d49deda9f9b4f47404826b2f285346547 100644 +index 04bf9eee8a886cb14835cb9c7c4c0da3e0b898da..b32088fb96144fa7848a79f722af14a6ef873e2f 100644 --- a/Source/WebCore/page/RuntimeEnabledFeatures.h +++ b/Source/WebCore/page/RuntimeEnabledFeatures.h @@ -193,6 +193,7 @@ public: @@ -6604,7 +6604,7 @@ index 3bec0aef174336939838fb1069fffbcb9f3d5604..566ef3806be3c5ccf1bb951251c2a90d RefPtr SocketProvider::createWebSocketChannel(Document&, WebSocketChannelClient&) diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp -index 9a4907af08ad2c085de8ae166b098e3504390ef4..b96e739616ba6172c615ab42fb709985e056b8a6 100644 +index b2de5ffdbfa97ec1d6dca9fdd428c97607d17bdb..06dee0ec352e206d82d6137b128d692c63dd9e3c 100644 --- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp @@ -293,6 +293,8 @@ bool ContentSecurityPolicy::protocolMatchesSelf(const URL& url) const @@ -6921,7 +6921,7 @@ index d47d193e8bee85c2d2a35e218decdd84b7212dc1..a1cd2f3b8f025436b596d1b1081357d9 #endif diff --git a/Source/WebCore/platform/ScrollableArea.h b/Source/WebCore/platform/ScrollableArea.h -index 797997c2ea7aa9f8cdc9e8a7d9d8f4448718b531..c0d2aa0590e44241ac779db1d4868473ddcd35f3 100644 +index 7a7d30ecd60131dc1c2f61b48efb68ee9a91eb66..3b9e78d794754c03481542961c129ff96cd226b6 100644 --- a/Source/WebCore/platform/ScrollableArea.h +++ b/Source/WebCore/platform/ScrollableArea.h @@ -103,7 +103,7 @@ public: @@ -7020,10 +7020,10 @@ index 0000000000000000000000000000000000000000..f0c3a183e5bc44bdfa4201e0db2067b4 + +#endif // ENABLE(SPEECH_SYNTHESIS) diff --git a/Source/WebCore/platform/graphics/FontCascade.h b/Source/WebCore/platform/graphics/FontCascade.h -index 98ec71d24d30d3124d5ed41237186f4b9f037681..6c644cf82481446bc861d93c0b9934cfc993abeb 100644 +index 6af5812d8a722b8fdbd39381bd64832769e4fa3a..02b9400c438c630f43c6a2e7301db4ac3311dcdc 100644 --- a/Source/WebCore/platform/graphics/FontCascade.h +++ b/Source/WebCore/platform/graphics/FontCascade.h -@@ -292,7 +292,8 @@ private: +@@ -291,7 +291,8 @@ private: return true; if (textRenderingMode == TextRenderingMode::OptimizeSpeed) return false; @@ -8791,7 +8791,7 @@ index 0000000000000000000000000000000000000000..cf2b51f6f02837a1106f4d999f2f130e + +} // namespace WebCore diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp -index f576228defabb6f8495cfeab5ed13dbf2b5b03fb..57834044927c14d672d713ecadb81f8ad0ad2103 100644 +index 0925d828f8aa5a5b0cb4f2d27868b0fa2952baef..396f4dc4eaa2fe6a329b4fe709f7d4fb12b15e2f 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp @@ -2618,7 +2618,7 @@ LayoutRect RenderLayer::getRectToExpose(const LayoutRect& visibleRect, const Lay @@ -9261,7 +9261,7 @@ index d602a5f90999fc7f440e2468d40332625ed37083..577b76728f762e7f5aa509531a65eaab void didReceiveMessage(IPC::Connection&, IPC::Decoder&); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index c3d18f702e38e0c84d956474bcb48aebaf1f60c2..c90d063a60e49cbc9a333a79c192bfc93f36d07d 100644 +index e321f9f5ff2be81f5176a2039fc21c1ce45db89f..e0b87417fa6dac27d3028be6d12ebf7124c5e0db 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 @@ -9849,7 +9849,7 @@ 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 32b4229e12292c54b6d1caedaaa607ec8a07ccc6..feedac190ad20ab649191dcb4f4e58f0c7960c07 100644 +index 39cd73ceec97a6a26952c8684c605cef82c711e7..3ff657e419f0543eec268bead3b3df41c019ab0d 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp @@ -119,6 +119,10 @@ @@ -9863,7 +9863,7 @@ index 32b4229e12292c54b6d1caedaaa607ec8a07ccc6..feedac190ad20ab649191dcb4f4e58f0 // FIXME: Seems like we could use std::tuple to cut down the code below a lot! namespace IPC { -@@ -1377,6 +1381,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature +@@ -1379,6 +1383,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature encoder << windowFeatures.resizable; encoder << windowFeatures.fullscreen; encoder << windowFeatures.dialog; @@ -9873,7 +9873,7 @@ index 32b4229e12292c54b6d1caedaaa607ec8a07ccc6..feedac190ad20ab649191dcb4f4e58f0 } bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& windowFeatures) -@@ -1405,6 +1412,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win +@@ -1407,6 +1414,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win return false; if (!decoder.decode(windowFeatures.dialog)) return false; @@ -9886,7 +9886,7 @@ index 32b4229e12292c54b6d1caedaaa607ec8a07ccc6..feedac190ad20ab649191dcb4f4e58f0 return true; } -@@ -1418,6 +1431,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) +@@ -1420,6 +1433,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) #if PLATFORM(COCOA) encoder << dragData.pasteboardName(); encoder << dragData.fileNames(); @@ -9898,7 +9898,7 @@ index 32b4229e12292c54b6d1caedaaa607ec8a07ccc6..feedac190ad20ab649191dcb4f4e58f0 #endif encoder << dragData.dragDestinationActionMask(); encoder << dragData.pageID(); -@@ -1441,9 +1459,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1443,9 +1461,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(applicationFlags)) return false; @@ -9916,7 +9916,7 @@ index 32b4229e12292c54b6d1caedaaa607ec8a07ccc6..feedac190ad20ab649191dcb4f4e58f0 if (!decoder.decode(pasteboardName)) return false; -@@ -1459,8 +1484,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1461,8 +1486,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(pageID)) return false; @@ -10434,7 +10434,7 @@ index 85d6f74114f4e7f82d9502d1b99d69098d6a49b6..6896c9756edb233dda46c7031e1af699 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index 0acff5c6805478b3da28033024f58e767c3f2166..61d4b1ff72bd88d69a3b10ce3bef623be5670278 100644 +index 676daddac883196c6a344a9fb1a6d4cd41af8cbb..d3848e32efdd415145d1533e0071cf9c8c265f81 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt @@ -299,11 +299,14 @@ Shared/XR/XRDeviceProxy.cpp @@ -10482,7 +10482,7 @@ index 0acff5c6805478b3da28033024f58e767c3f2166..61d4b1ff72bd88d69a3b10ce3bef623b UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 0cbe37ffa70fa7cb56def0982dba0e3f4bf98d2a..3a00a803ab7030b812d3ee5261d137fdafac4006 100644 +index a3e7bb66471930230fe23f0a681c3e7a23268353..b78d7251bbbd1b0b2f01c499bbab623960d9fe7a 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt @@ -269,6 +269,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm @@ -12081,7 +12081,7 @@ index e4b92ace1531090ae38a7aec3d3d4febf19aee84..43690f9ef4969a39084501613bfc00a7 + +cairo_surface_t* webkitWebViewBackendTakeScreenshot(WebKitWebViewBackend*); diff --git a/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt b/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt -index 0a9cf24c738d2cc0575f00d73ddce7c0b46bbda7..a7e0e35e4f8a20aefb9e6cabf48d2d110ce3475e 100644 +index c0e1359abff7d0f6bf08853baba831e64312e49a..c06c34d0c0056aad1c1c886343fe14bfb11c6325 100644 --- a/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt +++ b/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt @@ -327,6 +327,8 @@ WEBKIT_TYPE_WEB_VIEW_BACKEND @@ -12275,7 +12275,7 @@ index 8a95a3f8036bb0c664954c23ba3ecf72058ae711..dd10e28e2499cd84be2d072dc7567050 namespace WebKit { diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h -index 9d5ef2843435bf0a681cfc0ce1b10b122b4f0615..1d041df6a5bb6d79e0b6f7a5ad0e281d35bcd539 100644 +index 2666a91b228543ba89dbb31af02c471db5447d47..316c50d6df81cc7c49b2c1fc9d54c22b2f623df5 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h @@ -95,6 +95,7 @@ private: @@ -12286,7 +12286,7 @@ index 9d5ef2843435bf0a681cfc0ce1b10b122b4f0615..1d041df6a5bb6d79e0b6f7a5ad0e281d void presentStorageAccessConfirmDialog(const WTF::String& requestingDomain, const WTF::String& currentDomain, CompletionHandler&&); void requestStorageAccessConfirm(WebPageProxy&, WebFrameProxy*, const WebCore::RegistrableDomain& requestingDomain, const WebCore::RegistrableDomain& currentDomain, CompletionHandler&&) final; void decidePolicyForGeolocationPermissionRequest(WebPageProxy&, WebFrameProxy&, const FrameInfoData&, Function&) final; -@@ -187,6 +188,7 @@ private: +@@ -188,6 +189,7 @@ private: bool webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler : 1; @@ -12295,7 +12295,7 @@ index 9d5ef2843435bf0a681cfc0ce1b10b122b4f0615..1d041df6a5bb6d79e0b6f7a5ad0e281d bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRequestGeolocationPermissionForFrameDecisionHandler : 1; diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm -index 1cd5d0cc9b389a83529fc1d5b74b823cca5073a5..937a3e2abf3a411557db9758b294d0d5a5bed255 100644 +index fd9d4a8b29e38e0c6c5e31fec2a3ff2ad6492c70..274d2f7830a9ebc55dadffccf511e2b635510025 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm @@ -109,6 +109,7 @@ void UIDelegate::setDelegate(id delegate) @@ -12426,7 +12426,7 @@ index 418a09dac38eb9bfd5189e575fd08e05465e9190..1756a5dfea9a931f376ebf946cbdff11 m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSApp queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h -index b77d4c07cb073200974bd30a34c77f80e2893de0..b51a9edf02f5f494bce898c6ddd148c01b355f65 100644 +index 3f6dd1f242e7a115ecf798390f34b635c6e8d6f9..9eb27efc6b344b4937a3aa693d0a62c8ab143bee 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h @@ -511,6 +511,9 @@ public: @@ -12440,10 +12440,10 @@ index b77d4c07cb073200974bd30a34c77f80e2893de0..b51a9edf02f5f494bce898c6ddd148c0 void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -index 09ad398bcab6d42f408a7fb8f48628f2c10b41b5..c5a75af9c79b3ca3b183eb45f19db15b567c2ea3 100644 +index 3d9e877b0cb75654b6391639557f52b60392cac9..7cb2c03f05520eca9ba9d98351b5918db925a73b 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -@@ -2615,6 +2615,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() +@@ -2623,6 +2623,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() if (!m_colorSpace) m_colorSpace = [NSColorSpace sRGBColorSpace]; } @@ -12455,7 +12455,7 @@ index 09ad398bcab6d42f408a7fb8f48628f2c10b41b5..c5a75af9c79b3ca3b183eb45f19db15b ASSERT(m_colorSpace); return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] }; -@@ -4625,6 +4630,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu +@@ -4633,6 +4638,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu return adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions)); } @@ -16110,7 +16110,7 @@ index 7a14cfba15c103a2d4fe263fa49d25af3c396ec2..3ee0e154349661632799057c71f1d1f1 BOOL result = ::CreateProcess(0, commandLine.data(), 0, 0, true, 0, 0, 0, &startupInfo, &processInformation); diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h -index 5e2ec75599c56aca546bad2a5c63dee1a0a6732f..9fccdf89503e1a089fe20e00077d066068c3293b 100644 +index c485c7fc313ea0833fc606267169d692a8240928..fc378501a80d01d597c904be6258ba7fa4fc91fb 100644 --- a/Source/WebKit/UIProcess/PageClient.h +++ b/Source/WebKit/UIProcess/PageClient.h @@ -323,6 +323,11 @@ public: @@ -17157,7 +17157,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c2c8c991e 100644 +index 42ade6d8b9d156d86e4c61e03d8b98e2aba99ce8..6f8727b8ae3822ca165c3c8aabe69dd36f061863 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -245,6 +245,9 @@ @@ -17503,7 +17503,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5792,6 +5954,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5794,6 +5956,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa auto* originatingPage = m_process->webPage(originatingPageID); auto originatingFrameInfo = API::FrameInfo::create(WTFMove(originatingFrameInfoData), originatingPage); auto mainFrameURL = m_mainFrame ? m_mainFrame->url() : URL(); @@ -17511,7 +17511,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c auto completionHandler = [this, protectedThis = Ref { *this }, mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -5835,6 +5998,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5837,6 +6000,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17519,7 +17519,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c } void WebPageProxy::exitFullscreenImmediately() -@@ -5870,6 +6034,10 @@ void WebPageProxy::closePage() +@@ -5872,6 +6036,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17530,7 +17530,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -5906,6 +6074,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -5908,6 +6076,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f } runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { @@ -17539,7 +17539,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -5927,6 +6097,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -5929,6 +6099,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17548,7 +17548,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { page.m_uiClient->runJavaScriptConfirm(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](bool result) mutable { -@@ -5950,6 +6122,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -5952,6 +6124,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17557,7 +17557,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply), defaultValue](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { page.m_uiClient->runJavaScriptPrompt(page, message, defaultValue, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](auto& result) mutable { -@@ -6077,6 +6251,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6079,6 +6253,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17566,7 +17566,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7308,6 +7484,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7310,6 +7486,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -17575,7 +17575,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c } break; } -@@ -7322,10 +7500,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7324,10 +7502,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) pageClient().wheelEventWasNotHandledByWebCore(oldestProcessedEvent); } @@ -17592,7 +17592,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c break; } -@@ -7334,7 +7515,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7336,7 +7517,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) case WebEvent::RawKeyDown: case WebEvent::Char: { LOG(KeyHandling, "WebPageProxy::didReceiveEvent: %s (queue empty %d)", webKeyboardEventTypeString(type), m_keyEventQueue.isEmpty()); @@ -17600,7 +17600,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7353,7 +7533,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7355,7 +7535,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) // The call to doneWithKeyEvent may close this WebPage. // Protect against this being destroyed. Ref protect(*this); @@ -17608,7 +17608,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7362,6 +7541,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7364,6 +7543,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -17616,7 +17616,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c } break; } -@@ -7716,7 +7896,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7718,7 +7898,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%{public}s", processTerminationReasonToString(reason)); @@ -17628,7 +17628,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8097,6 +8280,7 @@ static const Vector& mediaRelatedIOKitClasses() +@@ -8102,6 +8285,7 @@ static const Vector& mediaRelatedIOKitClasses() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -17636,7 +17636,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8292,6 +8476,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8297,6 +8481,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.shouldRelaxThirdPartyCookieBlocking = m_configuration->shouldRelaxThirdPartyCookieBlocking(); parameters.canUseCredentialStorage = m_canUseCredentialStorage; @@ -17645,7 +17645,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c #if PLATFORM(GTK) parameters.gtkSettings = GtkSettingsManager::singleton().settingsState(); #endif -@@ -8373,6 +8559,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8378,6 +8564,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -17660,7 +17660,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8466,6 +8660,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8471,6 +8665,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17677,7 +17677,7 @@ index 9881af69270e2b142e5f8bde4ea1d040e20eb9f4..01bcc755c245b3549db605463bb13c9c // 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 dfcd414d1aab1cef85784cb4accf503e980d7efe..70befa965830294e1b0ae07984c9a60c0d06c5a3 100644 +index 5999ce9821552a9d66806608c04fa41a29503a93..b3d54ea7e9af81b6ca633875a27460e309cd135f 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17740,7 +17740,7 @@ index dfcd414d1aab1cef85784cb4accf503e980d7efe..70befa965830294e1b0ae07984c9a60c #if PLATFORM(IOS_FAMILY) void showInspectorIndication(); -@@ -627,6 +641,11 @@ public: +@@ -626,6 +640,11 @@ public: void setPageLoadStateObserver(std::unique_ptr&&); @@ -17752,7 +17752,7 @@ index dfcd414d1aab1cef85784cb4accf503e980d7efe..70befa965830294e1b0ae07984c9a60c void initializeWebPage(); void setDrawingArea(std::unique_ptr&&); -@@ -654,6 +673,7 @@ public: +@@ -653,6 +672,7 @@ public: void closePage(); void addPlatformLoadParameters(WebProcessProxy&, LoadParameters&); @@ -17760,7 +17760,7 @@ index dfcd414d1aab1cef85784cb4accf503e980d7efe..70befa965830294e1b0ae07984c9a60c 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); -@@ -1175,6 +1195,7 @@ public: +@@ -1174,6 +1194,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -17768,7 +17768,7 @@ index dfcd414d1aab1cef85784cb4accf503e980d7efe..70befa965830294e1b0ae07984c9a60c void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1249,14 +1270,20 @@ public: +@@ -1248,14 +1269,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -17790,7 +17790,7 @@ index dfcd414d1aab1cef85784cb4accf503e980d7efe..70befa965830294e1b0ae07984c9a60c #endif void processDidBecomeUnresponsive(); -@@ -1500,6 +1527,8 @@ public: +@@ -1499,6 +1526,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -17839,7 +17839,7 @@ index dfcd414d1aab1cef85784cb4accf503e980d7efe..70befa965830294e1b0ae07984c9a60c #if PLATFORM(IOS_FAMILY) && ENABLE(DEVICE_ORIENTATION) std::unique_ptr m_webDeviceOrientationUpdateProviderProxy; diff --git a/Source/WebKit/UIProcess/WebPageProxy.messages.in b/Source/WebKit/UIProcess/WebPageProxy.messages.in -index ba374c0022f52b146436f2cf1e3b3bc8c6b8e702..52cc5c0bde3038416af126b9765866924aa33105 100644 +index 7590bd8e51deec8cbc998141d18b2c702129f398..057cb51bf39880d56f1e4ddac9ee326a7edc0da4 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -17874,7 +17874,7 @@ index ba374c0022f52b146436f2cf1e3b3bc8c6b8e702..52cc5c0bde3038416af126b976586692 DidPerformDragOperation(bool handled) #endif diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index a2e7212a2e5dadbc54b999d238709cd53da743d1..1534e71f8a1a2fd772be50c71158ae6fc69fd2e4 100644 +index 3c3befc2a674c0d82bea64ebe354940ac3cfa980..09ab6031f32524ebcd95465766a705837c907860 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp @@ -522,6 +522,14 @@ void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkPro @@ -18667,7 +18667,7 @@ index 0000000000000000000000000000000000000000..d0f9827544994e450e24e3f7a427c35e + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm -index e363634facbeae8e8a7af46fa4f5b1877b19ad6d..9d2f7c65f527f00a227c42764180e4cec776422d 100644 +index 32d1f89c058b9b40a18e8f67bc7be9f0a102508b..5d9184da8c5f5a172fa71d31b31010840f273031 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) @@ -18868,7 +18868,7 @@ index 0000000000000000000000000000000000000000..721826c8c98fc85b68a4f45deaee69c1 + +#endif diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.h b/Source/WebKit/UIProcess/mac/PageClientImplMac.h -index 38a4302af88a015139c22c88681e79f4673a1d18..a74921fcc3bc1b34b79ca64a924c654cf34a38fa 100644 +index d2238fdc9d16f77f8c3d302ca9976fe83f1b3f37..0be14a01d922cb3b705433f9d1a7c5ceff337827 100644 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.h +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.h @@ -53,6 +53,8 @@ class PageClientImpl final : public PageClientImplCocoa @@ -18902,7 +18902,7 @@ index 38a4302af88a015139c22c88681e79f4673a1d18..a74921fcc3bc1b34b79ca64a924c654c void navigationGestureWillEnd(bool willNavigate, WebBackForwardListItem&) override; void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem&) override; diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm -index d433a6dd2b2f84c4d9b41b987ed331cca501039a..ea35548d02a5ee01031e202eb6810eca6ec4cf64 100644 +index a4112135f2ef19015a52f1e1b03ae30a1f223d2a..3cc260a1ed20e5f010639651260bd97987e66139 100644 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm @@ -81,6 +81,7 @@ @@ -19992,10 +19992,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75c06350bf 100644 +index 7da6574f8d643843d9042d314465369dc1858d7b..b518014a2b2b08eccf453122d48083df58317763 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1909,6 +1909,18 @@ +@@ -1910,6 +1910,18 @@ DF0C5F28252ECB8E00D921DB /* WKDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F24252ECB8D00D921DB /* WKDownload.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2A252ECB8E00D921DB /* WKDownloadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2B252ED44000D921DB /* WKDownloadInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */; }; @@ -20014,7 +20014,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 DF462E0F23F22F5500EFF35F /* WKHTTPCookieStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF462E1223F338BE00EFF35F /* WKContentWorldPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF84CEE4249AA24D009096F6 /* WKPDFHUDView.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF84CEE2249AA21F009096F6 /* WKPDFHUDView.mm */; }; -@@ -1965,6 +1977,9 @@ +@@ -1966,6 +1978,9 @@ E5CB07DC20E1678F0022C183 /* WKFormColorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */; }; E5DEFA6826F8F42600AB68DB /* PhotosUISPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E5DEFA6726F8F42600AB68DB /* PhotosUISPI.h */; }; ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -20024,7 +20024,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 F4094CBD2553053D003D73E3 /* DisplayListReaderHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = F4094CBB255304AF003D73E3 /* DisplayListReaderHandle.h */; }; F4094CBE25530540003D73E3 /* DisplayListWriterHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = F4094CB92553047E003D73E3 /* DisplayListWriterHandle.h */; }; F409BA181E6E64BC009DA28E /* WKDragDestinationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */; settings = {ATTRIBUTES = (Private, ); }; }; -@@ -5797,6 +5812,19 @@ +@@ -5912,6 +5927,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 = ""; }; @@ -20044,7 +20044,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 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 = ""; }; -@@ -5916,6 +5944,14 @@ +@@ -6031,6 +6059,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 = ""; }; @@ -20059,7 +20059,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 F4094CB92553047E003D73E3 /* DisplayListWriterHandle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DisplayListWriterHandle.h; sourceTree = ""; }; F4094CBA2553047E003D73E3 /* DisplayListWriterHandle.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DisplayListWriterHandle.cpp; sourceTree = ""; }; F4094CBB255304AF003D73E3 /* DisplayListReaderHandle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DisplayListReaderHandle.h; sourceTree = ""; }; -@@ -6048,6 +6084,7 @@ +@@ -6163,6 +6199,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -20067,7 +20067,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -7810,6 +7847,7 @@ +@@ -8046,6 +8083,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -20075,7 +20075,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -8928,6 +8966,7 @@ +@@ -9173,6 +9211,7 @@ isa = PBXGroup; children = ( 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -20083,7 +20083,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, ); -@@ -9412,6 +9451,12 @@ +@@ -9666,6 +9705,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -20096,7 +20096,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 ); path = Agents; sourceTree = ""; -@@ -9420,6 +9465,7 @@ +@@ -9674,6 +9719,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -20104,7 +20104,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -9941,6 +9987,12 @@ +@@ -10196,6 +10242,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -20117,7 +20117,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -10242,6 +10294,7 @@ +@@ -10497,6 +10549,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -20125,7 +20125,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -10815,6 +10868,11 @@ +@@ -11084,6 +11137,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -20137,7 +20137,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, C1817362205844A900DFDA65 /* DisplayLink.cpp */, -@@ -11667,6 +11725,7 @@ +@@ -11936,6 +11994,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -20145,7 +20145,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -11974,6 +12033,7 @@ +@@ -12243,6 +12302,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -20153,7 +20153,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -11990,6 +12050,7 @@ +@@ -12259,6 +12319,7 @@ 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, F40BBB41257FF46E0067463A /* GPUProcessWakeupMessageArguments.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -20161,7 +20161,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -12132,6 +12193,7 @@ +@@ -12401,6 +12462,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -20169,7 +20169,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, 93085DE026E5BCFD000EC6A7 /* NetworkStorageManager.h in Headers */, -@@ -12197,6 +12259,7 @@ +@@ -12466,6 +12528,7 @@ BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -20177,7 +20177,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */, -@@ -12219,6 +12282,7 @@ +@@ -12488,6 +12551,7 @@ CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, @@ -20185,7 +20185,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -12545,6 +12609,7 @@ +@@ -12815,6 +12879,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -20193,7 +20193,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -12677,6 +12742,7 @@ +@@ -12947,6 +13012,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -20201,7 +20201,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -12730,6 +12796,7 @@ +@@ -13000,6 +13066,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -20209,7 +20209,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -12886,6 +12953,7 @@ +@@ -13156,6 +13223,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -20217,7 +20217,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -14151,6 +14219,8 @@ +@@ -14440,6 +14508,8 @@ C1A152D724E5A29A00978C8B /* HandleXPCEndpointMessages.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -20226,7 +20226,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 9BF5EC642541145600984E77 /* JSIPCBinding.cpp in Sources */, C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */, C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */, -@@ -14168,6 +14238,7 @@ +@@ -14457,6 +14527,7 @@ 2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */, 2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */, 2D92A77A212B6A6100F493FD /* Module.cpp in Sources */, @@ -20234,7 +20234,7 @@ index 06727eabe68b53cdbefc1e52cf5b548c7d52370d..6b63241051523621f14a5a6157a1bc75 57B826452304F14000B72EB0 /* NearFieldSoftLink.mm in Sources */, C1C1B30F2540F50D00D9100B /* NetworkConnectionToWebProcessMac.mm in Sources */, 51DD9F2816367DA2001578E9 /* NetworkConnectionToWebProcessMessageReceiver.cpp in Sources */, -@@ -14475,6 +14546,7 @@ +@@ -14764,6 +14835,7 @@ 2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -20409,10 +20409,10 @@ index 259449423855fed3aaaab414819f8951a3b8b7ff..6ba9678f50190492ef5140d0793582a8 } diff --git a/Source/WebKit/WebProcess/Notifications/NotificationPermissionRequestManager.cpp b/Source/WebKit/WebProcess/Notifications/NotificationPermissionRequestManager.cpp -index 5edd887612819d7d25ce86713434dd0bd4aff78c..1a9e2fbe665a408ba230313f220f948462212d0d 100644 +index e00c722c2be5d505243d45f46001839d4eb8a977..33c0832cde6c292230397a13e70d90fb5984302d 100644 --- a/Source/WebKit/WebProcess/Notifications/NotificationPermissionRequestManager.cpp +++ b/Source/WebKit/WebProcess/Notifications/NotificationPermissionRequestManager.cpp -@@ -83,7 +83,7 @@ void NotificationPermissionRequestManager::startRequest(const SecurityOriginData +@@ -88,7 +88,7 @@ void NotificationPermissionRequestManager::startRequest(const SecurityOriginData m_page->sendWithAsyncReply(Messages::WebPageProxy::RequestNotificationPermission(securityOrigin.toString()), [this, protectedThis = Ref { *this }, securityOrigin, permissionHandler = WTFMove(permissionHandler)](bool allowed) mutable { @@ -20422,7 +20422,7 @@ index 5edd887612819d7d25ce86713434dd0bd4aff78c..1a9e2fbe665a408ba230313f220f9484 auto permissionHandlers = m_requestsPerOrigin.take(securityOrigin); diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -index 286815a88d3c3d3363e4b5229caa695fce505814..0a630fc0a340676b59265892916f4e9df085b452 100644 +index fc7bc3323ab4f9c6bcc9929fa6ec8b5f0f082304..da74fd533ca76384c1aa33d008572d01e543f864 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp @@ -407,6 +407,8 @@ void WebChromeClient::setResizable(bool resizable) @@ -20856,7 +20856,7 @@ index f127d64d005ab7b93875591b94a5899205e91579..df0de26e4dc449a0fbf93e7037444df4 uint64_t m_navigationID; }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -index d5409bedce5617a4a07f7212a87ffd62d6f000f7..d1264361a9091e74d49ed9d4fec70f128b2d7e74 100644 +index b18d7f72e67acad4ab546d4d408edaa14ac69cab..df97f13e125603339cceedd9af986affc1b3cf20 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp @@ -902,6 +902,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) @@ -21099,7 +21099,7 @@ index d5409bedce5617a4a07f7212a87ffd62d6f000f7..d1264361a9091e74d49ed9d4fec70f12 } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4379,7 +4492,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4427,7 +4540,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -21108,7 +21108,7 @@ index d5409bedce5617a4a07f7212a87ffd62d6f000f7..d1264361a9091e74d49ed9d4fec70f12 void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6694,6 +6807,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6742,6 +6855,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -21119,7 +21119,7 @@ index d5409bedce5617a4a07f7212a87ffd62d6f000f7..d1264361a9091e74d49ed9d4fec70f12 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index 4dd587cbbe31ae10c20994b6e512239ca479d142..cd3f0ed3bcfbb674ecc75c616daa74e8456e3e12 100644 +index 41e26039ab814b4424c2e22a6c4ef2ca3ea1bf7e..33c9078d798077b2566512b4a28036ed6cde0af1 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -121,6 +121,10 @@ typedef struct _AtkObject AtkObject; @@ -21133,7 +21133,7 @@ index 4dd587cbbe31ae10c20994b6e512239ca479d142..cd3f0ed3bcfbb674ecc75c616daa74e8 #if PLATFORM(GTK) || PLATFORM(WPE) #include "InputMethodState.h" #endif -@@ -983,11 +987,11 @@ public: +@@ -979,11 +983,11 @@ public: void clearSelection(); void restoreSelectionInFocusedEditableElement(); @@ -21147,7 +21147,7 @@ index 4dd587cbbe31ae10c20994b6e512239ca479d142..cd3f0ed3bcfbb674ecc75c616daa74e8 void performDragControllerAction(DragControllerAction, const WebCore::DragData&, SandboxExtension::Handle&&, Vector&&); #endif -@@ -1001,6 +1005,9 @@ public: +@@ -997,6 +1001,9 @@ public: void didStartDrag(); void dragCancelled(); OptionSet allowedDragSourceActions() const { return m_allowedDragSourceActions; } @@ -21157,7 +21157,7 @@ index 4dd587cbbe31ae10c20994b6e512239ca479d142..cd3f0ed3bcfbb674ecc75c616daa74e8 #endif void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&); -@@ -1243,6 +1250,7 @@ public: +@@ -1239,6 +1246,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -21200,7 +21200,7 @@ index 4dd587cbbe31ae10c20994b6e512239ca479d142..cd3f0ed3bcfbb674ecc75c616daa74e8 bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 185be547c3ac1a8e9f322a9979f682177fea77e4..e68186ab18a1404d2fec40fd13a0c2d686d202a0 100644 +index 3771590efd2b6c5ed409d2f3c9f51e515d5736ff..623016d096c28856218c1c393dd529ec3f6f4f24 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 @@ -21252,10 +21252,10 @@ index 185be547c3ac1a8e9f322a9979f682177fea77e4..e68186ab18a1404d2fec40fd13a0c2d6 RequestDragStart(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) RequestAdditionalItemsForDragSession(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -index 1e23affedecafdbcda31038c91bf808daa883ec1..decc224db495bdef70b41e6dd938547e041583ca 100644 +index 5d974dcbc289c4be5a707a48e9c83053606d7ce2..bc2aee4b4bd4202e404a5ad65fc2883230686319 100644 --- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm +++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -@@ -836,21 +836,37 @@ String WebPage::platformUserAgent(const URL&) const +@@ -837,21 +837,37 @@ String WebPage::platformUserAgent(const URL&) const bool WebPage::hoverSupportedByPrimaryPointingDevice() const { @@ -21294,7 +21294,7 @@ index 1e23affedecafdbcda31038c91bf808daa883ec1..decc224db495bdef70b41e6dd938547e } diff --git a/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp b/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp -index 0cf4707d44fb20a2cb125aaf9465d1282bf84651..59a6c108a4be8ef05ae01cb594898357b385a8fb 100644 +index afad4f9b13ab16b092525a84baaed34933c8e51c..c432676686dae42905ef45dfd4957f959b513659 100644 --- a/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp +++ b/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp @@ -43,6 +43,7 @@ @@ -21344,7 +21344,7 @@ index 0cf4707d44fb20a2cb125aaf9465d1282bf84651..59a6c108a4be8ef05ae01cb594898357 } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index d8629e872914f0781c6c412c72549a28bbae70d0..d254fc0544fabfcc4937675e27a0bc1f116b93df 100644 +index 572f36dd073eda635867e15fe884d8b8747c2ecc..2a9e42782100431e8abd55ab308e247a170d8646 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -88,6 +88,7 @@ @@ -21355,7 +21355,7 @@ index d8629e872914f0781c6c412c72549a28bbae70d0..d254fc0544fabfcc4937675e27a0bc1f #include #include #include -@@ -349,6 +350,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter +@@ -350,6 +351,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter platformInitializeProcess(parameters); updateCPULimit(); @@ -21393,10 +21393,10 @@ index 838e413381a8075a3d62459455267a5bbb55a991..e179a07490cc8fd579f219ff7ebb0ed5 - (void)touch:(WebEvent *)event { diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm -index 0c396c8b2788b7a2ede74152ecdda1a298e05919..db876af327e4b9bd4b3860a9774aa3ad68213c70 100644 +index 0c744ddceb3326d067147a06eb9121fb10e57f45..ca45cdbf182a3333168264c5a8c3b7d39ee63242 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm -@@ -4040,7 +4040,7 @@ IGNORE_WARNINGS_END +@@ -4043,7 +4043,7 @@ IGNORE_WARNINGS_END } #endif // PLATFORM(IOS_FAMILY) @@ -21405,7 +21405,7 @@ index 0c396c8b2788b7a2ede74152ecdda1a298e05919..db876af327e4b9bd4b3860a9774aa3ad - (NSArray *)_touchEventRegions { -@@ -4082,7 +4082,7 @@ IGNORE_WARNINGS_END +@@ -4085,7 +4085,7 @@ IGNORE_WARNINGS_END }).autorelease(); } @@ -21635,10 +21635,10 @@ index fb99a1e511986a6a0ea6a593d0c5a225bcc26fe3..5c31cd3f0529c81d932b3adc092ea8c1 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) else () diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake -index 97abdc08c51291601d74cd2804f2dfbe9b78848d..8c9bcca9f39ec6f6cd7b00805e21f09245270dd6 100644 +index 19f5127e6717f5f7729066f5d5b79c804a995763..ad52470cc76f32ef895acef4e060ea6b5c8e65b6 100644 --- a/Source/cmake/OptionsWinCairo.cmake +++ b/Source/cmake/OptionsWinCairo.cmake -@@ -27,15 +27,36 @@ if (OpenJPEG_FOUND) +@@ -32,15 +32,36 @@ if (OpenJPEG_FOUND) endif () find_package(WOFF2 1.0.2 COMPONENTS dec)