From 2bdd823a52e3e115b1c03ead7bd7798518678c47 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Fri, 9 Jul 2021 08:40:34 +0200 Subject: [PATCH] browser(webkit): roll to 07/08/21 (#7516) --- browser_patches/webkit/BUILD_NUMBER | 4 +- browser_patches/webkit/UPSTREAM_CONFIG.sh | 2 +- browser_patches/webkit/patches/bootstrap.diff | 370 +++++++++--------- 3 files changed, 188 insertions(+), 188 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 0c8a180a62..8712126e91 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1507 -Changed: max@schmitt.mx Mon Jul 5 07:01:00 UTC 2021 +1508 +Changed: dkolesa@igalia.com Thu Jul 8 03:28:52 PM CEST 2021 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index ff9e5ba583..471f742423 100644 --- a/browser_patches/webkit/UPSTREAM_CONFIG.sh +++ b/browser_patches/webkit/UPSTREAM_CONFIG.sh @@ -1,3 +1,3 @@ REMOTE_URL="https://git.webkit.org/git/WebKit.git" BASE_BRANCH="master" -BASE_REVISION="73e141c9bca6017322b0910747dd4df97255d4c4" +BASE_REVISION="4671d85764736751654f6f10e0372732415a7ee3" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 317d8a5693..1ff54ee4e5 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 ad391d29fbf3dc05e2092b436e2fa412199c3bea..7361fa249d564eac2032a3da771ec147012373ec 100644 +index d0c56839b9671ac0e8ffc59edfbe37b3d5a1c338..6a292724bcccfc574ee611ec5b97d4b7f3adada3 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1240,22 +1240,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1243,22 +1243,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json @@ -31,10 +31,10 @@ index ad391d29fbf3dc05e2092b436e2fa412199c3bea..7361fa249d564eac2032a3da771ec147 ${JAVASCRIPTCORE_DIR}/inspector/protocol/ServiceWorker.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Target.json diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make -index 9df8b244d4c456901bddb412189963d065126327..2ea6388f09af272fa838ba257ee385cee7539aca 100644 +index 7542c7f77465e26e19d4a68a5db76091fdd46539..1225d0638393ed2ee1992bae8bf7c70140dfe3a3 100644 --- a/Source/JavaScriptCore/DerivedSources.make +++ b/Source/JavaScriptCore/DerivedSources.make -@@ -265,22 +265,27 @@ INSPECTOR_DOMAINS := \ +@@ -266,22 +266,27 @@ INSPECTOR_DOMAINS := \ $(JavaScriptCore)/inspector/protocol/CSS.json \ $(JavaScriptCore)/inspector/protocol/Canvas.json \ $(JavaScriptCore)/inspector/protocol/Console.json \ @@ -1804,13 +1804,13 @@ index 4345be38811965680c7c8e80d64234e130b16548..d8ea7866e3df2d8dcc6adc7a0dd021c4 Source/third_party/opus/src/celt Source/third_party/opus/src/include diff --git a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp -index 7d225cc2c64b66bfbc0f2aeb0f6184280d294263..6851545436064cc23e1f8862e8f1c5d51ef6bece 100644 +index 09d3ccf527d7256f6c87d5c03a2e586590bec687..922af4fceee45d28bf9bb75458f05144477fdcb4 100644 --- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp +++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp -@@ -321,3 +321,23 @@ __ZN3rtc14RTCCertificateD1Ev - __ZN6webrtc27CreatePeerConnectionFactoryEPN3rtc6ThreadES2_S2_NS0_13scoped_refptrINS_17AudioDeviceModuleEEENS3_INS_19AudioEncoderFactoryEEENS3_INS_19AudioDecoderFactoryEEENSt3__110unique_ptrINS_19VideoEncoderFactoryENSA_14default_deleteISC_EEEENSB_INS_19VideoDecoderFactoryENSD_ISG_EEEENS3_INS_10AudioMixerEEENS3_INS_15AudioProcessingEEEPNS_19AudioFrameProcessorE - __ZNK6webrtc23RtpTransceiverInterface26HeaderExtensionsNegotiatedEv - __ZN6webrtc30PeerConnectionFactoryInterface20CreatePeerConnectionERKNS_23PeerConnectionInterface16RTCConfigurationENS_26PeerConnectionDependenciesE +@@ -324,3 +324,23 @@ __ZN6webrtc30PeerConnectionFactoryInterface20CreatePeerConnectionERKNS_23PeerCon + __ZNK3rtc13SocketAddress4HashEv + __ZNK3rtc13SocketAddresseqERKS0_ + __ZNK3rtc9IPAddress5IsNilEv +__ZN8mkvmuxer11SegmentInfo15set_writing_appEPKc +__ZN8mkvmuxer11SegmentInfo4InitEv +__ZN8mkvmuxer7Segment10OutputCuesEb @@ -1940,7 +1940,7 @@ index e7331574bbfe695080432c506a393ed218d0e651..8333ecf890ba03175aa5fa9afe89217f InspectorWindowFrame: type: String diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index 323dc5f2626234fd49dff18148eb4fadfe635b3f..9a4ed5d76409b2de9ea1fabfa372132f4e9c7fd0 100644 +index 9ecb7a3d6b39ca23ddd3258326a1fdc2f016ce30..66fbf9a9d6706b3d449eb73d842dde7a4a211a89 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -622,9 +622,9 @@ MaskWebGLStringsEnabled: @@ -2124,7 +2124,7 @@ index 9bd5fde5bc38355e25bc09d05a045df31efaa259..3f3be653fef9930a7ac8a348c8b9f9a2 if (Systemd_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 6e1113146ac02498d5b6e92e45748ea37f00f998..c80511f5b516fe143e9dcf2aee33406c405c6e55 100644 +index 1456b7717e8f75c28f841da6d728f9a7e2518b24..468ede9b8a2e14857281b456dd8832407fd09e12 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -391,7 +391,7 @@ @@ -2311,10 +2311,10 @@ index ef168b76819216d984b7a2d0f760005fb9d24de8..2d6cf51f3b45191ad84106429d4f108f __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 7449fc649ba8f4676e7b7dc9636ee7394b9dbd2b..f59a0247ddd177b8605255b6b62c2359ae384d01 100644 +index 4400180f792059769c250476e0b1e5da164e6232..b03ad6d912bfbfc3e10d988832cecf62fecf2948 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5348,6 +5348,14 @@ +@@ -5349,6 +5349,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, ); }; }; @@ -2329,7 +2329,7 @@ index 7449fc649ba8f4676e7b7dc9636ee7394b9dbd2b..f59a0247ddd177b8605255b6b62c2359 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, ); }; }; -@@ -16860,6 +16868,14 @@ +@@ -16861,6 +16869,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 = ""; }; @@ -2344,7 +2344,7 @@ index 7449fc649ba8f4676e7b7dc9636ee7394b9dbd2b..f59a0247ddd177b8605255b6b62c2359 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 = ""; }; -@@ -22480,7 +22496,12 @@ +@@ -22481,7 +22497,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2357,7 +2357,7 @@ index 7449fc649ba8f4676e7b7dc9636ee7394b9dbd2b..f59a0247ddd177b8605255b6b62c2359 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -28197,6 +28218,8 @@ +@@ -28199,6 +28220,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2366,7 +2366,7 @@ index 7449fc649ba8f4676e7b7dc9636ee7394b9dbd2b..f59a0247ddd177b8605255b6b62c2359 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -30631,6 +30654,7 @@ +@@ -30633,6 +30656,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2374,7 +2374,7 @@ index 7449fc649ba8f4676e7b7dc9636ee7394b9dbd2b..f59a0247ddd177b8605255b6b62c2359 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -31639,6 +31663,7 @@ +@@ -31641,6 +31665,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2382,7 +2382,7 @@ index 7449fc649ba8f4676e7b7dc9636ee7394b9dbd2b..f59a0247ddd177b8605255b6b62c2359 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -33676,6 +33701,7 @@ +@@ -33677,6 +33702,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2390,7 +2390,7 @@ index 7449fc649ba8f4676e7b7dc9636ee7394b9dbd2b..f59a0247ddd177b8605255b6b62c2359 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -35740,9 +35766,11 @@ +@@ -35741,9 +35767,11 @@ B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */, @@ -2402,7 +2402,7 @@ index 7449fc649ba8f4676e7b7dc9636ee7394b9dbd2b..f59a0247ddd177b8605255b6b62c2359 B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -36704,6 +36732,7 @@ +@@ -36705,6 +36733,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2410,7 +2410,7 @@ index 7449fc649ba8f4676e7b7dc9636ee7394b9dbd2b..f59a0247ddd177b8605255b6b62c2359 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -36790,6 +36819,7 @@ +@@ -36791,6 +36820,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2418,7 +2418,7 @@ index 7449fc649ba8f4676e7b7dc9636ee7394b9dbd2b..f59a0247ddd177b8605255b6b62c2359 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -36838,6 +36868,7 @@ +@@ -36839,6 +36869,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2426,7 +2426,7 @@ index 7449fc649ba8f4676e7b7dc9636ee7394b9dbd2b..f59a0247ddd177b8605255b6b62c2359 DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -37370,6 +37401,7 @@ +@@ -37371,6 +37402,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -5414,7 +5414,7 @@ index 0dcb47556d04874878656e459c9bac9af64dcfbf..df57e9a47160bfbeb8188d80afd175c7 void ProgressTracker::incrementProgress(unsigned long identifier, const ResourceResponse& response) diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h -index 0f622ffb96980fb5f191ed17b240b6a587075c54..c494f4bc5de2a2f6a8e2d30818debbc1fc957e63 100644 +index a8968c944e4a1abacc8c2fd03b971fd3b3f8e72c..2775d7b9e6794293935bb621b4b6154c5118641d 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h @@ -306,7 +306,7 @@ public: @@ -5427,7 +5427,7 @@ index 0f622ffb96980fb5f191ed17b240b6a587075c54..c494f4bc5de2a2f6a8e2d30818debbc1 #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 3252c71339fa5a852fba962f6f35be0b08485c14..7af194dffd349cb93b40072806ac7e5735b85352 100644 +index 05cda6581924a26cf705c98295fd428e4364f73b..60288898598c45f30c81d95f234cd22bf6b296b3 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -126,6 +126,7 @@ @@ -5438,7 +5438,7 @@ index 3252c71339fa5a852fba962f6f35be0b08485c14..7af194dffd349cb93b40072806ac7e57 #endif #if ENABLE(MAC_GESTURE_EVENTS) -@@ -786,9 +787,7 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve +@@ -785,9 +786,7 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve m_mousePressNode = event.targetNode(); m_frame.document()->setFocusNavigationStartingNode(event.targetNode()); @@ -5449,7 +5449,7 @@ index 3252c71339fa5a852fba962f6f35be0b08485c14..7af194dffd349cb93b40072806ac7e57 m_mousePressed = true; m_selectionInitiationState = HaveNotStartedSelection; @@ -827,8 +826,6 @@ VisiblePosition EventHandler::selectionExtentRespectingEditingBoundary(const Vis - return targetNode->renderer()->positionForPoint(LayoutPoint(selectionEndPoint), nullptr); + return adjustedTarget->renderer()->positionForPoint(LayoutPoint(selectionEndPoint), nullptr); } -#if ENABLE(DRAG_SUPPORT) @@ -5466,7 +5466,7 @@ index 3252c71339fa5a852fba962f6f35be0b08485c14..7af194dffd349cb93b40072806ac7e57 return true; +#endif - Node* targetNode = event.targetNode(); + RefPtr targetNode = event.targetNode(); if (event.event().button() != LeftButton || !targetNode) @@ -872,7 +871,9 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e ASSERT(mouseDownMayStartSelect() || m_mouseDownMayStartAutoscroll); @@ -5488,7 +5488,7 @@ index 3252c71339fa5a852fba962f6f35be0b08485c14..7af194dffd349cb93b40072806ac7e57 { // This is a pre-flight check of whether the event might lead to a drag being started. Be careful @@ -920,6 +923,8 @@ bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const - return targetElement && page->dragController().draggableElement(&m_frame, targetElement, result.roundedPointInInnerNodeFrame(), state); + return targetElement && page->dragController().draggableElement(&m_frame, targetElement.get(), result.roundedPointInInnerNodeFrame(), state); } +#endif // ENABLE(DRAG_SUPPORT) @@ -5514,7 +5514,7 @@ index 3252c71339fa5a852fba962f6f35be0b08485c14..7af194dffd349cb93b40072806ac7e57 && m_frame.selection().isRange() && event.event().button() != RightButton) { VisibleSelection newSelection; -@@ -2032,10 +2034,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE +@@ -2030,10 +2032,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE swallowEvent = !dispatchMouseEvent(eventNames().mousemoveEvent, mouseEvent.targetNode(), 0, platformMouseEvent, FireMouseOverOut::Yes); @@ -5525,7 +5525,7 @@ index 3252c71339fa5a852fba962f6f35be0b08485c14..7af194dffd349cb93b40072806ac7e57 return swallowEvent; } -@@ -4044,7 +4044,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr +@@ -4040,7 +4040,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr if (!m_frame.document()) return false; @@ -5541,7 +5541,7 @@ index 3252c71339fa5a852fba962f6f35be0b08485c14..7af194dffd349cb93b40072806ac7e57 auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; if (dragState().shouldDispatchEvents) { -@@ -4482,7 +4489,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4479,7 +4486,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) allTouchReleased = false; } @@ -5551,7 +5551,7 @@ index 3252c71339fa5a852fba962f6f35be0b08485c14..7af194dffd349cb93b40072806ac7e57 PlatformTouchPoint::State pointState = point.state(); LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); -@@ -4608,6 +4616,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4606,6 +4614,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) changedTouches[pointState].m_touches->append(WTFMove(touch)); changedTouches[pointState].m_targets.add(touchTarget); } @@ -6387,10 +6387,10 @@ index 6b2bc1bdb38be0543f20d51d200944b3f547f6a9..68a1773c0f578ecf8d5d7aa15ec1d34d #endif diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h -index d0774fd91166b2b977f2e930c5909f35a215be8e..73061176c6f23eaead3add9a71a42de3962dec76 100644 +index e16cb5d15762186550f95baaa2fb4ee8ca36d6ce..4a73cc01fb8a51bfb6818343dbbfbd989cda6647 100644 --- a/Source/WebCore/page/RuntimeEnabledFeatures.h +++ b/Source/WebCore/page/RuntimeEnabledFeatures.h -@@ -200,6 +200,7 @@ public: +@@ -202,6 +202,7 @@ public: void setMouseEventsSimulationEnabled(bool isEnabled) { m_mouseEventsSimulationEnabled = isEnabled; } bool touchEventsEnabled() const; void setTouchEventsEnabled(bool isEnabled) { m_touchEventsEnabled = isEnabled; } @@ -6927,7 +6927,7 @@ index 0000000000000000000000000000000000000000..3dedfa855f990643e3e7bbe7754abca4 + +} diff --git a/Source/WebCore/platform/Cairo.cmake b/Source/WebCore/platform/Cairo.cmake -index 237ebfbb80338d313d2a51a77e28309d705fbf69..134b26cecc94e6989126a9f40d1d42a49815d0d4 100644 +index 1fb0e9d5cee3b3df4ee1e96eb8d75016ad687fc5..497bd34cc97e2d20c9d6982a8d92d852451743cd 100644 --- a/Source/WebCore/platform/Cairo.cmake +++ b/Source/WebCore/platform/Cairo.cmake @@ -16,6 +16,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS @@ -6935,9 +6935,9 @@ index 237ebfbb80338d313d2a51a77e28309d705fbf69..134b26cecc94e6989126a9f40d1d42a4 platform/graphics/cairo/ImageBufferCairoImageSurfaceBackend.h platform/graphics/cairo/ImageBufferCairoSurfaceBackend.h + platform/graphics/cairo/ImageBufferUtilitiesCairo.h - platform/graphics/cairo/PlatformContextCairo.h platform/graphics/cairo/RefPtrCairo.h ) + diff --git a/Source/WebCore/platform/DragData.h b/Source/WebCore/platform/DragData.h index 6600dfa7b189e15fab7fb796f66ef1a79dcd22f3..4c0bc485ca92614efca23a5a2da871b77d5285d3 100644 --- a/Source/WebCore/platform/DragData.h @@ -8126,7 +8126,7 @@ index c4eb67d6f7c334076b32b798dcea40b570681e6f..ce86ab28225aa466350671441294f2ac bool m_detectedDatabaseCorruption { false }; diff --git a/Source/WebCore/platform/network/curl/CurlStream.cpp b/Source/WebCore/platform/network/curl/CurlStream.cpp -index ff55d352342786fcdeaefc64f6ccbe015f4c5b5f..37a657851d84c3693c1e31239a19d9edd935d039 100644 +index 29190c7898913eb4081a5bf82eaba3201d0446f5..92be0ba24fefb403587136dddb8cfe42cfac892b 100644 --- a/Source/WebCore/platform/network/curl/CurlStream.cpp +++ b/Source/WebCore/platform/network/curl/CurlStream.cpp @@ -33,7 +33,7 @@ @@ -8335,7 +8335,7 @@ index aae6c99dd052985a43718846b68536454050c234..7e2e5d0c1de90f1454f7fdb71a40ab71 bool PlatformKeyboardEvent::currentCapsLockState() diff --git a/Source/WebCore/platform/win/PasteboardWin.cpp b/Source/WebCore/platform/win/PasteboardWin.cpp -index 9e3357b20e60f47829ced8d2849f5d8c9a7bb50a..be6579859e80c846235b7f94f2ec7551078c9fdd 100644 +index b94ee27baae83c0285533fc1c6abb4229816eda0..a242d40c5fc2fccdd0273f58287a3fcd85cbd01d 100644 --- a/Source/WebCore/platform/win/PasteboardWin.cpp +++ b/Source/WebCore/platform/win/PasteboardWin.cpp @@ -1134,7 +1134,21 @@ void Pasteboard::writeCustomData(const Vector& data) @@ -8801,7 +8801,7 @@ index 0000000000000000000000000000000000000000..cf2b51f6f02837a1106f4d999f2f130e + +} // namespace WebCore diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp -index 26574299dc3df17d9fcace7768dd1ba607ceb52a..24e28cf374662689439ce3054eb7b6c2ec1c732e 100644 +index 161c262f05e26e89808f90d90ff210d1f6199063..59d90ad0dd32b7a0948c3f6ed15c9ce16a9ae655 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp @@ -2560,7 +2560,7 @@ LayoutRect RenderLayer::getRectToExpose(const LayoutRect& visibleRect, const Lay @@ -8860,7 +8860,7 @@ index 694008e0451edc5770142a0a6d9eed52b04ded80..ec93869f9486bdf7bd3bb56478c62469 WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, ScrollAlignment::Behavior); diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp -index a8216b6ca250fea6e14cf02ce2e674847063d5ee..9e972fdbff3553ba26e1c1de994453fb3c1bcd50 100644 +index 14fc0e0634d2d91505d6ff1eb78153ff15bbc891..5dacbd695125d26aa0acd36cb32e9e2a02721789 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp @@ -74,6 +74,11 @@ @@ -8892,10 +8892,10 @@ index a8216b6ca250fea6e14cf02ce2e674847063d5ee..9e972fdbff3553ba26e1c1de994453fb void NetworkConnectionToWebProcess::removeStorageAccessForFrame(FrameIdentifier frameID, PageIdentifier pageID) { diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -index 30b8dae1b63f62af7077d9566cb1cfc6fed7da5c..47f7e34d87c36226a0244f38d7456853da90860d 100644 +index 1a5444be7b47e5dc121d58f80baadba18d3ccc3c..8ae9c0ba78b0f9d5d27215a207ec7b320e50739e 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -@@ -285,6 +285,8 @@ private: +@@ -283,6 +283,8 @@ private: void clearPageSpecificData(WebCore::PageIdentifier); @@ -8905,7 +8905,7 @@ index 30b8dae1b63f62af7077d9566cb1cfc6fed7da5c..47f7e34d87c36226a0244f38d7456853 void removeStorageAccessForFrame(WebCore::FrameIdentifier, WebCore::PageIdentifier); diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in -index 063ee6a461bb68ebde70c6f9ee4e83961d03354b..d7db79273b77296864150d1bc00363291c343947 100644 +index 9b32896810619ba19dc5bf437b368a7ca7fa431b..a026b8ae7024f914e78f3f5137bc20314908de2e 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in @@ -64,6 +64,8 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver { @@ -8918,7 +8918,7 @@ index 063ee6a461bb68ebde70c6f9ee4e83961d03354b..d7db79273b77296864150d1bc0036329 RemoveStorageAccessForFrame(WebCore::FrameIdentifier frameID, WebCore::PageIdentifier pageID); LogUserInteraction(WebCore::RegistrableDomain domain) diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp -index 49bdd3fec68137ce4353950034adc6b2752af9e5..5a47aa54e4bb4bfc5bd216a027c62c0ce3df36cf 100644 +index 0374f5c47a819d6a68f76207db2f03ad8c21f48d..9ebc13d8c0854192e5de2a8e1ab3fe51b1170a32 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -26,7 +26,6 @@ @@ -8929,7 +8929,7 @@ index 49bdd3fec68137ce4353950034adc6b2752af9e5..5a47aa54e4bb4bfc5bd216a027c62c0c #include "ArgumentCoders.h" #include "Attachment.h" #include "AuthenticationManager.h" -@@ -557,6 +556,59 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) +@@ -558,6 +557,59 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) server->close(); } @@ -8990,7 +8990,7 @@ index 49bdd3fec68137ce4353950034adc6b2752af9e5..5a47aa54e4bb4bfc5bd216a027c62c0c void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index 447784b1a7838dd7bdc95cf374057bcc59d8a33d..9aad05a798d00dfb7346a2fbb78a947686e7e715 100644 +index 08da56f19779bc74d8f4a28d58a167ec89a02e4e..75068b7bfd10a580c1e1c242f4cb60f9a36dab8d 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h @@ -34,6 +34,7 @@ @@ -9009,7 +9009,7 @@ index 447784b1a7838dd7bdc95cf374057bcc59d8a33d..9aad05a798d00dfb7346a2fbb78a9476 class CurlProxySettings; class ProtectionSpace; class StorageQuotaManager; -@@ -208,6 +210,14 @@ public: +@@ -209,6 +211,14 @@ public: void addWebsiteDataStore(WebsiteDataStoreParameters&&); @@ -9196,10 +9196,10 @@ index 0d6e7aedff68227bf7dc8ab7184abc6fd3321c54..67b616d818aa42f8cae33f0535c888cd void deleteLocalStorageEntriesForOrigins(const Vector&); Vector getLocalStorageOriginDetailsCrossThreadCopy() const; diff --git a/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.cpp b/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.cpp -index 61d0b3c77ce5c8dcd741c7d04ad4145f6b47f66e..0ddfcc2014f3edc9a593de8fd87c9423940a7ee6 100644 +index 982621afbfed2dda9dcc62a37430658c373944f3..f51f1858bf3f063ccc6a0af1ec1a55a34954b89e 100644 --- a/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.cpp +++ b/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.cpp -@@ -262,6 +262,50 @@ void StorageManagerSet::getLocalStorageOrigins(PAL::SessionID sessionID, GetOrig +@@ -272,6 +272,50 @@ void StorageManagerSet::getLocalStorageOrigins(PAL::SessionID sessionID, GetOrig }); } @@ -9251,7 +9251,7 @@ index 61d0b3c77ce5c8dcd741c7d04ad4145f6b47f66e..0ddfcc2014f3edc9a593de8fd87c9423 { ASSERT(RunLoop::isMain()); diff --git a/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.h b/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.h -index 4243f32573bdad1452107f55c82328961cd5b0d4..023416d6e453431167441504ea38b3b2f19330fd 100644 +index 6945f2b199202a77413bef711a59510a700d18b3..d7e84ca85e18163a02407f383339df4ff95984e5 100644 --- a/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.h +++ b/Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.h @@ -45,6 +45,7 @@ using ConnectToStorageAreaCallback = CompletionHandler&& completionHandler) { completionHandler(); } virtual void runJavaScriptConfirm(WebKit::WebPageProxy&, const WTF::String&, WebKit::WebFrameProxy*, WebKit::FrameInfoData&&, Function&& completionHandler) { completionHandler(false); } virtual void runJavaScriptPrompt(WebKit::WebPageProxy&, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*, WebKit::FrameInfoData&&, Function&& completionHandler) { completionHandler(WTF::String()); } @@ -11485,10 +11485,10 @@ index d7a43204be693f2a7ef86240eaf567fe70052a2c..0e247c48858522e55f65957fd0d1e147 bool webkitWebViewIsScriptDialogRunning(WebKitWebView*, WebKitScriptDialog*); String webkitWebViewGetCurrentScriptDialogMessage(WebKitWebView*); diff --git a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp -index 2bf03eec17b9d2add76b180b6a2bc41d8fba9602..9ca44d65460528b9b8e6f3b91aff8f91e81a29dc 100644 +index 26340c991097a452783c8d4b31bb2cfdfe0bc71f..0becf018fa83c21f71ca59070f29337d35a1299b 100644 --- a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp +++ b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp -@@ -244,6 +244,8 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool +@@ -245,6 +245,8 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool { if (wasEventHandled || event.type() != WebEvent::Type::KeyDown || !event.nativeEvent()) return; @@ -11585,10 +11585,10 @@ index 0000000000000000000000000000000000000000..9f1a0173a5641d6f158d815b8f7b9ea6 + +#endif diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp -index e9cf71352ba2d4bce1a23b0eefcf42cff26de393..3daa3b84f5c8f424b68bf1764ca8e0c74788d0b2 100644 +index 5b077d94407877794a3e5913dbd9f87f71cc9586..ef311b312be7decd0f207de61ce35ea7d5b860d0 100644 --- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp +++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp -@@ -2462,6 +2462,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase) +@@ -2489,6 +2489,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase) #endif } @@ -11980,10 +11980,10 @@ index 454c61ffdefecc476d1560c7c43f5b5d345f281d..6de7509037b7683ddd403ee247bdf284 class PopUpSOAuthorizationSession final : public SOAuthorizationSession { public: diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h -index 7871ed4738b5cfc7e64757ff642cfbe51303a4eb..04b55aa995316d4d8cd467cf62d1a19f83ec8df7 100644 +index 849900649a2c6ee11595d743de5a1e6f188f48e7..d202e9374ad408c6621a318111266e4e9a54dae8 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h -@@ -92,6 +92,7 @@ private: +@@ -94,6 +94,7 @@ private: void runJavaScriptAlert(WebPageProxy&, const WTF::String&, WebFrameProxy*, FrameInfoData&&, Function&& completionHandler) final; void runJavaScriptConfirm(WebPageProxy&, const WTF::String&, WebFrameProxy*, FrameInfoData&&, Function&& completionHandler) final; void runJavaScriptPrompt(WebPageProxy&, const WTF::String&, const WTF::String&, WebFrameProxy*, FrameInfoData&&, Function&&) final; @@ -11991,7 +11991,7 @@ index 7871ed4738b5cfc7e64757ff642cfbe51303a4eb..04b55aa995316d4d8cd467cf62d1a19f 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; -@@ -183,6 +184,7 @@ private: +@@ -185,6 +186,7 @@ private: bool webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler : 1; @@ -12000,10 +12000,10 @@ index 7871ed4738b5cfc7e64757ff642cfbe51303a4eb..04b55aa995316d4d8cd467cf62d1a19f bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRequestGeolocationPermissionForFrameDecisionHandler : 1; diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm -index ecf7213858b8d7b3eb2a54f3b3a8c12eed4bdd85..7d0fd38d5e29a97945ff248be054036193b1ff51 100644 +index 388429087a1a368a52d5983ed865b61373b33996..1eaaabd4ab0ce7c321c64e6ed55c73320f9f2d50 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm -@@ -104,6 +104,7 @@ void UIDelegate::setDelegate(id delegate) +@@ -106,6 +106,7 @@ void UIDelegate::setDelegate(id delegate) m_delegateMethods.webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:)]; m_delegateMethods.webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:completionHandler:)]; m_delegateMethods.webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:completionHandler:)]; @@ -12011,7 +12011,7 @@ index ecf7213858b8d7b3eb2a54f3b3a8c12eed4bdd85..7d0fd38d5e29a97945ff248be0540361 m_delegateMethods.webViewRequestStorageAccessPanelUnderFirstPartyCompletionHandler = [delegate respondsToSelector:@selector(_webView:requestStorageAccessPanelForDomain:underCurrentDomain:completionHandler:)]; m_delegateMethods.webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(_webView:runBeforeUnloadConfirmPanelWithMessage:initiatedByFrame:completionHandler:)]; m_delegateMethods.webViewRequestGeolocationPermissionForOriginDecisionHandler = [delegate respondsToSelector:@selector(_webView:requestGeolocationPermissionForOrigin:initiatedByFrame:decisionHandler:)]; -@@ -375,6 +376,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St +@@ -378,6 +379,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St }).get()]; } @@ -12040,7 +12040,7 @@ index 7a18a6184a04aa37bb6d328a817b0a0a3e03cb50..92bb58f42cf5ff592b6d465f16ffcf28 @class WKWebView; diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -index f9b2765398f7fff3147c5bd0a9c2dd24aeeda12b..a3b9caaf176b689c45211842c19ddc467f83b493 100644 +index cfa56853fe99116fbfefd5e33933c80967703de1..e0c81fdda03199d968a405cd91ae41665872aef7 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm @@ -34,6 +34,7 @@ @@ -12119,10 +12119,10 @@ index f9b2765398f7fff3147c5bd0a9c2dd24aeeda12b..a3b9caaf176b689c45211842c19ddc46 #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index f14f67727920f0011c6aab8fa74019776cf73693..deba91603dd608abf279c0e541c41c018d87787a 100644 +index b05fc82bd0d7201418dd69ea47158954cf25f0f4..b5d4e6f170309ca2e687f067fae9aa309f27bec6 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -@@ -398,7 +398,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process +@@ -408,7 +408,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process auto screenProperties = WebCore::collectScreenProperties(); parameters.screenProperties = WTFMove(screenProperties); #if PLATFORM(MAC) @@ -12131,7 +12131,7 @@ index f14f67727920f0011c6aab8fa74019776cf73693..deba91603dd608abf279c0e541c41c01 #endif #if PLATFORM(IOS) -@@ -672,8 +672,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -692,8 +692,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -12143,7 +12143,7 @@ index f14f67727920f0011c6aab8fa74019776cf73693..deba91603dd608abf279c0e541c41c01 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 ac5058b8131b1dad3fa1560a08173074ff3c1432..fcaa8dd5100af18b7d9531249c39c0b5068b80d0 100644 +index 82e3828037b064f5bd36b7dd536c60a0a2933aa0..074a542e01e838e244ea82f0f559056e52d221b1 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h @@ -513,6 +513,9 @@ public: @@ -12157,10 +12157,10 @@ index ac5058b8131b1dad3fa1560a08173074ff3c1432..fcaa8dd5100af18b7d9531249c39c0b5 void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -index 71789e1023058446ae1cc8d912993252276453d0..a4a5e294315f27feb5dc92c059dbcdce404bf51c 100644 +index 5fbeba4f16e31677eb1dfeda2096387fc64da6cc..89ca92c286e92e2fc82224e694f8606b5f1338bc 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -@@ -2594,6 +2594,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() +@@ -2607,6 +2607,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() if (!m_colorSpace) m_colorSpace = [NSColorSpace sRGBColorSpace]; } @@ -12172,7 +12172,7 @@ index 71789e1023058446ae1cc8d912993252276453d0..a4a5e294315f27feb5dc92c059dbcdce ASSERT(m_colorSpace); return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] }; -@@ -4672,6 +4677,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu +@@ -4685,6 +4690,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu return adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions)); } @@ -15787,10 +15787,10 @@ 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 0650f60cb79ed94e96c709a26d992dd54c8764ab..bdfd91f0c69ec17dc5f1c58e2a9f30355348b90d 100644 +index 08cc289039924d337489368f36c505cc68896745..ac9688f8bdb31e0011ab6830695f81bb477a24d3 100644 --- a/Source/WebKit/UIProcess/PageClient.h +++ b/Source/WebKit/UIProcess/PageClient.h -@@ -322,6 +322,11 @@ public: +@@ -319,6 +319,11 @@ public: virtual void selectionDidChange() = 0; #endif @@ -15803,7 +15803,7 @@ index 0650f60cb79ed94e96c709a26d992dd54c8764ab..bdfd91f0c69ec17dc5f1c58e2a9f3035 virtual RefPtr takeViewSnapshot(std::optional&&) = 0; #endif diff --git a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp -index bb4a4c2f6a17f4ada269a3450f9c276f648c72e1..49cd5218f23a6e8b8b8cf9d33542795dca95e548 100644 +index c97552f4e63b5923c6cb1c9043dfb2b2c5cf23c6..16b9f932794144ca2ecf48a63f9a9cfc04be39ab 100644 --- a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp +++ b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp @@ -598,3 +598,5 @@ bool ProvisionalPageProxy::sendMessage(UniqueRef&& encoder, Option @@ -16792,7 +16792,7 @@ index 0000000000000000000000000000000000000000..94e9f24353337169992724e2fcdf7086 + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b479083992a41b 100644 +index 0f0cb6da22484e0decfc29293215b55833663104..979bb6e4bb6a3c5e81808a4b423856e47892a7eb 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -241,7 +241,7 @@ @@ -16823,7 +16823,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 } void WebPageProxy::didAttachToRunningProcess() -@@ -1321,6 +1326,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1323,6 +1328,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -16845,7 +16845,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1850,6 +1870,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1853,6 +1873,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -16877,7 +16877,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2040,6 +2085,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2043,6 +2088,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -16903,7 +16903,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2612,6 +2676,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2615,6 +2679,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -16912,7 +16912,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2622,6 +2688,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2625,6 +2691,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -16921,7 +16921,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2637,18 +2705,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2657,6 +2748,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2660,6 +2751,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -16991,7 +16991,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2669,8 +2778,18 @@ void WebPageProxy::didStartDrag() +@@ -2672,8 +2781,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17011,7 +17011,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2775,16 +2894,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2778,16 +2897,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17057,7 +17057,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3004,7 +3145,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3007,7 +3148,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17066,7 +17066,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -3037,7 +3178,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3040,7 +3181,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -17075,7 +17075,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3420,6 +3561,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3423,6 +3564,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -17084,7 +17084,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 receivedPolicyDecision(policyAction, navigation, WTFMove(policies), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3486,6 +3629,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3489,6 +3632,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, RefPtr&& websitePolicies, Variant, Ref>&& navigationActionOrResponse, Ref&& sender, std::optional sandboxExtensionHandle, WillContinueLoadInNewProcess willContinueLoadInNewProcess) { @@ -17092,7 +17092,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4224,6 +4368,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4227,6 +4371,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17104,7 +17104,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4556,6 +4705,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4559,6 +4708,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17112,7 +17112,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4778,6 +4928,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4781,6 +4931,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17121,7 +17121,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 // 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; -@@ -5220,7 +5372,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5223,7 +5375,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) { @@ -17137,7 +17137,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5733,6 +5892,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5736,6 +5895,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(); @@ -17145,7 +17145,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 auto completionHandler = [this, protectedThis = makeRef(*this), mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -5773,6 +5933,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5776,6 +5936,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17153,7 +17153,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 } void WebPageProxy::exitFullscreenImmediately() -@@ -5808,6 +5969,10 @@ void WebPageProxy::closePage() +@@ -5811,6 +5972,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17164,7 +17164,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -5844,6 +6009,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -5847,6 +6012,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 { @@ -17173,7 +17173,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -5865,6 +6032,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -5868,6 +6035,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17182,7 +17182,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 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 { -@@ -5888,6 +6057,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -5891,6 +6060,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17191,7 +17191,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 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 { -@@ -6048,6 +6219,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6051,6 +6222,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17200,7 +17200,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7255,6 +7428,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7258,6 +7431,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -17209,7 +17209,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 } break; } -@@ -7281,7 +7456,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7284,7 +7459,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()); @@ -17217,7 +17217,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7300,7 +7474,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7303,7 +7477,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); @@ -17225,7 +17225,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7309,6 +7482,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7312,6 +7485,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -17233,7 +17233,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 } break; } -@@ -7639,7 +7813,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7642,7 +7816,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%d", reason); @@ -17245,7 +17245,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8012,6 +8189,7 @@ static const Vector& mediaRelatedIOKitClasses() +@@ -8015,6 +8192,7 @@ static const Vector& mediaRelatedIOKitClasses() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -17253,7 +17253,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8204,6 +8382,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8207,6 +8385,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.shouldRelaxThirdPartyCookieBlocking = m_configuration->shouldRelaxThirdPartyCookieBlocking(); parameters.canUseCredentialStorage = m_canUseCredentialStorage; @@ -17262,7 +17262,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 #if PLATFORM(GTK) parameters.themeName = pageClient().themeName(); #endif -@@ -8280,6 +8460,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8283,6 +8463,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -17277,7 +17277,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = makeRef(*this), authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8373,6 +8561,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8376,6 +8564,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -17294,7 +17294,7 @@ index 9ff0c246e1d3100b08b998153287c117d288d401..176d2387db8dc694020d006e51b47908 // 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 7a837f3c45b996f97fa961e60ea96aecb8f74214..c13019099366ba06487f6d3c152f116a060117b2 100644 +index a964e62763a1d964eee6f464aa2e3a06c0637640..9160f8b7430d9d9e8031b23bf2bb8c1df2879099 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -38,6 +38,7 @@ @@ -17348,7 +17348,7 @@ index 7a837f3c45b996f97fa961e60ea96aecb8f74214..c13019099366ba06487f6d3c152f116a class SharedBuffer; class SpeechRecognitionRequest; class TextIndicator; -@@ -528,6 +540,8 @@ public: +@@ -529,6 +541,8 @@ public: void setControlledByAutomation(bool); WebPageInspectorController& inspectorController() { return *m_inspectorController; } @@ -17357,7 +17357,7 @@ index 7a837f3c45b996f97fa961e60ea96aecb8f74214..c13019099366ba06487f6d3c152f116a #if PLATFORM(IOS_FAMILY) void showInspectorIndication(); -@@ -606,6 +620,11 @@ public: +@@ -611,6 +625,11 @@ public: void setPageLoadStateObserver(std::unique_ptr&&); @@ -17369,7 +17369,7 @@ index 7a837f3c45b996f97fa961e60ea96aecb8f74214..c13019099366ba06487f6d3c152f116a void initializeWebPage(); void setDrawingArea(std::unique_ptr&&); -@@ -633,6 +652,7 @@ public: +@@ -638,6 +657,7 @@ public: void closePage(); void addPlatformLoadParameters(WebProcessProxy&, LoadParameters&); @@ -17377,7 +17377,7 @@ index 7a837f3c45b996f97fa961e60ea96aecb8f74214..c13019099366ba06487f6d3c152f116a RefPtr loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemesButNotAppLinks, API::Object* userData = nullptr); RefPtr loadFile(const String& fileURL, const String& resourceDirectoryURL, API::Object* userData = nullptr); RefPtr loadData(const IPC::DataReference&, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow); -@@ -1147,6 +1167,7 @@ public: +@@ -1152,6 +1172,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -17385,7 +17385,7 @@ index 7a837f3c45b996f97fa961e60ea96aecb8f74214..c13019099366ba06487f6d3c152f116a void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1221,14 +1242,20 @@ public: +@@ -1226,14 +1247,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -17407,7 +17407,7 @@ index 7a837f3c45b996f97fa961e60ea96aecb8f74214..c13019099366ba06487f6d3c152f116a #endif void processDidBecomeUnresponsive(); -@@ -1470,6 +1497,8 @@ public: +@@ -1475,6 +1502,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -17416,7 +17416,7 @@ index 7a837f3c45b996f97fa961e60ea96aecb8f74214..c13019099366ba06487f6d3c152f116a #endif #if ENABLE(WEB_CRYPTO) -@@ -2563,6 +2592,7 @@ private: +@@ -2568,6 +2597,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17424,7 +17424,7 @@ index 7a837f3c45b996f97fa961e60ea96aecb8f74214..c13019099366ba06487f6d3c152f116a #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2816,6 +2846,20 @@ private: +@@ -2821,6 +2851,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17445,7 +17445,7 @@ index 7a837f3c45b996f97fa961e60ea96aecb8f74214..c13019099366ba06487f6d3c152f116a #endif PageLoadState m_pageLoadState; -@@ -3029,6 +3073,9 @@ private: +@@ -3034,6 +3078,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17456,7 +17456,7 @@ index 7a837f3c45b996f97fa961e60ea96aecb8f74214..c13019099366ba06487f6d3c152f116a #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 027a70c8d829062019a216705378b8d8727d10af..8b771c9a43967d99a61cb243f32df19c24b99b56 100644 +index db5b56ef235209ea1739469a9116140e2976d96e..3a0c71d0d38c37daefa3a18b5c12f8ba08f946d8 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -17491,7 +17491,7 @@ index 027a70c8d829062019a216705378b8d8727d10af..8b771c9a43967d99a61cb243f32df19c DidPerformDragOperation(bool handled) #endif diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index ba9e7ce342d9e6621df307b130636bf60fc5c5cc..89abe3cf1849fc56504bfd311e4db43c9958ebca 100644 +index 2eab6bcb89b8b79a7dcf3cdcd49c06d5acd212b3..5db9888b36e24819dc85d15dc787f22b077dacee 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp @@ -509,6 +509,14 @@ void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkPro @@ -17522,7 +17522,7 @@ index ba9e7ce342d9e6621df307b130636bf60fc5c5cc..89abe3cf1849fc56504bfd311e4db43c parameters.urlSchemesRegisteredAsEmptyDocument = copyToVector(m_schemesToRegisterAsEmptyDocument); parameters.urlSchemesRegisteredAsSecure = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsSecure()); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp -index 98b83690ec50bccd8866cdb4c7dc9d83c78292de..adda1f2732a36ee47fcb4dce01411d111ef06256 100644 +index 30fa4237cbde8f7c006386f9b573d8ead918d958..01eaa27437987693d6a99091a6814fde189ef90f 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp @@ -126,6 +126,11 @@ HashMap& WebProcessProxy::allProcesses() @@ -17538,10 +17538,10 @@ index 98b83690ec50bccd8866cdb4c7dc9d83c78292de..adda1f2732a36ee47fcb4dce01411d11 { return allProcesses().get(identifier); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h -index e225ff467dc84b576dc25d6625028b6019cf5e89..520716c830b2e0f29a9059b6c7e6f7534d7d3481 100644 +index 790d76594ec5fc5f43aefb3e224a492d4658e536..33f5868d33e897318f4828edf4c3a2fafa1763b1 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.h +++ b/Source/WebKit/UIProcess/WebProcessProxy.h -@@ -137,6 +137,7 @@ public: +@@ -141,6 +141,7 @@ public: ~WebProcessProxy(); static void forWebPagesWithOrigin(PAL::SessionID, const WebCore::SecurityOriginData&, const Function&); @@ -17550,7 +17550,7 @@ index e225ff467dc84b576dc25d6625028b6019cf5e89..520716c830b2e0f29a9059b6c7e6f753 WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index f1421227047e94d2ea3ae0b06fc8ab37f3066c72..cfd13e410b7a8ecd4ef2614042e0a432b3d0304e 100644 +index dc443ad5ac9163a662477c2af08e74383201619d..af7722bb9ec218845ce9b15d7c6551dbf4f9e8cb 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp @@ -2127,6 +2127,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O @@ -17572,7 +17572,7 @@ index f1421227047e94d2ea3ae0b06fc8ab37f3066c72..cfd13e410b7a8ecd4ef2614042e0a432 void WebsiteDataStore::hasAppBoundSession(CompletionHandler&& completionHandler) const { diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -index 648bd4ce9b80e2356ee2b1928875f041317995ba..0ae5f94a1b89bb266dc915172abbafb3ab132df6 100644 +index 30b217a27eb2137577efa291932adf55e2a64d38..a9104d10486accc89b6648c31a4ce5810a55101e 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h @@ -84,6 +84,7 @@ class DeviceIdHashSaltStorage; @@ -17664,7 +17664,7 @@ index 648bd4ce9b80e2356ee2b1928875f041317995ba..0ae5f94a1b89bb266dc915172abbafb3 UniqueRef m_soAuthorizationCoordinator; #endif diff --git a/Source/WebKit/UIProcess/cairo/BackingStoreCairo.cpp b/Source/WebKit/UIProcess/cairo/BackingStoreCairo.cpp -index 4f78b5eb5cdb51f2ebfcaff64ecd19b1e630ad9f..a2dc89ddf668e1be7b8f343a5df542b3141216cc 100644 +index 0b2fc0019ffa2c05383dc4b4e480b4d380aa9fd5..79773452d246f3bcdf42122a3bf8f67685e45fdc 100644 --- a/Source/WebKit/UIProcess/cairo/BackingStoreCairo.cpp +++ b/Source/WebKit/UIProcess/cairo/BackingStoreCairo.cpp @@ -27,9 +27,11 @@ @@ -17679,7 +17679,7 @@ index 4f78b5eb5cdb51f2ebfcaff64ecd19b1e630ad9f..a2dc89ddf668e1be7b8f343a5df542b3 #include #include #include -@@ -62,6 +64,13 @@ std::unique_ptr BackingStore::createBackend() +@@ -61,6 +63,13 @@ std::unique_ptr BackingStore::createBackend() return makeUnique(m_size, m_deviceScaleFactor); } @@ -18244,10 +18244,10 @@ index 0000000000000000000000000000000000000000..d0f9827544994e450e24e3f7a427c35e + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm -index 56b32598708dbac89156336dc12ef2d194d597c8..d6c213d4cfa3159849a09423b85ce0900d27b080 100644 +index fb7112c81fe3a514f7d872b3185748d8c7617ec3..f924351e98068eccdcd48f462f86cd66a530d79b 100644 --- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm +++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm -@@ -441,6 +441,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect) +@@ -442,6 +442,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect) void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled) { @@ -19320,10 +19320,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26fb495c10 100644 +index 904f8b27c8448ca284b26339d0e4e0dd37e9a39e..4584471f3080fbbc96b815eaddbfa0e8efa1ed49 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1958,6 +1958,18 @@ +@@ -1960,6 +1960,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 */; }; @@ -19342,7 +19342,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 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 */; }; -@@ -2014,6 +2026,9 @@ +@@ -2016,6 +2028,9 @@ E5BEF6822130C48000F31111 /* WebDataListSuggestionsDropdownIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = E5BEF6802130C47F00F31111 /* WebDataListSuggestionsDropdownIOS.h */; }; E5CB07DC20E1678F0022C183 /* WKFormColorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */; }; ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -19352,7 +19352,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 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, ); }; }; -@@ -5850,6 +5865,19 @@ +@@ -5862,6 +5877,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 = ""; }; @@ -19372,7 +19372,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 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 = ""; }; -@@ -5966,6 +5994,14 @@ +@@ -5980,6 +6008,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 = ""; }; @@ -19387,7 +19387,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 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 = ""; }; -@@ -6078,6 +6114,7 @@ +@@ -6094,6 +6130,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -19395,7 +19395,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -7947,6 +7984,7 @@ +@@ -7969,6 +8006,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -19403,7 +19403,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -9009,6 +9047,7 @@ +@@ -9034,6 +9072,7 @@ isa = PBXGroup; children = ( 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -19411,7 +19411,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, ); -@@ -9444,6 +9483,12 @@ +@@ -9469,6 +9508,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -19424,7 +19424,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 ); path = Agents; sourceTree = ""; -@@ -9452,6 +9497,7 @@ +@@ -9477,6 +9522,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -19432,7 +19432,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -9941,6 +9987,12 @@ +@@ -9968,6 +10014,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -19445,7 +19445,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -10239,6 +10291,7 @@ +@@ -10266,6 +10318,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -19453,7 +19453,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -10834,6 +10887,11 @@ +@@ -10861,6 +10914,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -19465,7 +19465,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, C1817362205844A900DFDA65 /* DisplayLink.cpp */, -@@ -11682,6 +11740,7 @@ +@@ -11710,6 +11768,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -19473,7 +19473,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -11979,6 +12038,7 @@ +@@ -12008,6 +12067,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -19481,7 +19481,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -11994,6 +12054,7 @@ +@@ -12023,6 +12083,7 @@ 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, F40BBB41257FF46E0067463A /* GPUProcessWakeupMessageArguments.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -19489,7 +19489,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -12140,6 +12201,7 @@ +@@ -12169,6 +12230,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -19497,15 +19497,15 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, 5183247C26168C62003F239E /* NetworkURLSchemeHandler.h in Headers */, -@@ -12227,6 +12289,7 @@ +@@ -12257,6 +12319,7 @@ BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, + D71A944C237239FB002C4D9E /* BrowserInspectorPipe.h in Headers */, 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, + 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */, - 1A0C227E2451130A00ED614D /* QuickLookThumbnailingSoftLink.h in Headers */, -@@ -12247,6 +12310,7 @@ +@@ -12278,6 +12341,7 @@ CDAC20B423FB58F20021DEE3 /* RemoteCDMInstanceProxy.h in Headers */, CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, @@ -19513,7 +19513,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -12561,6 +12625,7 @@ +@@ -12593,6 +12657,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -19521,7 +19521,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -12690,6 +12755,7 @@ +@@ -12722,6 +12787,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -19529,7 +19529,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -12743,6 +12809,7 @@ +@@ -12775,6 +12841,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -19537,7 +19537,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -12899,6 +12966,7 @@ +@@ -12931,6 +12998,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -19545,7 +19545,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -14131,6 +14199,7 @@ +@@ -14163,6 +14231,7 @@ C1A152D724E5A29A00978C8B /* HandleXPCEndpointMessages.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -19553,7 +19553,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 9BF5EC642541145600984E77 /* JSIPCBinding.cpp in Sources */, 2D913441212CF9F000128AFD /* JSNPMethod.cpp in Sources */, 2D913442212CF9F000128AFD /* JSNPObject.cpp in Sources */, -@@ -14149,6 +14218,7 @@ +@@ -14181,6 +14250,7 @@ 2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */, 2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */, 2D92A77A212B6A6100F493FD /* Module.cpp in Sources */, @@ -19561,7 +19561,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 57B826452304F14000B72EB0 /* NearFieldSoftLink.mm in Sources */, 2D913443212CF9F000128AFD /* NetscapeBrowserFuncs.cpp in Sources */, 2D913444212CF9F000128AFD /* NetscapePlugin.cpp in Sources */, -@@ -14173,6 +14243,7 @@ +@@ -14205,6 +14275,7 @@ 1A2D8439127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp in Sources */, 2D92A792212B6AD400F493FD /* NPObjectProxy.cpp in Sources */, 2D92A793212B6AD400F493FD /* NPRemoteObjectMap.cpp in Sources */, @@ -19569,7 +19569,7 @@ index 57f0933e4dfbd6f1feb5daf8a43c498b2e0e91aa..07028681538738e36be8822816680c26 2D913447212CF9F000128AFD /* NPRuntimeObjectMap.cpp in Sources */, 2D913448212CF9F000128AFD /* NPRuntimeUtilities.cpp in Sources */, 2D92A794212B6AD400F493FD /* NPVariantData.cpp in Sources */, -@@ -14478,6 +14549,7 @@ +@@ -14510,6 +14581,7 @@ 2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -19750,7 +19750,7 @@ index ecd4052eac038028255a786236e1969853afa1d8..2adc87a59c12d15c651909e67670ac35 if (m_coreLoader) didFailResourceLoad(error); diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -index 8cd4c8a0122d43c304083b26e0aa510b337a00bd..fa689f8a219e7d3c9179b58e5751ee89ea16eddd 100644 +index 89f05d5cc7064acee45cf09a530143b5e3a2fe1d..0fc6b88966d9d9df624e65119224fd54dcdfc50b 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp @@ -398,6 +398,8 @@ void WebChromeClient::setResizable(bool resizable) @@ -20222,7 +20222,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 7080a77e4eccda34ceb02681733b2a03ff0f4290..0925a37035376249af9be6d87525daaf9c1ecaf3 100644 +index af905408117bbd6239212d1d9e14aa2a97f41129..13a8d05a15f3b65f726a54ef47a9d8a3cb298eaa 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp @@ -882,6 +882,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) @@ -20258,7 +20258,7 @@ index 7080a77e4eccda34ceb02681733b2a03ff0f4290..0925a37035376249af9be6d87525daaf void WebPage::loadRequest(LoadParameters&& loadParameters) { setLastNavigationWasAppBound(loadParameters.request.isAppBound()); -@@ -1942,17 +1961,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1908,17 +1927,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -20277,7 +20277,7 @@ index 7080a77e4eccda34ceb02681733b2a03ff0f4290..0925a37035376249af9be6d87525daaf // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -1969,20 +1984,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1935,20 +1950,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -20305,7 +20305,7 @@ index 7080a77e4eccda34ceb02681733b2a03ff0f4290..0925a37035376249af9be6d87525daaf #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -1990,7 +2003,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1956,7 +1969,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -20313,7 +20313,7 @@ index 7080a77e4eccda34ceb02681733b2a03ff0f4290..0925a37035376249af9be6d87525daaf void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2285,6 +2297,7 @@ void WebPage::scaleView(double scale) +@@ -2251,6 +2263,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -20321,7 +20321,7 @@ index 7080a77e4eccda34ceb02681733b2a03ff0f4290..0925a37035376249af9be6d87525daaf scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2389,17 +2402,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2355,17 +2368,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -20340,7 +20340,7 @@ index 7080a77e4eccda34ceb02681733b2a03ff0f4290..0925a37035376249af9be6d87525daaf } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3266,6 +3275,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3233,6 +3242,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -20445,7 +20445,7 @@ index 7080a77e4eccda34ceb02681733b2a03ff0f4290..0925a37035376249af9be6d87525daaf #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3342,6 +3449,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3309,6 +3416,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -20457,7 +20457,7 @@ index 7080a77e4eccda34ceb02681733b2a03ff0f4290..0925a37035376249af9be6d87525daaf void WebPage::insertNewlineInQuotedContent() { Frame& frame = m_page->focusController().focusedOrMainFrame(); -@@ -3579,6 +3691,7 @@ void WebPage::didCompletePageTransition() +@@ -3546,6 +3658,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -20465,7 +20465,7 @@ index 7080a77e4eccda34ceb02681733b2a03ff0f4290..0925a37035376249af9be6d87525daaf } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4319,7 +4432,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4286,7 +4399,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -20474,7 +20474,7 @@ index 7080a77e4eccda34ceb02681733b2a03ff0f4290..0925a37035376249af9be6d87525daaf void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6641,6 +6754,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6608,6 +6721,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -20485,10 +20485,10 @@ index 7080a77e4eccda34ceb02681733b2a03ff0f4290..0925a37035376249af9be6d87525daaf return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index 7901db2bae3396cf294b2bb7d074d1e2ae2ba857..15f562b20c7847f27576951ec857925f338649d3 100644 +index fe52fe347ea51e7ac6b85b5eea7f04b3c6eb3b6d..243c1f4a318e929d262f7810df3fd3ccd6aeb629 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h -@@ -111,6 +111,10 @@ typedef struct _AtkObject AtkObject; +@@ -112,6 +112,10 @@ typedef struct _AtkObject AtkObject; #include "WebPrintOperationGtk.h" #endif @@ -20499,7 +20499,7 @@ index 7901db2bae3396cf294b2bb7d074d1e2ae2ba857..15f562b20c7847f27576951ec857925f #if PLATFORM(GTK) || PLATFORM(WPE) #include "InputMethodState.h" #endif -@@ -964,11 +968,11 @@ public: +@@ -965,11 +969,11 @@ public: void clearSelection(); void restoreSelectionInFocusedEditableElement(); @@ -20513,7 +20513,7 @@ index 7901db2bae3396cf294b2bb7d074d1e2ae2ba857..15f562b20c7847f27576951ec857925f void performDragControllerAction(DragControllerAction, const WebCore::DragData&, SandboxExtension::Handle&&, SandboxExtension::HandleArray&&); #endif -@@ -982,6 +986,9 @@ public: +@@ -983,6 +987,9 @@ public: void didStartDrag(); void dragCancelled(); OptionSet allowedDragSourceActions() const { return m_allowedDragSourceActions; } @@ -20523,7 +20523,7 @@ index 7901db2bae3396cf294b2bb7d074d1e2ae2ba857..15f562b20c7847f27576951ec857925f #endif void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&); -@@ -1214,6 +1221,7 @@ public: +@@ -1215,6 +1222,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -20531,7 +20531,7 @@ index 7901db2bae3396cf294b2bb7d074d1e2ae2ba857..15f562b20c7847f27576951ec857925f void insertNewlineInQuotedContent(); -@@ -1570,6 +1578,7 @@ private: +@@ -1573,6 +1581,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -20539,7 +20539,7 @@ index 7901db2bae3396cf294b2bb7d074d1e2ae2ba857..15f562b20c7847f27576951ec857925f void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1607,6 +1616,7 @@ private: +@@ -1610,6 +1619,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -20547,7 +20547,7 @@ index 7901db2bae3396cf294b2bb7d074d1e2ae2ba857..15f562b20c7847f27576951ec857925f #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1729,9 +1739,7 @@ private: +@@ -1732,9 +1742,7 @@ private: void countStringMatches(const String&, OptionSet, uint32_t maxMatchCount); void replaceMatches(const Vector& matchIndices, const String& replacementText, bool selectionOnly, CompletionHandler&&); @@ -20557,7 +20557,7 @@ index 7901db2bae3396cf294b2bb7d074d1e2ae2ba857..15f562b20c7847f27576951ec857925f void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2257,6 +2265,7 @@ private: +@@ -2260,6 +2268,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -20566,7 +20566,7 @@ index 7901db2bae3396cf294b2bb7d074d1e2ae2ba857..15f562b20c7847f27576951ec857925f bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 320a27e7ac44c7d1054c3d333d4e6451c43d1377..12ce55dc6e8949e3c2315d8278a0ac1d408e2300 100644 +index 7afb98959e7e4eb865d08710706b14e5043cd0da..cb75ad8ee7f612a5c4b68cd952c5d935cb2142f5 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 @@ -20710,7 +20710,7 @@ index 8e9454597bb23b22c506f929020fc3c37ffaa71a..9730e673e85da143a3acdda03fb9fa3f } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index 7c4effdb74316dacdc1a3431a92e3b2f9c8b7479..f62bec5195b896afa5a81d2219f430502aef0a7d 100644 +index 87cc422a592dbb6c547219189a57857da94d1260..8fe6007994a9d22c417309737c60a8bda0c6cea5 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -87,6 +87,7 @@ @@ -21501,7 +21501,7 @@ index 775b41868718ea6734efc9082f8161eee2e0015e..68a720c0cb01d534653a259536c48168 list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp -index cfc9c4483c825d913ed27a4d55884f242d76f002..a14886f89ce62981006517ef528481ab2c9ff116 100644 +index 8b5d93545a606748f492f6b73cdbd1219596cc0f..f81ce7d529281b68cb674cb25c53844c1732c56e 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp @@ -787,6 +787,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)