diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 2d184baba2..500443ed2f 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1596 -Changed: yurys@chromium.org Tue 11 Jan 2022 02:21:17 PM PST +1597 +Changed: dpino@igalia.com Fri 14 Jan 2022 06:59:22 AM UTC diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 798931201a..50344c8a09 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="80b71e2a5b48564d599bc2bdae996f9595aa48b9" +BASE_REVISION="489bc4a741217815f6477d98ca4de61c49ec667c" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index d7f3cdcd80..b0c1737d82 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -2278,7 +2278,7 @@ index f8bedf1af5d20d9c93a96af565e416bfb0df6faa..a072e5e130822d3658cbab453aef8d16 if (Journald_FOUND) diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index f30720dcdf997b5738368ce54e9197fbf2ca1e8b..b800b045c6392ead8b037c5e4bd43c9144f4aad1 100644 +index e6fbb9b78ebdba7fc09355c4c2e7cca361a66d67..108dd4578c9f328076970f9e68a392e79cf7f19d 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make @@ -957,6 +957,10 @@ JS_BINDING_IDLS := \ @@ -2292,7 +2292,7 @@ index f30720dcdf997b5738368ce54e9197fbf2ca1e8b..b800b045c6392ead8b037c5e4bd43c91 $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1501,9 +1505,6 @@ JS_BINDING_IDLS := \ +@@ -1499,9 +1503,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -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 d28b3831d4f69192ca56202c8004e1783dc3c5c0..20b86266998344c121b996a52b69f9bf9616801b 100644 +index 17f0e38c148c8781422a2596bf826a972616a1a7..88c873d563b0121b85774b97bae473c57dde86af 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5470,6 +5470,13 @@ +@@ -5467,6 +5467,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 d28b3831d4f69192ca56202c8004e1783dc3c5c0..20b86266998344c121b996a52b69f9bf 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, ); }; }; -@@ -17669,6 +17676,14 @@ +@@ -17658,6 +17665,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 d28b3831d4f69192ca56202c8004e1783dc3c5c0..20b86266998344c121b996a52b69f9bf 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 = ""; }; -@@ -23972,7 +23987,12 @@ +@@ -23963,7 +23978,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2489,7 +2489,7 @@ index d28b3831d4f69192ca56202c8004e1783dc3c5c0..20b86266998344c121b996a52b69f9bf E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -29922,6 +29942,8 @@ +@@ -29909,6 +29929,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2498,7 +2498,7 @@ index d28b3831d4f69192ca56202c8004e1783dc3c5c0..20b86266998344c121b996a52b69f9bf 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -32232,6 +32254,7 @@ +@@ -32219,6 +32241,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2506,7 +2506,7 @@ index d28b3831d4f69192ca56202c8004e1783dc3c5c0..20b86266998344c121b996a52b69f9bf 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -33250,6 +33273,7 @@ +@@ -33231,6 +33254,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2514,7 +2514,7 @@ index d28b3831d4f69192ca56202c8004e1783dc3c5c0..20b86266998344c121b996a52b69f9bf 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -35376,6 +35400,7 @@ +@@ -35357,6 +35381,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2522,7 +2522,7 @@ index d28b3831d4f69192ca56202c8004e1783dc3c5c0..20b86266998344c121b996a52b69f9bf 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -36485,6 +36510,7 @@ +@@ -36465,6 +36490,7 @@ 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, @@ -2530,7 +2530,7 @@ index d28b3831d4f69192ca56202c8004e1783dc3c5c0..20b86266998344c121b996a52b69f9bf CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, CD1F9B032700323D00617EB6 /* PlatformVideoMatrixCoefficients.h in Headers */, -@@ -38515,6 +38541,7 @@ +@@ -38493,6 +38519,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2538,7 +2538,7 @@ index d28b3831d4f69192ca56202c8004e1783dc3c5c0..20b86266998344c121b996a52b69f9bf 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -38585,6 +38612,7 @@ +@@ -38563,6 +38590,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2546,7 +2546,7 @@ index d28b3831d4f69192ca56202c8004e1783dc3c5c0..20b86266998344c121b996a52b69f9bf 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -38633,6 +38661,7 @@ +@@ -38611,6 +38639,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2554,7 +2554,7 @@ index d28b3831d4f69192ca56202c8004e1783dc3c5c0..20b86266998344c121b996a52b69f9bf DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -39165,6 +39194,7 @@ +@@ -39143,6 +39172,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2607,7 +2607,7 @@ index 233a8cafe3433b99c165792fc01fd9a3708ff2c8..341526d174b4e99cb48016d40bd3a7f0 macro(EnterPictureInPictureEvent) \ macro(ExtendableEvent) \ diff --git a/Source/WebCore/css/MediaQueryEvaluator.cpp b/Source/WebCore/css/MediaQueryEvaluator.cpp -index a7945e6d29b66a6c1ff863db93de98e31c4ffc93..a5d67259eba510457cf4f5018c4eb0dcda107077 100644 +index 345cc24534bc0451867035faa033bdf5cd0604f6..59f4a45331219709e98bbc35c479e78b4726714b 100644 --- a/Source/WebCore/css/MediaQueryEvaluator.cpp +++ b/Source/WebCore/css/MediaQueryEvaluator.cpp @@ -856,7 +856,11 @@ static bool prefersContrastEvaluate(CSSValue* value, const CSSToLengthConversion @@ -5377,7 +5377,7 @@ index 28e28a688ae6b57e0f0d14c4e7a0c2558cb67e41..67dd3394a343a6e21faeb8b1965178e6 DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index 59f2bd88796a64277fa3ae492288f9e50682a1fd..a7cb63e974647f5d3c4db5d5c10c645572bea510 100644 +index 6ac86fe9e925a68c3c365b3d7dda8fadac129a21..dd806ddd68d0a2829ebf0bbc1f34ff09ab768e46 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 @@ -5406,7 +5406,7 @@ index 59f2bd88796a64277fa3ae492288f9e50682a1fd..a7cb63e974647f5d3c4db5d5c10c6455 RefPtr oldDocumentLoader = m_documentLoader; NavigationAction action { *m_frame.document(), loader->request(), InitiatedByMainFrame::Unknown, policyChecker().loadType(), isFormSubmission }; -@@ -2795,12 +2800,17 @@ String FrameLoader::userAgent(const URL& url) const +@@ -2796,12 +2801,17 @@ String FrameLoader::userAgent(const URL& url) const String FrameLoader::navigatorPlatform() const { @@ -5426,7 +5426,7 @@ index 59f2bd88796a64277fa3ae492288f9e50682a1fd..a7cb63e974647f5d3c4db5d5c10c6455 } void FrameLoader::dispatchOnloadEvents() -@@ -3206,6 +3216,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) +@@ -3207,6 +3217,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) checkCompleted(); if (m_frame.page()) checkLoadComplete(); @@ -5435,7 +5435,7 @@ index 59f2bd88796a64277fa3ae492288f9e50682a1fd..a7cb63e974647f5d3c4db5d5c10c6455 } void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, bool shouldContinue) -@@ -3973,9 +3985,6 @@ String FrameLoader::referrer() const +@@ -3974,9 +3986,6 @@ String FrameLoader::referrer() const void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() { @@ -5445,7 +5445,7 @@ index 59f2bd88796a64277fa3ae492288f9e50682a1fd..a7cb63e974647f5d3c4db5d5c10c6455 Vector> worlds; ScriptController::getAllWorlds(worlds); for (auto& world : worlds) -@@ -3984,13 +3993,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() +@@ -3985,13 +3994,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world) { @@ -5546,7 +5546,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 352e03f0c416b63800e71429e8c28ae3cdc26093..db1391b66afcfbc2299eefbdee22848e6b78b241 100644 +index 284967df462545fe06cc2eb66a2716282053f2f3..54a62a348579e54013e23f9d65c55b54c4569127 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h @@ -316,7 +316,7 @@ public: @@ -9625,7 +9625,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 45ece51a50366da34ff90e91d57e5a88e2db8850..152e5bbf59a01a68522139fdec0f7c223a0a7804 100644 +index 28345004e5d182dbfd43584f59846e86aae8d7a6..8b707077d6628fcbefd7a120c3801317777d06ac 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp @@ -117,6 +117,10 @@ @@ -10759,7 +10759,7 @@ index ca94c2173757a54a0c755cbf30f8e05a0b75c9cb..422c1379da9b091ae5903a42bc7625be #import diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorExtension.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorExtension.mm -index 580e718dd168a0195024852d40cc45c2c1826712..cf52b56614c98237fce83ce09e13095031163978 100644 +index d8465a1a50d39ab043a368d48ef2f0940d427446..6602eb497f66cdfbb92e918a4f9b3e1e20b3ee72 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorExtension.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorExtension.mm @@ -24,7 +24,10 @@ @@ -11890,17 +11890,17 @@ index c2221efc00618c2ec4d20a88c59840767bd52ff5..71f1cd7e07c705a7c830ff5c4f7d7f98 #include #include diff --git a/Source/WebKit/UIProcess/BackingStore.h b/Source/WebKit/UIProcess/BackingStore.h -index fe3c63e61f778762dc2c2080c74ec53fdf8c2e5f..c43a8226c9be702e248f1712e465efa396ee8969 100644 +index d3a707a6b440421565144a56e586fa2723fe41c3..6e2492539efdf476452873f069bdaa34163f4a30 100644 --- a/Source/WebKit/UIProcess/BackingStore.h +++ b/Source/WebKit/UIProcess/BackingStore.h -@@ -60,6 +60,7 @@ public: +@@ -51,6 +51,7 @@ public: #if USE(CAIRO) typedef cairo_t* PlatformGraphicsContext; + cairo_surface_t* surface() const; - #elif USE(DIRECT2D) - struct DXConnections { - ID3D11DeviceContext1* immediateContext { nullptr }; + #endif + + void paint(PlatformGraphicsContext, const WebCore::IntRect&); diff --git a/Source/WebKit/UIProcess/BrowserInspectorPipe.cpp b/Source/WebKit/UIProcess/BrowserInspectorPipe.cpp new file mode 100644 index 0000000000000000000000000000000000000000..cfb57a48ce387b79613b757e2eb4de2c378aac30 @@ -12224,7 +12224,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 2f80bf612d8d5a387b50a1704a2a62240d466d67..ab3be899713f97d9db91504cb703ab8e2e14adec 100644 +index e4b3aafeda72adc250bb4fe21e459586f5cc5c47..328c8ae59927e051fc5730fe32542a84972613c4 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm @@ -2653,6 +2653,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() @@ -12239,7 +12239,7 @@ index 2f80bf612d8d5a387b50a1704a2a62240d466d67..ab3be899713f97d9db91504cb703ab8e ASSERT(m_colorSpace); return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] }; -@@ -4645,6 +4650,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu +@@ -4632,6 +4637,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu return adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions)); } @@ -12259,7 +12259,7 @@ index 2f80bf612d8d5a387b50a1704a2a62240d466d67..ab3be899713f97d9db91504cb703ab8e { NSWindow *window = [m_view window]; diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp -index 89d38d344b08cb3ed6cc7db62bc4c5162e0f28f0..3c2de7a336a028f6c8371ddeeca528a9989bd486 100644 +index 8735b17ae6bd1e690d259021fc1933aa69eb54bb..2a9e51ef46b75dd4863f47c6d8fc1827fb76a7a8 100644 --- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp +++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp @@ -32,13 +32,16 @@ @@ -12279,8 +12279,8 @@ index 89d38d344b08cb3ed6cc7db62bc4c5162e0f28f0..3c2de7a336a028f6c8371ddeeca528a9 #include #endif -@@ -51,6 +54,13 @@ - #include +@@ -46,6 +49,13 @@ + #include #endif +#if PLATFORM(WIN) @@ -12293,7 +12293,7 @@ index 89d38d344b08cb3ed6cc7db62bc4c5162e0f28f0..3c2de7a336a028f6c8371ddeeca528a9 namespace WebKit { using namespace WebCore; -@@ -119,6 +129,10 @@ void DrawingAreaProxyCoordinatedGraphics::paint(BackingStore::PlatformGraphicsCo +@@ -114,6 +124,10 @@ void DrawingAreaProxyCoordinatedGraphics::paint(BackingStore::PlatformGraphicsCo void DrawingAreaProxyCoordinatedGraphics::sizeDidChange() { @@ -12301,10 +12301,10 @@ index 89d38d344b08cb3ed6cc7db62bc4c5162e0f28f0..3c2de7a336a028f6c8371ddeeca528a9 + value(); + m_callbacks.clear(); + - #if USE(DIRECT2D) - m_backingStore = nullptr; - #endif -@@ -133,6 +147,11 @@ void DrawingAreaProxyCoordinatedGraphics::deviceScaleFactorDidChange() + backingStoreStateDidChange(RespondImmediately); + } + +@@ -122,6 +136,11 @@ void DrawingAreaProxyCoordinatedGraphics::deviceScaleFactorDidChange() backingStoreStateDidChange(RespondImmediately); } @@ -12316,7 +12316,7 @@ index 89d38d344b08cb3ed6cc7db62bc4c5162e0f28f0..3c2de7a336a028f6c8371ddeeca528a9 void DrawingAreaProxyCoordinatedGraphics::waitForBackingStoreUpdateOnNextPaint() { m_hasReceivedFirstUpdate = true; -@@ -250,6 +269,45 @@ void DrawingAreaProxyCoordinatedGraphics::updateAcceleratedCompositingMode(uint6 +@@ -239,6 +258,45 @@ void DrawingAreaProxyCoordinatedGraphics::updateAcceleratedCompositingMode(uint6 updateAcceleratedCompositingMode(layerTreeContext); } @@ -15777,7 +15777,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 5b529ffd8c22d6de032cc89ea709b12c378b1340..8ac4ae4b5f69fa5c22a5889f78526c4fc8179f4b 100644 +index 82d9dcfa56a9c89fc3df1a8ff367d84332452099..e7ba4ce3c35cad98dbc6eb9ee81fc1f63a691ae9 100644 --- a/Source/WebKit/UIProcess/PageClient.h +++ b/Source/WebKit/UIProcess/PageClient.h @@ -324,6 +324,11 @@ public: @@ -16824,7 +16824,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4eb81d64c8 100644 +index 60273c100bd5ac8f0e6c7e74a569257bc9f7cc44..6d096be66f4073b7a4061d1094c322edbd0baaf9 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -246,6 +246,9 @@ @@ -16837,7 +16837,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e #include #endif -@@ -612,6 +615,10 @@ WebPageProxy::~WebPageProxy() +@@ -613,6 +616,10 @@ WebPageProxy::~WebPageProxy() if (m_preferences->mediaSessionCoordinatorEnabled()) GroupActivitiesSessionNotifier::sharedNotifier().removeWebPage(*this); #endif @@ -16848,7 +16848,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e } void WebPageProxy::addAllMessageReceivers() -@@ -1013,6 +1020,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) +@@ -1014,6 +1021,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) m_pageLoadState.didSwapWebProcesses(); if (reason != ProcessLaunchReason::InitialProcess) m_drawingArea->waitForBackingStoreUpdateOnNextPaint(); @@ -16856,7 +16856,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e } void WebPageProxy::didAttachToRunningProcess() -@@ -1366,6 +1374,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1367,6 +1375,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -16878,7 +16878,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1914,6 +1937,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1915,6 +1938,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -16910,7 +16910,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2104,6 +2152,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2105,6 +2153,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -16936,7 +16936,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2682,6 +2749,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2688,6 +2755,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -16945,7 +16945,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2692,6 +2761,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2698,6 +2767,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -16954,7 +16954,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2707,18 +2778,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2727,6 +2821,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2733,6 +2827,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -17024,7 +17024,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2739,8 +2851,18 @@ void WebPageProxy::didStartDrag() +@@ -2745,8 +2857,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17044,7 +17044,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2845,16 +2967,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2851,16 +2973,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17090,7 +17090,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3018,7 +3162,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3024,7 +3168,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17099,7 +17099,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -3051,7 +3195,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3057,7 +3201,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -17108,7 +17108,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3440,6 +3584,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3446,6 +3590,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -17117,7 +17117,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e receivedPolicyDecision(policyAction, navigation, WTFMove(policies), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3508,6 +3654,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3514,6 +3660,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) { @@ -17125,7 +17125,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4244,6 +4391,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4250,6 +4397,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17137,7 +17137,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4591,6 +4743,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4597,6 +4749,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17145,7 +17145,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4815,6 +4968,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4821,6 +4974,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17154,7 +17154,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e // If the provisional page's load fails then we destroy the provisional page. if (m_provisionalPage && m_provisionalPage->mainFrame() == &frame && willContinueLoading == WillContinueLoading::No) m_provisionalPage = nullptr; -@@ -5283,7 +5438,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5292,7 +5447,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, NavigationActionData&& navigationActionData, FrameInfoData&& originatingFrameInfo, std::optional originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&& request, IPC::FormDataReference&& requestBody, WebCore::ResourceResponse&& redirectResponse, const UserData& userData, uint64_t listenerID) { @@ -17170,7 +17170,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5849,6 +6011,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5858,6 +6020,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa if (originatingPage) openerAppInitiatedState = originatingPage->lastNavigationWasAppInitiated(); @@ -17178,7 +17178,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e auto completionHandler = [this, protectedThis = Ref { *this }, mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement, openerAppInitiatedState = WTFMove(openerAppInitiatedState)] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -5895,6 +6058,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5904,6 +6067,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17186,7 +17186,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e } void WebPageProxy::exitFullscreenImmediately() -@@ -5930,6 +6094,10 @@ void WebPageProxy::closePage() +@@ -5939,6 +6103,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17197,7 +17197,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -5966,6 +6134,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -5975,6 +6143,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 { @@ -17206,7 +17206,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -5987,6 +6157,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -5996,6 +6166,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17215,7 +17215,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e 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 { -@@ -6010,6 +6182,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -6019,6 +6191,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17224,7 +17224,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e 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 { -@@ -6137,6 +6311,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6146,6 +6320,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17233,7 +17233,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7376,6 +7552,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7385,6 +7561,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -17242,7 +17242,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e } break; } -@@ -7390,10 +7568,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7399,10 +7577,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) pageClient().wheelEventWasNotHandledByWebCore(oldestProcessedEvent); } @@ -17259,7 +17259,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e break; } -@@ -7402,7 +7583,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7411,7 +7592,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()); @@ -17267,7 +17267,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7421,7 +7601,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7430,7 +7610,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); @@ -17275,7 +17275,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7430,6 +7609,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7439,6 +7618,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -17283,7 +17283,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e } break; } -@@ -7784,7 +7964,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7793,7 +7973,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%{public}s", processTerminationReasonToString(reason)); @@ -17295,7 +17295,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8176,6 +8359,7 @@ static Span mediaRelatedIOKitClasses() +@@ -8185,6 +8368,7 @@ static Span mediaRelatedIOKitClasses() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -17303,7 +17303,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8371,6 +8555,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8380,6 +8564,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.shouldRelaxThirdPartyCookieBlocking = m_configuration->shouldRelaxThirdPartyCookieBlocking(); parameters.canUseCredentialStorage = m_canUseCredentialStorage; @@ -17312,7 +17312,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e #if PLATFORM(GTK) parameters.gtkSettings = GtkSettingsManager::singleton().settingsState(); #endif -@@ -8452,6 +8638,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8461,6 +8647,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -17327,7 +17327,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8545,6 +8739,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8554,6 +8748,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17344,7 +17344,7 @@ index b2b642b75cc2ebfc6dbcffdb1c51e4d34701311b..ae687084a32aacf45a1b77cb1cfe9e4e // 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 0552b7ba5e5c65738b6bc4859a9b3cfb39790b8c..de46aba0340e482caf302478db27217193d7de59 100644 +index 95b5a736d011c78d01c78aa50cd3ea436d9a68be..0a9981fb991747122b7d87cb0fc024ca903ebefc 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17427,7 +17427,7 @@ index 0552b7ba5e5c65738b6bc4859a9b3cfb39790b8c..de46aba0340e482caf302478db272171 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); -@@ -1187,6 +1207,7 @@ public: +@@ -1184,6 +1204,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -17435,7 +17435,7 @@ index 0552b7ba5e5c65738b6bc4859a9b3cfb39790b8c..de46aba0340e482caf302478db272171 void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1263,14 +1284,20 @@ public: +@@ -1260,14 +1281,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -17457,7 +17457,7 @@ index 0552b7ba5e5c65738b6bc4859a9b3cfb39790b8c..de46aba0340e482caf302478db272171 #endif void processDidBecomeUnresponsive(); -@@ -1517,6 +1544,8 @@ public: +@@ -1514,6 +1541,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -17466,7 +17466,7 @@ index 0552b7ba5e5c65738b6bc4859a9b3cfb39790b8c..de46aba0340e482caf302478db272171 #endif #if ENABLE(WEB_CRYPTO) -@@ -2637,6 +2666,7 @@ private: +@@ -2631,6 +2660,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17474,7 +17474,7 @@ index 0552b7ba5e5c65738b6bc4859a9b3cfb39790b8c..de46aba0340e482caf302478db272171 #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2901,6 +2931,20 @@ private: +@@ -2895,6 +2925,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17495,7 +17495,7 @@ index 0552b7ba5e5c65738b6bc4859a9b3cfb39790b8c..de46aba0340e482caf302478db272171 #endif PageLoadState m_pageLoadState; -@@ -3110,6 +3154,9 @@ private: +@@ -3104,6 +3148,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17506,7 +17506,7 @@ index 0552b7ba5e5c65738b6bc4859a9b3cfb39790b8c..de46aba0340e482caf302478db272171 #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 942c93dd2f926925dc843fda796844d487129005..44486ce1ff4247d282396dd2634b35dbe5048fff 100644 +index 1f0001d05aaf1343638e0ee7985bf97d45873358..86774a54b18887e662c68bb87c8be045f4aa9873 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -18535,7 +18535,7 @@ index 0000000000000000000000000000000000000000..721826c8c98fc85b68a4f45deaee69c1 + +#endif diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.h b/Source/WebKit/UIProcess/mac/PageClientImplMac.h -index aa57ea0f6cf5be671ece493898621b2a4cef53db..e2a32cb82db0f2bba7977865de1867c14d7bf63c 100644 +index 20b314393a8d97220e74bd476d9025b23acf3851..54db7181a6f175161b6fe17510209669afe9d83c 100644 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.h +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.h @@ -53,6 +53,8 @@ class PageClientImpl final : public PageClientImplCocoa @@ -19671,7 +19671,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 d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76065b227a 100644 +index c0bd37c91a8f9df94d9a0d5d56d1778cb7d9c4e2..0b5d9100878df2e11e3263ec347c2a859f46b3f7 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj @@ -1236,6 +1236,7 @@ @@ -19711,7 +19711,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 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 */; }; -@@ -4857,6 +4873,7 @@ +@@ -4855,6 +4871,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; }; @@ -19719,7 +19719,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 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 = ""; }; -@@ -6263,6 +6280,19 @@ +@@ -6260,6 +6277,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 = ""; }; @@ -19739,7 +19739,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 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 = ""; }; -@@ -6384,6 +6414,14 @@ +@@ -6381,6 +6411,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 = ""; }; @@ -19754,7 +19754,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 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 = ""; }; -@@ -6528,6 +6566,7 @@ +@@ -6525,6 +6563,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -19762,7 +19762,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -8224,6 +8263,7 @@ +@@ -8220,6 +8259,7 @@ 3CAECB5E27465AE300AB78D0 /* UnifiedSource113.cpp */, 4CAECB5E27465AE300AB78D0 /* UnifiedSource114.cpp */, 5CAECB5E27465AE300AB78D0 /* UnifiedSource115.cpp */, @@ -19770,7 +19770,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 ); name = "unified-sources"; path = "DerivedSources/WebKit/unified-sources"; -@@ -8584,6 +8624,7 @@ +@@ -8580,6 +8620,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -19778,7 +19778,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -9718,6 +9759,7 @@ +@@ -9714,6 +9755,7 @@ isa = PBXGroup; children = ( 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -19786,7 +19786,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, 51F7BB7E274564A100C45A72 /* Security.framework */, -@@ -10226,6 +10268,12 @@ +@@ -10220,6 +10262,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -19799,7 +19799,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 ); path = Agents; sourceTree = ""; -@@ -10234,6 +10282,7 @@ +@@ -10228,6 +10276,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -19807,7 +19807,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -10780,6 +10829,12 @@ +@@ -10774,6 +10823,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -19820,7 +19820,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -11085,6 +11140,7 @@ +@@ -11079,6 +11134,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -19828,7 +19828,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -11673,6 +11729,11 @@ +@@ -11667,6 +11723,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -19840,7 +19840,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, C1817362205844A900DFDA65 /* DisplayLink.cpp */, -@@ -12593,6 +12654,7 @@ +@@ -12578,6 +12639,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -19848,7 +19848,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -12901,6 +12963,7 @@ +@@ -12886,6 +12948,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -19856,7 +19856,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -12916,6 +12979,7 @@ +@@ -12901,6 +12964,7 @@ 410F0D4C2701EFF900F96DFC /* GPUProcessConnectionInitializationParameters.h in Headers */, 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -19864,7 +19864,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -13062,6 +13126,7 @@ +@@ -13047,6 +13111,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -19872,7 +19872,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, 93085DE026E5BCFD000EC6A7 /* NetworkStorageManager.h in Headers */, -@@ -13127,6 +13192,7 @@ +@@ -13112,6 +13177,7 @@ BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -19880,7 +19880,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, 517B5F81275E97B6002DC22D /* PushAppBundle.h in Headers */, -@@ -13152,6 +13218,7 @@ +@@ -13137,6 +13203,7 @@ CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, @@ -19888,7 +19888,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -13484,6 +13551,7 @@ +@@ -13469,6 +13536,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -19896,7 +19896,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -13620,6 +13688,7 @@ +@@ -13605,6 +13673,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -19904,7 +19904,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -13673,6 +13742,7 @@ +@@ -13658,6 +13727,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -19912,7 +19912,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -13829,6 +13899,7 @@ +@@ -13814,6 +13884,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -19920,7 +19920,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -15429,6 +15500,8 @@ +@@ -15414,6 +15485,8 @@ C1A152D724E5A29A00978C8B /* HandleXPCEndpointMessages.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -19929,7 +19929,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */, C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */, 2984F588164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp in Sources */, -@@ -15702,6 +15775,7 @@ +@@ -15687,6 +15760,7 @@ 3CAECB6627465AE400AB78D0 /* UnifiedSource113.cpp in Sources */, 4CAECB6627465AE400AB78D0 /* UnifiedSource114.cpp in Sources */, 5CAECB6627465AE400AB78D0 /* UnifiedSource115.cpp in Sources */, @@ -19937,7 +19937,7 @@ index d29fd91cf446ec7956528543cfa30a324213de3f..082ab9c84699c8f9ee61e7b280bcaf76 E38A1FC023A551BF00D2374F /* UserInterfaceIdiom.mm in Sources */, CD491B0D1E732E4D00009066 /* UserMediaCaptureManagerMessageReceiver.cpp in Sources */, CD491B171E73525500009066 /* UserMediaCaptureManagerProxyMessageReceiver.cpp in Sources */, -@@ -15750,6 +15824,8 @@ +@@ -15735,6 +15809,8 @@ 51F060E11654318500F3282F /* WebMDNSRegisterMessageReceiver.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -20135,7 +20135,7 @@ index e00c722c2be5d505243d45f46001839d4eb8a977..33c0832cde6c292230397a13e70d90fb auto permissionHandlers = m_requestsPerOrigin.take(securityOrigin); diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -index c7cf5875c943b79192aebd28623b2b1bc747dcc5..c25c8eaeade583234d2e5853f6f67482f7a7c792 100644 +index dca85e223c15a348858b29a60ee4e7f5f1a8bba9..4a418ce736adafc250ea3afe5ba6c4c0adcaf1b1 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp @@ -417,6 +417,8 @@ void WebChromeClient::setResizable(bool resizable) @@ -20189,7 +20189,7 @@ index 2eb0886f13ed035a53b8eaa60605de4dfe53fbe3..c46393209cb4f80704bbc9268fad4371 { } diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -index 4b6b34857e78e56f526bcf6453c452b7e4324b8f..6341e38b508cf02d2aca45ce2dbda08e385f930f 100644 +index 28ec8e238ca5bfdf0dc526f56d6efb18900acbd0..6d9f86a7360abaaf9c36ff08d79da9e496cb15f0 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp @@ -1573,13 +1573,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() @@ -20569,10 +20569,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 6188ec6d486f2a98d241ca5d755cb5b0b5cea9e7..351d76944af30bbc781d9ed5586167bbeb90187a 100644 +index f1e35cf016a7a01e37eda21ee40ed76722269989..c0d2c373ac5f234f835cd26b8246ed28ae938b33 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -@@ -918,6 +918,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) +@@ -913,6 +913,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) } #endif @@ -20582,7 +20582,7 @@ index 6188ec6d486f2a98d241ca5d755cb5b0b5cea9e7..351d76944af30bbc781d9ed5586167bb updateThrottleState(); } -@@ -1686,6 +1689,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet +@@ -1681,6 +1684,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet } #endif @@ -20605,7 +20605,7 @@ index 6188ec6d486f2a98d241ca5d755cb5b0b5cea9e7..351d76944af30bbc781d9ed5586167bb void WebPage::loadRequest(LoadParameters&& loadParameters) { setLastNavigationWasAppInitiated(loadParameters.request.isAppInitiated()); -@@ -1942,17 +1961,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1937,17 +1956,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -20624,7 +20624,7 @@ index 6188ec6d486f2a98d241ca5d755cb5b0b5cea9e7..351d76944af30bbc781d9ed5586167bb // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -1969,20 +1984,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1964,20 +1979,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -20652,7 +20652,7 @@ index 6188ec6d486f2a98d241ca5d755cb5b0b5cea9e7..351d76944af30bbc781d9ed5586167bb #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -1990,7 +2003,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1985,7 +1998,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -20660,7 +20660,7 @@ index 6188ec6d486f2a98d241ca5d755cb5b0b5cea9e7..351d76944af30bbc781d9ed5586167bb void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2285,6 +2297,7 @@ void WebPage::scaleView(double scale) +@@ -2280,6 +2292,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -20668,7 +20668,7 @@ index 6188ec6d486f2a98d241ca5d755cb5b0b5cea9e7..351d76944af30bbc781d9ed5586167bb scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2389,17 +2402,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2384,17 +2397,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -20687,7 +20687,7 @@ index 6188ec6d486f2a98d241ca5d755cb5b0b5cea9e7..351d76944af30bbc781d9ed5586167bb } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3291,6 +3300,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3286,6 +3295,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -20792,7 +20792,7 @@ index 6188ec6d486f2a98d241ca5d755cb5b0b5cea9e7..351d76944af30bbc781d9ed5586167bb #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3367,6 +3474,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3362,6 +3469,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -20804,7 +20804,7 @@ index 6188ec6d486f2a98d241ca5d755cb5b0b5cea9e7..351d76944af30bbc781d9ed5586167bb void WebPage::insertNewlineInQuotedContent() { Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame(); -@@ -3605,6 +3717,7 @@ void WebPage::didCompletePageTransition() +@@ -3600,6 +3712,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -20812,7 +20812,7 @@ index 6188ec6d486f2a98d241ca5d755cb5b0b5cea9e7..351d76944af30bbc781d9ed5586167bb } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4421,7 +4534,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4416,7 +4529,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -20821,7 +20821,7 @@ index 6188ec6d486f2a98d241ca5d755cb5b0b5cea9e7..351d76944af30bbc781d9ed5586167bb void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6746,6 +6859,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6741,6 +6854,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -20832,7 +20832,7 @@ index 6188ec6d486f2a98d241ca5d755cb5b0b5cea9e7..351d76944af30bbc781d9ed5586167bb return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index 067f1bb3e3d20f8efa83cafd2e3fae4fc9193ea8..aa36a075496b4b30bac5748a31a4ff26c3e5d54c 100644 +index 0292074efde2d7ddb6b06ab2d5b1cc1b8c85d365..4f86bf7d2de160eb2d428647da98209098986ea4 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -122,6 +122,10 @@ typedef struct _AtkObject AtkObject; @@ -20878,7 +20878,7 @@ index 067f1bb3e3d20f8efa83cafd2e3fae4fc9193ea8..aa36a075496b4b30bac5748a31a4ff26 void insertNewlineInQuotedContent(); -@@ -1595,6 +1603,7 @@ private: +@@ -1594,6 +1602,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -20886,7 +20886,7 @@ index 067f1bb3e3d20f8efa83cafd2e3fae4fc9193ea8..aa36a075496b4b30bac5748a31a4ff26 void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1632,6 +1641,7 @@ private: +@@ -1631,6 +1640,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -20894,7 +20894,7 @@ index 067f1bb3e3d20f8efa83cafd2e3fae4fc9193ea8..aa36a075496b4b30bac5748a31a4ff26 #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1756,9 +1766,7 @@ private: +@@ -1755,9 +1765,7 @@ private: void findRectsForStringMatches(const String&, OptionSet, uint32_t maxMatchCount, CompletionHandler&&)>&&); void hideFindIndicator(); @@ -20904,7 +20904,7 @@ index 067f1bb3e3d20f8efa83cafd2e3fae4fc9193ea8..aa36a075496b4b30bac5748a31a4ff26 void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2291,6 +2299,7 @@ private: +@@ -2290,6 +2298,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -20913,7 +20913,7 @@ index 067f1bb3e3d20f8efa83cafd2e3fae4fc9193ea8..aa36a075496b4b30bac5748a31a4ff26 bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index c02a90aa65288be2763c684b268e45996c2d8de6..195afea8d7325bf219bde64551cea35eb5a6a145 100644 +index 6f91a2a774166cd2b886dfebb4bba8f51fef8f3d..ed782495fbed9ce672610dbb22f207e944d8b445 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in @@ -133,6 +133,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType @@ -20965,10 +20965,10 @@ index c02a90aa65288be2763c684b268e45996c2d8de6..195afea8d7325bf219bde64551cea35e 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 b1ee013e8b0f53b0d7c5d8e117093cbd01adb5a9..335e0802554a1391faba3a5846d2110e13b9e910 100644 +index 7300f7c647de4b019830c93e2e762f0577e6281c..878e1a04cf1761ad467dd993ecf70a7d3398681b 100644 --- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm +++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -@@ -834,21 +834,37 @@ String WebPage::platformUserAgent(const URL&) const +@@ -801,21 +801,37 @@ String WebPage::platformUserAgent(const URL&) const bool WebPage::hoverSupportedByPrimaryPointingDevice() const { @@ -21007,7 +21007,7 @@ index b1ee013e8b0f53b0d7c5d8e117093cbd01adb5a9..335e0802554a1391faba3a5846d2110e } diff --git a/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp b/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp -index afad4f9b13ab16b092525a84baaed34933c8e51c..c432676686dae42905ef45dfd4957f959b513659 100644 +index bb512aec34506aa588a736b6dcf6b6f3b669e342..fbcad974ad70113d527f7cac688e47d558a9e18e 100644 --- a/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp +++ b/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp @@ -43,6 +43,7 @@ @@ -21159,7 +21159,7 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 62effccdba8207b37b8e0aa87897c7e931036e1b..7457bacbd1845cd51c77e244f21e965c81a62041 100644 +index de33c4518d2bc2f040e2b8c3640542391db04ed0..eb18b3c6a4c9427229d27d99aae5461e846258a4 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -5,6 +5,7 @@ WEBKIT_OPTION_BEGIN() @@ -21201,7 +21201,7 @@ index 62effccdba8207b37b8e0aa87897c7e931036e1b..7457bacbd1845cd51c77e244f21e965c WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON) WEBKIT_OPTION_DEFINE(USE_WPE_RENDERER "Whether to enable WPE rendering" PUBLIC ON) -@@ -120,7 +125,7 @@ endif () +@@ -121,7 +126,7 @@ endif () # without approval from a GTK reviewer. There must be strong reason to support # changing the value of the option. WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON) @@ -21210,7 +21210,7 @@ index 62effccdba8207b37b8e0aa87897c7e931036e1b..7457bacbd1845cd51c77e244f21e965c WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PUBLIC ON) -@@ -154,7 +159,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYER_BASED_SVG_ENGINE PRIVATE ON) +@@ -155,7 +160,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYER_BASED_SVG_ENGINE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE OFF) @@ -21219,7 +21219,7 @@ index 62effccdba8207b37b8e0aa87897c7e931036e1b..7457bacbd1845cd51c77e244f21e965c WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) -@@ -170,6 +175,16 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) +@@ -171,6 +176,16 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_API_STATISTICS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21237,7 +21237,7 @@ index 62effccdba8207b37b8e0aa87897c7e931036e1b..7457bacbd1845cd51c77e244f21e965c # Finalize the value for all options. Do not attempt to use an option before diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake -index 4694eb3e715f8ed47b254b2280ecb69c3fbace6c..5febc60f49e56f0daa175ac574b1f81ea8cdc50a 100644 +index 9a998b8756c8acd2d8de654f9e707098c4bc31a8..bd5cee3f82ffaf4da1e36ee4db27fd15fe26bf46 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -3,6 +3,7 @@ include(VersioningUtils) @@ -21257,7 +21257,7 @@ index 4694eb3e715f8ed47b254b2280ecb69c3fbace6c..5febc60f49e56f0daa175ac574b1f81e WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE ON) -@@ -70,17 +71,36 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE OFF) +@@ -69,17 +70,36 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBXR PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})