diff --git a/browser_patches/export.sh b/browser_patches/export.sh index 3f616491e9..5cf948a1bf 100755 --- a/browser_patches/export.sh +++ b/browser_patches/export.sh @@ -142,9 +142,8 @@ NEW_BASE_REVISION=$(git merge-base $REMOTE_BROWSER_UPSTREAM/$BASE_BRANCH $CURREN NEW_DIFF=$(git diff --diff-algorithm=myers --full-index $NEW_BASE_REVISION $CURRENT_BRANCH -- . ":!${EXTRA_FOLDER_CHECKOUT_RELPATH}") # Increment BUILD_NUMBER -#BUILD_NUMBER=$(curl ${BUILD_NUMBER_UPSTREAM_URL} | head -1) -#BUILD_NUMBER=$((BUILD_NUMBER+1)) -BUILD_NUMBER=1242 +BUILD_NUMBER=$(curl ${BUILD_NUMBER_UPSTREAM_URL} | head -1) +BUILD_NUMBER=$((BUILD_NUMBER+1)) echo "REMOTE_URL=\"$REMOTE_URL\" BASE_BRANCH=\"$BASE_BRANCH\" diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index e259334cfe..3b956ca305 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1462 -Changed: yurys@chromium.org Fri 09 Apr 2021 11:32:50 AM PDT +1463 +Changed: yurys@chromium.org Mon 12 Apr 2021 12:36:31 PM PDT diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 804174d5f0..b12f9c9212 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="8a5d8468a7f5b8942f04866cc97a9a5ab961b464" +BASE_REVISION="51b0324419e3554cd9344c71178ea89683250afc" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 3adeb05c3d..5ea587bc9e 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 23594d2e5a58dfc092f67c374836e1e82656daa1..dd2a021902786316475fc6ee0a0d583c65af9788 100644 +index 4f2c099d3a10d0789d6f8695f629f4fa48019188..be105b235c4644192e91e008884d98daea32e783 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1231,22 +1231,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1232,22 +1232,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json @@ -1772,10 +1772,10 @@ index de0b45bd0a88eaba466b6e6c0ad66dc02f525741..81857a2be24fa3ff0a60ebbcd0113096 WTF_EXPORT_PRIVATE LocalTimeOffset calculateLocalTimeOffset(double utcInMilliseconds, TimeType = UTCTime); diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index b8d04434da8f1d1d4ecfc081c7aee6f66ebc9115..8d203e20dce0d89f459fc2d97b218eaea67015ee 100644 +index 043a7bce1e85c65abf82e5c9902f37c938c09c3a..893c49009bd6a06c176250af17eef30e897061f0 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h -@@ -405,7 +405,7 @@ +@@ -401,7 +401,7 @@ #endif #if !defined(ENABLE_ORIENTATION_EVENTS) @@ -1784,7 +1784,7 @@ index b8d04434da8f1d1d4ecfc081c7aee6f66ebc9115..8d203e20dce0d89f459fc2d97b218eae #endif #if OS(WINDOWS) -@@ -470,7 +470,7 @@ +@@ -466,7 +466,7 @@ #endif #if !defined(ENABLE_TOUCH_EVENTS) @@ -1794,7 +1794,7 @@ index b8d04434da8f1d1d4ecfc081c7aee6f66ebc9115..8d203e20dce0d89f459fc2d97b218eae #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 87c3c935705b01a079d228a9fdcc9961ada60ade..cfa0e2759e65490a5d7bfca5973ae0ca668961f9 100644 +index 38339017a5dda1402ac6067d4c79c28569bd28b2..ec07a1858655ea1c8256a544110f257fb5977aef 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -364,7 +364,7 @@ @@ -1969,10 +1969,10 @@ index ef168b76819216d984b7a2d0f760005fb9d24de8..2d6cf51f3b45191ad84106429d4f108f __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 3003d8611537b052dd43d9a6a82c135063047c51..ceb9bf0d642b3ea36f3ad882863a6c7b90256e2a 100644 +index e770b08402292402805a637174d369e6cd354170..e4a212bb39c0c53f5163da111c115b8e3b2a3552 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5291,6 +5291,14 @@ +@@ -5292,6 +5292,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, ); }; }; @@ -1987,7 +1987,7 @@ index 3003d8611537b052dd43d9a6a82c135063047c51..ceb9bf0d642b3ea36f3ad882863a6c7b 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, ); }; }; -@@ -16700,6 +16708,14 @@ +@@ -16702,6 +16710,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 = ""; }; @@ -2002,7 +2002,7 @@ index 3003d8611537b052dd43d9a6a82c135063047c51..ceb9bf0d642b3ea36f3ad882863a6c7b 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 = ""; }; -@@ -22267,7 +22283,12 @@ +@@ -22270,7 +22286,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2015,7 +2015,7 @@ index 3003d8611537b052dd43d9a6a82c135063047c51..ceb9bf0d642b3ea36f3ad882863a6c7b E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -27753,7 +27774,9 @@ +@@ -27756,7 +27777,9 @@ B2C3D9EC0D006C1D00EF6F26 /* text */, E1EE8B6B2412B2A700E794D6 /* xr */, DFDB912CF8E88A6DA1AD264F /* AbortableTaskQueue.h */, @@ -2025,7 +2025,7 @@ index 3003d8611537b052dd43d9a6a82c135063047c51..ceb9bf0d642b3ea36f3ad882863a6c7b 49AE2D95134EE5F90072920A /* CalculationValue.h */, C330A22113EC196B0000B45B /* ColorChooser.h */, C37CDEBC149EF2030042090D /* ColorChooserClient.h */, -@@ -30311,6 +30334,7 @@ +@@ -30314,6 +30337,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2033,7 +2033,7 @@ index 3003d8611537b052dd43d9a6a82c135063047c51..ceb9bf0d642b3ea36f3ad882863a6c7b 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 86D982F6125C154000AD9E3D /* DocumentTiming.h */, -@@ -31339,6 +31363,7 @@ +@@ -31342,6 +31366,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2041,7 +2041,7 @@ index 3003d8611537b052dd43d9a6a82c135063047c51..ceb9bf0d642b3ea36f3ad882863a6c7b 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -33333,6 +33358,7 @@ +@@ -33337,6 +33362,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2049,7 +2049,7 @@ index 3003d8611537b052dd43d9a6a82c135063047c51..ceb9bf0d642b3ea36f3ad882863a6c7b 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -35377,9 +35403,11 @@ +@@ -35381,9 +35407,11 @@ B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */, @@ -2061,7 +2061,7 @@ index 3003d8611537b052dd43d9a6a82c135063047c51..ceb9bf0d642b3ea36f3ad882863a6c7b B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -36344,6 +36372,7 @@ +@@ -36348,6 +36376,7 @@ 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, 4463CF682212FA68001A8577 /* DataDetectorsCoreSoftLink.mm in Sources */, @@ -2069,7 +2069,7 @@ index 3003d8611537b052dd43d9a6a82c135063047c51..ceb9bf0d642b3ea36f3ad882863a6c7b 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -36430,6 +36459,7 @@ +@@ -36434,6 +36463,7 @@ 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2077,7 +2077,7 @@ index 3003d8611537b052dd43d9a6a82c135063047c51..ceb9bf0d642b3ea36f3ad882863a6c7b 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -36478,6 +36508,7 @@ +@@ -36482,6 +36512,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2085,7 +2085,7 @@ index 3003d8611537b052dd43d9a6a82c135063047c51..ceb9bf0d642b3ea36f3ad882863a6c7b DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -37010,6 +37041,7 @@ +@@ -37014,6 +37045,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -4655,7 +4655,7 @@ index e24fded2225f1c1918f454017566717e20484eab..30e4b7a986418c4b4f6c799b858b6082 void ProgressTracker::incrementProgress(unsigned long identifier, const ResourceResponse& response) diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h -index e1043153372b86ce0d6883bf2080341833c0b09b..7c78232ea8210f60de69b0924661086540eebf30 100644 +index d0bc3550d4d0835c333e1f483f5f25add04833ce..3773bc07f553ec2ab2b71a0d3140aebf0787d676 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h @@ -292,7 +292,7 @@ public: @@ -4668,7 +4668,7 @@ index e1043153372b86ce0d6883bf2080341833c0b09b..7c78232ea8210f60de69b09246610865 #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index b42d20a7e7ebc88f593bc3cfd506e319dc9d849d..57de5338c2e331f20dcb5a19c370ef751b539aa5 100644 +index 275908dd1db6633ea765bdef7e3e56930aeb46d3..76d35100dcbb09157dcd4be86cfa5a827bbdd365 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -123,6 +123,7 @@ @@ -5420,7 +5420,7 @@ index 38fd7b29b53eab484e30963b51c8ae525c5d7a38..3c2f2104e3f364d3d6201e3009a448b4 if (stateObjectType == StateObjectType::Push) { frame->loader().history().pushState(WTFMove(data), title, fullURL.string()); diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp -index d10811f2a2be1eb87926190ddd0082dffaa8ad66..c4a99b32e3bf45034b1b11ce1cba713928d27141 100644 +index eaf56cde230665383985552615e125800258a86c..169840f678fa1cf2dcdad45056cc7ab0d82cbd94 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp @@ -440,6 +440,37 @@ void Page::setOverrideViewportArguments(const Optional& viewp @@ -5462,7 +5462,7 @@ index d10811f2a2be1eb87926190ddd0082dffaa8ad66..c4a99b32e3bf45034b1b11ce1cba7139 { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index c1cbe82c73110e5391b0cdb076670b71e177fdb5..c6fe9228dc5d4adc8ae0b1821f391240623be842 100644 +index d48281690553e046f470347ed6bb45215e20649d..0296b2c4e7ce48e82bf350c8e604d06f841102ea 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h @@ -251,6 +251,9 @@ public: @@ -5486,7 +5486,7 @@ index c1cbe82c73110e5391b0cdb076670b71e177fdb5..c6fe9228dc5d4adc8ae0b1821f391240 #endif FocusController& focusController() const { return *m_focusController; } #if ENABLE(CONTEXT_MENUS) -@@ -818,6 +825,11 @@ public: +@@ -820,6 +827,11 @@ public: WEBCORE_EXPORT Vector> editableElementsInRect(const FloatRect&) const; @@ -5498,7 +5498,7 @@ index c1cbe82c73110e5391b0cdb076670b71e177fdb5..c6fe9228dc5d4adc8ae0b1821f391240 #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -893,6 +905,9 @@ private: +@@ -895,6 +907,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -5508,7 +5508,7 @@ index c1cbe82c73110e5391b0cdb076670b71e177fdb5..c6fe9228dc5d4adc8ae0b1821f391240 #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1132,6 +1147,11 @@ private: +@@ -1134,6 +1149,11 @@ private: #endif Optional m_overrideViewportArguments; @@ -7514,7 +7514,7 @@ index 9e28783e6e1ac135970b06d420f5ec64a6b99fa1..bac00b5d69ae8d462ab0204082ca51cb } diff --git a/Source/WebCore/platform/win/KeyEventWin.cpp b/Source/WebCore/platform/win/KeyEventWin.cpp -index 44737686187a06a92c408ea60b63a48ac8481334..c754a763688b52e7ddd47493296ef9b0c6adc527 100644 +index aae6c99dd052985a43718846b68536454050c234..7e2e5d0c1de90f1454f7fdb71a40ab71228dcbe9 100644 --- a/Source/WebCore/platform/win/KeyEventWin.cpp +++ b/Source/WebCore/platform/win/KeyEventWin.cpp @@ -239,10 +239,16 @@ PlatformKeyboardEvent::PlatformKeyboardEvent(HWND, WPARAM code, LPARAM keyData, @@ -8004,10 +8004,10 @@ index 0000000000000000000000000000000000000000..cf2b51f6f02837a1106f4d999f2f130e + +} // namespace WebCore diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp -index 847473025ebf06b460b03f87fe83c36393132a68..32d7fe4fdae41f45f13ad1c507609d93cb65bf49 100644 +index 7a5958c923a2148621afcdc3c4dbcf4a37b42311..974223d286687dc2820c5841cf96522e9d82d764 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp -@@ -2540,7 +2540,7 @@ LayoutRect RenderLayer::getRectToExpose(const LayoutRect& visibleRect, const Lay +@@ -2566,7 +2566,7 @@ LayoutRect RenderLayer::getRectToExpose(const LayoutRect& visibleRect, const Lay ScrollAlignment::Behavior scrollX; LayoutRect exposeRectX(exposeRect.x(), visibleRect.y(), exposeRect.width(), visibleRect.height()); LayoutUnit intersectWidth = intersection(visibleRect, exposeRectX).width(); @@ -8063,7 +8063,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 371d022d7c999151f03df6e4d03240abe1f61543..9a0dd0e753710897a2ab339d26dc995dc63b0aa8 100644 +index 051550e777e507a3ada73c1be9298275017a20bc..9b094931f3300220068fafdf3727e91602336015 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp @@ -74,6 +74,11 @@ @@ -8078,7 +8078,7 @@ index 371d022d7c999151f03df6e4d03240abe1f61543..9a0dd0e753710897a2ab339d26dc995d #if ENABLE(APPLE_PAY_REMOTE_UI) #include "WebPaymentCoordinatorProxyMessages.h" #endif -@@ -897,6 +902,15 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) +@@ -904,6 +909,15 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) #endif } @@ -8121,7 +8121,7 @@ index a098412a5f3d55fe3848b223f9dffa98c36614c6..d893ae57ee530e5d70b4c79ac16ccbd9 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 15c4e4c0d7070a81bdf80be106b69e60acbb659d..7ae995fd2b4e1f14bbe5267a62bbe66da177f0fd 100644 +index 03f29512036f9bd3657a873cae8848fa6847a7ff..e3c1e87b2ad79b4aad227dff917f40ca9bf5df65 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -26,7 +26,6 @@ @@ -8175,7 +8175,7 @@ index 15c4e4c0d7070a81bdf80be106b69e60acbb659d..7ae995fd2b4e1f14bbe5267a62bbe66d void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index f0f0fcc7d35f37b9e2b5446d3a53f6233e866463..3815b0b92faa1c9f4a312f39b1b958e78af8bbb0 100644 +index cad6979e4b84c59fb94b2d75b7bcea8d9451b343..0f2e13ff2066d31b46e391bc9af6e4603fd09e38 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h @@ -78,6 +78,7 @@ class SessionID; @@ -8199,7 +8199,7 @@ index f0f0fcc7d35f37b9e2b5446d3a53f6233e866463..3815b0b92faa1c9f4a312f39b1b958e7 void clearPrevalentResource(PAL::SessionID, const RegistrableDomain&, CompletionHandler&&); void clearUserInteraction(PAL::SessionID, const RegistrableDomain&, CompletionHandler&&); diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in -index 88d077a0145670f7f5a5bb2a96005fea180d938f..47a9ff9021fa244d45be8a768a0c95aee85ae67d 100644 +index 40ea12a0d44aeda21492e852479d6a8dc22d83c8..2147d9ef376525346db7cdbe303a0d8fd8fa5174 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in @@ -79,6 +79,11 @@ messages -> NetworkProcess LegacyReceiver { @@ -8250,7 +8250,7 @@ index 48c883bfc0fc7d501c8a4a4e7684ccc33e38c14d..20dedbbaf4b1a713c8be41e21425c307 { } diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h -index 5b558e7e2eb783dbde93b6e9bb31738e1735533f..af0aa404ac89a892a7b6845d47777433d445a327 100644 +index d91819fc14c3d65f993917a4a3e88bd36b09c6c1..dccc51729796babfcc3c6e81251404f61b3e40e1 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h @@ -84,6 +84,8 @@ public: @@ -8263,7 +8263,7 @@ index 5b558e7e2eb783dbde93b6e9bb31738e1735533f..af0aa404ac89a892a7b6845d47777433 NetworkDataTaskCocoa(NetworkSession&, NetworkDataTaskClient&, const WebCore::ResourceRequest&, WebCore::FrameIdentifier, WebCore::PageIdentifier, WebPageProxyIdentifier, WebCore::StoredCredentialsPolicy, WebCore::ContentSniffingPolicy, WebCore::ContentEncodingSniffingPolicy, bool shouldClearReferrerOnHTTPSToHTTPRedirect, PreconnectOnly, bool dataTaskIsForMainFrameNavigation, bool dataTaskIsForMainResourceNavigationForAnyFrame, Optional, Optional isNavigatingToAppBoundDomain, WebCore::ShouldRelaxThirdPartyCookieBlocking, Optional); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm -index 339e10d202f3c17197988abb075673f6b4164d45..e140032c2d52e53691761f67562e526379165ad9 100644 +index 8a0304471d5f6a56587248a50b34a61a45558f80..e37fede65c1c94e32bfc8d0a6d59e7f2e90eb3e7 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm @@ -41,6 +41,7 @@ @@ -8274,7 +8274,7 @@ index 339e10d202f3c17197988abb075673f6b4164d45..e140032c2d52e53691761f67562e5263 #import #import #import -@@ -712,4 +713,59 @@ void NetworkDataTaskCocoa::setPriority(WebCore::ResourceLoadPriority priority) +@@ -715,4 +716,59 @@ void NetworkDataTaskCocoa::setPriority(WebCore::ResourceLoadPriority priority) m_task.get().priority = toNSURLSessionTaskPriority(priority); } @@ -8335,10 +8335,10 @@ index 339e10d202f3c17197988abb075673f6b4164d45..e140032c2d52e53691761f67562e5263 + } diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 86ae8ddb91927ea0362f395c7fdae0aa8db2e642..0a49dfca7e4beafb00b865d1180307bd81e34bf0 100644 +index 88abe8c29c43b8c8881d29e25a21e4dd370ab498..c5e3439a0ce52a9d368b984c7849fac7f17d201c 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -@@ -656,7 +656,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se +@@ -659,7 +659,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se NegotiatedLegacyTLS negotiatedLegacyTLS = NegotiatedLegacyTLS::No; if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { @@ -8347,7 +8347,7 @@ index 86ae8ddb91927ea0362f395c7fdae0aa8db2e642..0a49dfca7e4beafb00b865d1180307bd return completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]); #if HAVE(TLS_PROTOCOL_VERSION_T) -@@ -901,6 +901,13 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se +@@ -906,6 +906,13 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se // NetworkLoadMetrics. For example, PerformanceTiming. resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData([dataTask _timingData])); @@ -9361,7 +9361,7 @@ index 0000000000000000000000000000000000000000..c5099cd4b6be31769e6344677625b0a1 + +} // namespace IPC diff --git a/Source/WebKit/Shared/win/WebEventFactory.cpp b/Source/WebKit/Shared/win/WebEventFactory.cpp -index 88d53d236cd6d62735f03678a04ca9c198dddacb..b8f8efc57ab00dc5725660c5a8ad56a3e6384de5 100644 +index 327ef988e56293a301f3e60b2c5e3f1912598f5e..afb51acc72acb2f77d74650f1d731c8526a421d5 100644 --- a/Source/WebKit/Shared/win/WebEventFactory.cpp +++ b/Source/WebKit/Shared/win/WebEventFactory.cpp @@ -473,7 +473,7 @@ WebKeyboardEvent WebEventFactory::createWebKeyboardEvent(HWND hwnd, UINT message @@ -9420,10 +9420,10 @@ index d6adbee324b7daee827b4e29f685a4f7e2197354..b95548dd4237a5f87db00b1a19c654d3 UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index b9f0f4b1fe0355eaf11957f67e9d1f2426692939..145a56477f82dd69657d375040afd29e0d730801 100644 +index f6e16f2bc84c0d50a6655a7336fc9f26b4d64a44..c49d893d7794a710633ed578dfde23a5255afaa0 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -262,6 +262,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm +@@ -263,6 +263,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -9431,7 +9431,7 @@ index b9f0f4b1fe0355eaf11957f67e9d1f2426692939..145a56477f82dd69657d375040afd29e UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -429,6 +430,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -430,6 +431,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -10978,7 +10978,7 @@ index 60a399c9f84b16d09cb3de4b8dfeacf37fd97546..d10856ca44c6ae2113e86eae5f4b6568 { if (!m_uiDelegate) diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -index a29d173bffa4cbd487ea87ac7a032c698819ef77..0c2a7cbdce5fbd760b4777fdb881847311d521e5 100644 +index 83f9d65c9e06a6ef55a3f543b1398b6401c4f7fc..b18a80868193089b87294d0dc2b996e677f1d13a 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm @@ -34,6 +34,7 @@ @@ -14172,7 +14172,7 @@ index 7a14cfba15c103a2d4fe263fa49d25af3c396ec2..3ee0e154349661632799057c71f1d1f1 BOOL result = ::CreateProcess(0, commandLine.data(), 0, 0, true, 0, 0, 0, &startupInfo, &processInformation); diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h -index dc95430a8ab5f1ec789b5400af005553c7023f9a..70171e5523d35e235df6ca04c0d7d4060ade4b38 100644 +index 79fe050558dacdb2b47be7310e14336ea6ebfed1..b8e263135fe86c28c01499c1ca870ba755ee4f00 100644 --- a/Source/WebKit/UIProcess/PageClient.h +++ b/Source/WebKit/UIProcess/PageClient.h @@ -312,6 +312,11 @@ public: @@ -15175,7 +15175,7 @@ index 0000000000000000000000000000000000000000..01b8f65e87b4898b1418f47f4d95c401 + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09f35dca77 100644 +index 6fbcb3bb6833f98075ca62a5b7fd57fc3730d783..f9b8ea726707cda9fe429cce79ba224ea565739e 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -238,7 +238,7 @@ @@ -15187,10 +15187,10 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 #include #endif -@@ -593,6 +593,10 @@ WebPageProxy::~WebPageProxy() - - for (auto& callback : m_nextActivityStateChangeCallbacks) - callback(); +@@ -608,6 +608,10 @@ WebPageProxy::~WebPageProxy() + #if ENABLE(MEDIA_SESSION_COORDINATOR) + WEBPAGEPROXY_DESTRUCTOR_WKCOORDINATOR_ADDITIONS + #endif + +#if PLATFORM(COCOA) + releaseInspectorDragPasteboard(); @@ -15198,7 +15198,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 } // FIXME: Should return a const PageClient& and add a separate non-const -@@ -969,6 +973,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) +@@ -987,6 +991,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) m_pageLoadState.didSwapWebProcesses(); if (reason != ProcessLaunchReason::InitialProcess) m_drawingArea->waitForBackingStoreUpdateOnNextPaint(); @@ -15206,7 +15206,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 } void WebPageProxy::didAttachToRunningProcess() -@@ -1281,6 +1286,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1299,6 +1304,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -15228,7 +15228,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1798,6 +1818,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1816,6 +1836,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -15260,7 +15260,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -1945,6 +1990,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -1963,6 +2008,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -15286,7 +15286,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2506,6 +2570,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2524,6 +2588,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -15295,7 +15295,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2516,6 +2582,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2534,6 +2600,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -15304,7 +15304,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2531,18 +2599,41 @@ void WebPageProxy::didPerformDragControllerAction(Optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2551,6 +2642,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2569,6 +2660,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -15374,7 +15374,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2563,8 +2672,18 @@ void WebPageProxy::didStartDrag() +@@ -2581,8 +2690,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -15394,7 +15394,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2669,16 +2788,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2687,16 +2806,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -15440,7 +15440,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -2870,7 +3011,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -2888,7 +3029,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -15449,7 +15449,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -2903,7 +3044,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -2921,7 +3062,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -15458,7 +15458,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3338,6 +3479,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3356,6 +3497,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, RefPtr&& websitePolicies, Variant, Ref>&& navigationActionOrResponse, Ref&& sender, Optional sandboxExtensionHandle, WillContinueLoadInNewProcess willContinueLoadInNewProcess) { @@ -15466,7 +15466,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, WTF::nullopt, WTF::nullopt }); return; -@@ -4050,6 +4192,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4068,6 +4210,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -15478,7 +15478,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4382,6 +4529,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4400,6 +4547,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -15486,7 +15486,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4604,6 +4752,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4622,6 +4770,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -15495,7 +15495,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 // 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; -@@ -5041,7 +5191,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5063,7 +5213,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, NavigationActionData&& navigationActionData, FrameInfoData&& originatingFrameInfo, Optional originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&& request, IPC::FormDataReference&& requestBody, WebCore::ResourceResponse&& redirectResponse, const UserData& userData, uint64_t listenerID) { @@ -15511,7 +15511,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5558,6 +5715,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5580,6 +5737,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(); @@ -15519,7 +15519,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 auto completionHandler = [this, protectedThis = makeRef(*this), mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement] (RefPtr newPage) mutable { if (!newPage) { reply(WTF::nullopt, WTF::nullopt); -@@ -5598,6 +5756,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5620,6 +5778,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -15527,7 +15527,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 } void WebPageProxy::exitFullscreenImmediately() -@@ -5633,6 +5792,10 @@ void WebPageProxy::closePage() +@@ -5655,6 +5814,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -15538,7 +15538,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 RELEASE_LOG_IF_ALLOWED(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -5652,6 +5815,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -5674,6 +5837,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -15547,7 +15547,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 m_uiClient->runJavaScriptAlert(*this, message, frame, WTFMove(frameInfo), WTFMove(reply)); } -@@ -5669,6 +5834,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -5691,6 +5856,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -15556,7 +15556,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 m_uiClient->runJavaScriptConfirm(*this, message, frame, WTFMove(frameInfo), WTFMove(reply)); } -@@ -5687,6 +5854,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -5709,6 +5876,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -15565,7 +15565,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 m_uiClient->runJavaScriptPrompt(*this, message, defaultValue, frame, WTFMove(frameInfo), WTFMove(reply)); } -@@ -5842,6 +6011,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -5864,6 +6033,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -15574,7 +15574,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7050,6 +7221,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7072,6 +7243,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -15583,7 +15583,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 } break; } -@@ -7076,7 +7249,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7098,7 +7271,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()); @@ -15591,7 +15591,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7095,7 +7267,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7117,7 +7289,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); @@ -15599,7 +15599,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7104,6 +7275,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7126,6 +7297,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -15607,7 +15607,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 } break; } -@@ -7392,7 +7564,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7414,7 +7586,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { RELEASE_LOG_ERROR_IF_ALLOWED(Loading, "dispatchProcessDidTerminate: reason=%d", reason); @@ -15619,7 +15619,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -7760,6 +7935,7 @@ static const Vector& mediaRelatedIOKitClasses() +@@ -7790,6 +7965,7 @@ static const Vector& temporaryMachServices() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -15627,7 +15627,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -7952,6 +8128,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -7985,6 +8161,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.shouldRelaxThirdPartyCookieBlocking = m_configuration->shouldRelaxThirdPartyCookieBlocking(); parameters.canUseCredentialStorage = m_canUseCredentialStorage; @@ -15636,7 +15636,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 #if PLATFORM(GTK) parameters.themeName = pageClient().themeName(); #endif -@@ -8024,6 +8202,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8057,6 +8235,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -15651,7 +15651,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = makeRef(*this), authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8116,6 +8302,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8149,6 +8335,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -15668,7 +15668,7 @@ index 6977e3642c3120ade1ca92d72bc1e6818fe08304..85f31949b2198b8a39c1d5c0d5b59b09 // 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 5928d05fbbd97f4364c4b7758260458e379e2cd8..b3a06e16e94d70eb86dd19bc31f7d5b498d58266 100644 +index aae5fcf05ab1c122dc365b899accd3b0c07eac44..60b7dc083532061bfefdf1a0fb03e8d10bd9ec99 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -38,6 +38,7 @@ @@ -15781,7 +15781,7 @@ index 5928d05fbbd97f4364c4b7758260458e379e2cd8..b3a06e16e94d70eb86dd19bc31f7d5b4 #endif void processDidBecomeUnresponsive(); -@@ -1443,6 +1470,8 @@ public: +@@ -1446,6 +1473,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(Optional&&); @@ -15790,7 +15790,7 @@ index 5928d05fbbd97f4364c4b7758260458e379e2cd8..b3a06e16e94d70eb86dd19bc31f7d5b4 #endif #if ENABLE(WEB_CRYPTO) -@@ -2502,6 +2531,7 @@ private: +@@ -2505,6 +2534,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -15798,7 +15798,7 @@ index 5928d05fbbd97f4364c4b7758260458e379e2cd8..b3a06e16e94d70eb86dd19bc31f7d5b4 #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2750,6 +2780,20 @@ private: +@@ -2753,6 +2783,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -15819,7 +15819,7 @@ index 5928d05fbbd97f4364c4b7758260458e379e2cd8..b3a06e16e94d70eb86dd19bc31f7d5b4 #endif PageLoadState m_pageLoadState; -@@ -2959,6 +3003,9 @@ private: +@@ -2965,6 +3009,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -15830,7 +15830,7 @@ index 5928d05fbbd97f4364c4b7758260458e379e2cd8..b3a06e16e94d70eb86dd19bc31f7d5b4 #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 ff6bb68a92d5a51c0e319b82618c01f84dcb803c..a418329e6eee81037bd40bc05e5aaa76f2b11e71 100644 +index f01d8a05dba0ce762cc30d88d0ab6ebf7115619b..a2f0a4d2e0123ea3ff54e384c01d2729f5a7459b 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -15865,7 +15865,7 @@ index ff6bb68a92d5a51c0e319b82618c01f84dcb803c..a418329e6eee81037bd40bc05e5aaa76 DidPerformDragOperation(bool handled) #endif diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index 76ea0591bb3237d089e0da88d2ef343544f42114..7ea33e301ca78f82561d81807d638ca895fa9312 100644 +index 1f36e056d1030b617f3d807fd4d265b88b0d6e16..0e5dd55e555c731fe1025025f33b2e51fb10a941 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp @@ -563,6 +563,14 @@ void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkPro @@ -15896,7 +15896,7 @@ index 76ea0591bb3237d089e0da88d2ef343544f42114..7ea33e301ca78f82561d81807d638ca8 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 59d800afb43b745039b0b483351e48423c53a365..60337f7d7e039720ab6eeb3146e794af9005cfc7 100644 +index 97282372daa57fb22788b4d7318d2cf56f6020cb..df570c248286654b17a51a36d6f527693afe8e6e 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp @@ -122,6 +122,11 @@ HashMap& WebProcessProxy::allProcesses() @@ -15912,10 +15912,10 @@ index 59d800afb43b745039b0b483351e48423c53a365..60337f7d7e039720ab6eeb3146e794af { return allProcesses().get(identifier); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h -index a68a9c151b3c2d017bf0d7fd0ab4f6ab3284994e..c1871bda7856aa0f9eb6bb51e8f880fa546678c6 100644 +index c8df4df4bb1918d801dbed2b8714c1243c7fb127..c84e427d8dd742115f4e2bb5621e9cce7fea5c40 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.h +++ b/Source/WebKit/UIProcess/WebProcessProxy.h -@@ -141,6 +141,7 @@ public: +@@ -137,6 +137,7 @@ public: ~WebProcessProxy(); static void forWebPagesWithOrigin(PAL::SessionID, const WebCore::SecurityOriginData&, const Function&); @@ -15924,10 +15924,10 @@ index a68a9c151b3c2d017bf0d7fd0ab4f6ab3284994e..c1871bda7856aa0f9eb6bb51e8f880fa WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index 0f5aed3739dd3b5163b53bb6d3766de910ce90cf..3280e1c809cbe6b07c9791c748c2d98cbae35ffb 100644 +index 11a34208afcc593ccebbad8f89c8b4f4275a8390..d7987b322e9c47f13e76a283b794f4c533034722 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -2123,6 +2123,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O +@@ -2117,6 +2117,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O networkProcess().renameOriginInWebsiteData(m_sessionID, oldName, newName, dataTypes, WTFMove(completionHandler)); } @@ -15946,7 +15946,7 @@ index 0f5aed3739dd3b5163b53bb6d3766de910ce90cf..3280e1c809cbe6b07c9791c748c2d98c void WebsiteDataStore::hasAppBoundSession(CompletionHandler&& completionHandler) const { diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -index 02df52e30bf8f0ecf06c2be3f79a3de6dacadd61..8a9a8cf4666986896cf510baaa94e7ae2f358ef6 100644 +index 034bca542991557fd760aba2052c867825ae6f5d..f4f0970a53ee55d9634d0838995b73832a139782 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h @@ -92,6 +92,7 @@ enum class CacheModel : uint8_t; @@ -16002,9 +16002,9 @@ index 02df52e30bf8f0ecf06c2be3f79a3de6dacadd61..8a9a8cf4666986896cf510baaa94e7ae + DownloadInstrumentation* downloadInstrumentation() { return m_downloadInstrumentation; }; + void resetQuota(CompletionHandler&&); - void setQuotaLoggingEnabled(bool enabled, CompletionHandler&&); -@@ -422,9 +443,11 @@ private: + #if ENABLE(APP_BOUND_DOMAINS) +@@ -421,9 +442,11 @@ private: WebCore::CurlProxySettings m_proxySettings; #endif @@ -16017,7 +16017,7 @@ index 02df52e30bf8f0ecf06c2be3f79a3de6dacadd61..8a9a8cf4666986896cf510baaa94e7ae WebCore::SoupNetworkProxySettings m_networkProxySettings; #endif -@@ -449,6 +472,11 @@ private: +@@ -448,6 +471,11 @@ private: RefPtr m_cookieStore; RefPtr m_networkProcess; @@ -16597,10 +16597,10 @@ index 0000000000000000000000000000000000000000..d0f9827544994e450e24e3f7a427c35e + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm -index 32844406fa19b9fe366bba6002b70c68288d2dec..f57c76696cbd82e0141cfe7c46c565e721a9ab65 100644 +index b21d8bcf8f32769f6ec813c48447567cff5fec1b..5879fdc16e9755988d8a984b16d0a71a5ef0cae0 100644 --- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm +++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm -@@ -434,6 +434,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect) +@@ -436,6 +436,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect) void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled) { @@ -16989,10 +16989,10 @@ index 56061afc3d03eb1d3ed99a39dacd6ccad36109be..7a148e64432926fce48e13fad5e84766 void getContextMenuItem(const WebContextMenuItemData&, CompletionHandler&&); void getContextMenuFromItems(const Vector&, CompletionHandler&&); diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm -index 49147e0462eceb041fbac20cbd37760462f0465c..34250af29e02d8ab050843daca66e1ee2ab47a7a 100644 +index 58b3a33c29e99b38f0e23445d1ca72bcdc75b749..693aa9ebfd9c1d40685afacd8378c83c490c126a 100644 --- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm +++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm -@@ -362,6 +362,12 @@ void WebContextMenuProxyMac::getShareMenuItem(CompletionHandlerisMainFrame() && resourceLoader.options().mode == FetchOptions::Mode::Navigate; -@@ -406,6 +408,17 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -405,6 +407,17 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL } ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == ClientCredentialPolicy::CannotAskClientForCredentials); @@ -18024,7 +18024,7 @@ index 52d372a5acae7737fc0eff42a132882425a7eb71..b4186d89f5524d9a404b8f15e83f1f73 WEBLOADERSTRATEGY_RELEASE_LOG_IF_ALLOWED("scheduleLoad: Resource is being scheduled with the NetworkProcess (priority=%d)", static_cast(resourceLoader.request().priority())); if (!WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::ScheduleResourceLoad(loadParameters), 0)) { -@@ -417,7 +430,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL +@@ -416,7 +429,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL } auto loader = WebResourceLoader::create(resourceLoader, trackingParameters); @@ -18033,7 +18033,7 @@ index 52d372a5acae7737fc0eff42a132882425a7eb71..b4186d89f5524d9a404b8f15e83f1f73 } void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader) -@@ -815,7 +828,7 @@ void WebLoaderStrategy::didFinishPreconnection(uint64_t preconnectionIdentifier, +@@ -814,7 +827,7 @@ void WebLoaderStrategy::didFinishPreconnection(uint64_t preconnectionIdentifier, bool WebLoaderStrategy::isOnLine() const { @@ -18042,7 +18042,7 @@ index 52d372a5acae7737fc0eff42a132882425a7eb71..b4186d89f5524d9a404b8f15e83f1f73 } void WebLoaderStrategy::addOnlineStateChangeListener(Function&& listener) -@@ -835,6 +848,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet +@@ -834,6 +847,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet void WebLoaderStrategy::setOnLineState(bool isOnLine) { @@ -18054,7 +18054,7 @@ index 52d372a5acae7737fc0eff42a132882425a7eb71..b4186d89f5524d9a404b8f15e83f1f73 if (m_isOnLine == isOnLine) return; -@@ -843,6 +861,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) +@@ -842,6 +860,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine) listener(isOnLine); } @@ -18099,7 +18099,7 @@ index b23d5b8a9f72696f33a1e0b7778ffbf8ec21049c..1a778a275d7b1a3338328abb91ef70f3 } // namespace WebKit diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -index 2e60846451d61a13404ced106126bd40b34fbf21..87bdfd4b91ad74ae65b9200e54ffc5eb68982e4b 100644 +index 192ad8d1516e0d2dbf1e703bc9a776a30d33ebce..5e7dabc36870351ee27fbb46f21ddc6f8c69a8ed 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp @@ -397,6 +397,8 @@ void WebChromeClient::setResizable(bool resizable) @@ -18153,10 +18153,10 @@ index 2eb0886f13ed035a53b8eaa60605de4dfe53fbe3..c46393209cb4f80704bbc9268fad4371 { } diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -index 1a1d61bdb0e3c83767d7b9b94a023d46260b8936..b4534640ef574a24c07d8cf62682b54227480f7a 100644 +index 34cae9ad561b9b7dada7399ca9d144b6df45f0e8..7cf709ae405a1cba0bd794898134ebcce6d0a643 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -@@ -1561,13 +1561,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() +@@ -1563,13 +1563,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() if (webPage->scrollPinningBehavior() != DoNotPin) view->setScrollPinningBehavior(webPage->scrollPinningBehavior()); @@ -18407,7 +18407,7 @@ index 407f4f3fb1fc69a6be366a4a5fb37b3dd4bb2252..ee32e49c7bee97bf4269df1d8e7599ed if (m_lastPageScaleFactor != pageScale) { diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h -index 6727d16c8c0b86c15ff31af038aa9d7588527545..b9b3c242375c7a8849d973298d680acffbbdd024 100644 +index db65f813267df986b7156c38f8d0259bc266a60b..9677ab1cfe53a589e0282f61f25beca3718f2a1e 100644 --- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h +++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h @@ -97,7 +97,11 @@ public: @@ -18570,10 +18570,10 @@ index f127d64d005ab7b93875591b94a5899205e91579..df0de26e4dc449a0fbf93e7037444df4 uint64_t m_navigationID; }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -index 3b9e0e7e7af91e8d6e6d2b124b038bce3150cb3c..6790d9af3b61fc15e601c3b243dcf796f15ed744 100644 +index ad6be396c0c54023d0986d595d2a31bc4ef4e11b..080d3f54bf99fc23155da267f1fac4530a2240b8 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -@@ -867,6 +867,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) +@@ -868,6 +868,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) m_page->setCanUseCredentialStorage(parameters.canUseCredentialStorage); @@ -18583,7 +18583,7 @@ index 3b9e0e7e7af91e8d6e6d2b124b038bce3150cb3c..6790d9af3b61fc15e601c3b243dcf796 updateThrottleState(); } -@@ -1631,6 +1634,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet +@@ -1632,6 +1635,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet } #endif @@ -18606,7 +18606,7 @@ index 3b9e0e7e7af91e8d6e6d2b124b038bce3150cb3c..6790d9af3b61fc15e601c3b243dcf796 void WebPage::loadRequest(LoadParameters&& loadParameters) { setLastNavigationWasAppBound(loadParameters.request.isAppBound()); -@@ -1891,17 +1910,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1892,17 +1911,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -18625,7 +18625,7 @@ index 3b9e0e7e7af91e8d6e6d2b124b038bce3150cb3c..6790d9af3b61fc15e601c3b243dcf796 // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -1918,20 +1933,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1919,20 +1934,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -18653,7 +18653,7 @@ index 3b9e0e7e7af91e8d6e6d2b124b038bce3150cb3c..6790d9af3b61fc15e601c3b243dcf796 #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -1939,7 +1952,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1940,7 +1953,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -18661,7 +18661,7 @@ index 3b9e0e7e7af91e8d6e6d2b124b038bce3150cb3c..6790d9af3b61fc15e601c3b243dcf796 void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2238,6 +2250,7 @@ void WebPage::scaleView(double scale) +@@ -2239,6 +2251,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -18669,7 +18669,7 @@ index 3b9e0e7e7af91e8d6e6d2b124b038bce3150cb3c..6790d9af3b61fc15e601c3b243dcf796 scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2342,17 +2355,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2343,17 +2356,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -18688,7 +18688,7 @@ index 3b9e0e7e7af91e8d6e6d2b124b038bce3150cb3c..6790d9af3b61fc15e601c3b243dcf796 } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3209,6 +3218,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3210,6 +3219,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -18793,7 +18793,7 @@ index 3b9e0e7e7af91e8d6e6d2b124b038bce3150cb3c..6790d9af3b61fc15e601c3b243dcf796 #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3285,6 +3392,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3286,6 +3393,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -18805,7 +18805,7 @@ index 3b9e0e7e7af91e8d6e6d2b124b038bce3150cb3c..6790d9af3b61fc15e601c3b243dcf796 void WebPage::insertNewlineInQuotedContent() { Frame& frame = m_page->focusController().focusedOrMainFrame(); -@@ -3522,6 +3634,7 @@ void WebPage::didCompletePageTransition() +@@ -3523,6 +3635,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -18813,7 +18813,7 @@ index 3b9e0e7e7af91e8d6e6d2b124b038bce3150cb3c..6790d9af3b61fc15e601c3b243dcf796 } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4194,7 +4307,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4203,7 +4316,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -18822,7 +18822,7 @@ index 3b9e0e7e7af91e8d6e6d2b124b038bce3150cb3c..6790d9af3b61fc15e601c3b243dcf796 void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6511,6 +6624,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6525,6 +6638,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = WTF::nullopt; } @@ -18833,7 +18833,7 @@ index 3b9e0e7e7af91e8d6e6d2b124b038bce3150cb3c..6790d9af3b61fc15e601c3b243dcf796 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index 0dd3f2cd9cd0d045705989fb27ec19c875bbed23..29cdaa4e2ee19b7ae25946503f65ec4b6d35b64f 100644 +index 8b69c8330c28c857b125405c31c0116349671e76..33282d8d140f4411484889db09aa87ea0c9ac4a3 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -111,6 +111,10 @@ typedef struct _AtkObject AtkObject; @@ -18847,7 +18847,7 @@ index 0dd3f2cd9cd0d045705989fb27ec19c875bbed23..29cdaa4e2ee19b7ae25946503f65ec4b #if PLATFORM(GTK) || PLATFORM(WPE) #include "InputMethodState.h" #endif -@@ -946,11 +950,11 @@ public: +@@ -947,11 +951,11 @@ public: void clearSelection(); void restoreSelectionInFocusedEditableElement(); @@ -18861,7 +18861,7 @@ index 0dd3f2cd9cd0d045705989fb27ec19c875bbed23..29cdaa4e2ee19b7ae25946503f65ec4b void performDragControllerAction(DragControllerAction, const WebCore::DragData&, SandboxExtension::Handle&&, SandboxExtension::HandleArray&&); #endif -@@ -964,6 +968,9 @@ public: +@@ -965,6 +969,9 @@ public: void didStartDrag(); void dragCancelled(); OptionSet allowedDragSourceActions() const { return m_allowedDragSourceActions; } @@ -18871,7 +18871,7 @@ index 0dd3f2cd9cd0d045705989fb27ec19c875bbed23..29cdaa4e2ee19b7ae25946503f65ec4b #endif void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&); -@@ -1194,6 +1201,7 @@ public: +@@ -1195,6 +1202,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -18879,7 +18879,7 @@ index 0dd3f2cd9cd0d045705989fb27ec19c875bbed23..29cdaa4e2ee19b7ae25946503f65ec4b void insertNewlineInQuotedContent(); -@@ -1524,6 +1532,7 @@ private: +@@ -1525,6 +1533,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -18887,7 +18887,7 @@ index 0dd3f2cd9cd0d045705989fb27ec19c875bbed23..29cdaa4e2ee19b7ae25946503f65ec4b void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1561,6 +1570,7 @@ private: +@@ -1562,6 +1571,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -18895,7 +18895,7 @@ index 0dd3f2cd9cd0d045705989fb27ec19c875bbed23..29cdaa4e2ee19b7ae25946503f65ec4b #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1680,9 +1690,7 @@ private: +@@ -1681,9 +1691,7 @@ private: void countStringMatches(const String&, OptionSet, uint32_t maxMatchCount); void replaceMatches(const Vector& matchIndices, const String& replacementText, bool selectionOnly, CompletionHandler&&); @@ -18905,7 +18905,7 @@ index 0dd3f2cd9cd0d045705989fb27ec19c875bbed23..29cdaa4e2ee19b7ae25946503f65ec4b void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2206,6 +2214,7 @@ private: +@@ -2207,6 +2215,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -19058,7 +19058,7 @@ index fbfc1fd3ece09dc3dfd9300dc1d67f045942053b..08a671959b8483760771a790ad6793eb } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index c818fb22391695d4543aa011292cde798f55d880..245e7eb4f4382a0d4d3c1c27499c8141eb68113a 100644 +index 5fc76ec729f8c21d2be48ae2153df6fe9d0dd753..d97ef7df114997d16b6988fc993f3839d82684e6 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -86,6 +86,7 @@ @@ -19069,7 +19069,7 @@ index c818fb22391695d4543aa011292cde798f55d880..245e7eb4f4382a0d4d3c1c27499c8141 #include #include #include -@@ -324,6 +325,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter +@@ -325,6 +326,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter platformInitializeProcess(parameters); updateCPULimit(); @@ -19160,7 +19160,7 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 45353f0289fe1a746291d1b6ca946ab2a7a1a891..60d5e78917d2bebe765deca00aee51f2723707fd 100644 +index 83f8b1e898a3871e8e55d320c4cf6e0f9717cb91..11659488ae719a22b62a7ef34ff8a7b61bfb3d12 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -5,6 +5,8 @@ WEBKIT_OPTION_BEGIN() @@ -19206,7 +19206,7 @@ index 45353f0289fe1a746291d1b6ca946ab2a7a1a891..60d5e78917d2bebe765deca00aee51f2 # Finalize the value for all options. Do not attempt to use an option before diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake -index 74347db263eed3a74dfd10564920c4692a4fca67..99a8acb05ae53cf6039bdaa3d39284477e57be2f 100644 +index d8c2c251f3ea55fdce895e39c6591924c2e8cf5e..b6cfc648e3d9ef22e62e8a1fb5b957310c2adb30 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -2,6 +2,7 @@ include(GNUInstallDirs) @@ -19801,10 +19801,10 @@ index 775b41868718ea6734efc9082f8161eee2e0015e..68a720c0cb01d534653a259536c48168 list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp -index f735ec582d9af66166b5ac7950b1f62862be5d09..eb3f2f49aebb8b9a13cc555a0e79b8544a29c6b4 100644 +index a1b22f3bc9cf45ff9e1efee319629989ee88b726..027e525dd37c03c6ca6632f93574fad4ad7f6cef 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp -@@ -790,6 +790,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options) +@@ -787,6 +787,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options) 0, // requestStorageAccessConfirm shouldAllowDeviceOrientationAndMotionAccess, runWebAuthenticationPanel,