From 9c7e43a83b56d6588e81f5f3724170443db71c35 Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Fri, 15 May 2020 13:47:23 -0700 Subject: [PATCH] browser(webkit): roll to 05/15/20 (#2260) --- browser_patches/webkit/BUILD_NUMBER | 2 +- browser_patches/webkit/UPSTREAM_CONFIG.sh | 2 +- browser_patches/webkit/patches/bootstrap.diff | 381 ++++++++---------- 3 files changed, 176 insertions(+), 209 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 81c545efebe5f..d729899c33fcf 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1 +1 @@ -1234 +1235 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 576447107cd1f..6bba39184f018 100644 --- a/browser_patches/webkit/UPSTREAM_CONFIG.sh +++ b/browser_patches/webkit/UPSTREAM_CONFIG.sh @@ -1,3 +1,3 @@ REMOTE_URL="https://github.com/webkit/webkit" BASE_BRANCH="master" -BASE_REVISION="eb65ecfa6c3a06bae5f9f4c224fa2797ac01d403" +BASE_REVISION="b9223a7244f1ce1b3f55ad9a0bae31165942e275" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 0108ee6eb1a1c..788c7b2262fd0 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -309,12 +309,12 @@ index 8fcb5a1e55750d325a84824d86c49cfe6fb04268..ed2525df326bfe649793701a112eefa3 { return m_router.hasLocalFrontend() ? Inspector::FrontendChannel::ConnectionType::Local : Inspector::FrontendChannel::ConnectionType::Remote; diff --git a/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.h -index 1eb7abb2fa21d7a8ec0833160f53e5c523ec4317..7709bcc2ec69aab0589ca1b954db1fb241bb583b 100644 +index b929ddffe29c3fb088ab6714087c99302c275214..2670ff3ba9b15afd2bb99993c3240c49b24907f5 100644 --- a/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.h +++ b/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.h @@ -52,15 +52,21 @@ public: - void setPauseOnStart(ErrorString&, bool pauseOnStart) override; - void resume(ErrorString&, const String& targetId) override; + void setPauseOnStart(ErrorString&, bool pauseOnStart) final; + void resume(ErrorString&, const String& targetId) final; void sendMessageToTarget(ErrorString&, const String& targetId, const String& message) final; + void activate(ErrorString&, const String& targetId) override; + void close(ErrorString&, const String& targetId, const bool* runBeforeUnload) override; @@ -1438,10 +1438,10 @@ index deee885b011925087e29348deeb12b1fbdc5664b..e1fa396864bdf87bb0c5c3f79d8db36c Vector buffer; diff --git a/Source/WTF/wtf/DateMath.cpp b/Source/WTF/wtf/DateMath.cpp -index 1999737341553001d5246b8190e9ea11d615a158..540ed892bca8110f8013477da7bd9b459a17e60d 100644 +index af92f674770349cc8e7be9a53b1cee6e7840e781..f0a960db046292a3505d339a333f03098f3d8418 100644 --- a/Source/WTF/wtf/DateMath.cpp +++ b/Source/WTF/wtf/DateMath.cpp -@@ -77,11 +77,16 @@ +@@ -76,9 +76,14 @@ #include #include #include @@ -1449,16 +1449,14 @@ index 1999737341553001d5246b8190e9ea11d615a158..540ed892bca8110f8013477da7bd9b45 #include #include +#include - #include +#include - #include +#include #include +#include #if OS(WINDOWS) #include -@@ -107,6 +112,18 @@ template inline bool startsWithLettersIgnoringASCIICase(const c +@@ -92,6 +97,18 @@ template inline bool startsWithLettersIgnoringASCIICase(const c return equalLettersIgnoringASCIICase(string, lowercaseLetters, length - 1); } @@ -1477,7 +1475,7 @@ index 1999737341553001d5246b8190e9ea11d615a158..540ed892bca8110f8013477da7bd9b45 /* Constants */ const char* const weekdayName[7] = { "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" }; -@@ -333,6 +350,14 @@ static double calculateDSTOffset(time_t localTime, double utcOffset) +@@ -318,6 +335,14 @@ static double calculateDSTOffset(time_t localTime, double utcOffset) // Returns combined offset in millisecond (UTC + DST). LocalTimeOffset calculateLocalTimeOffset(double ms, TimeType inputTimeType) { @@ -1492,7 +1490,7 @@ index 1999737341553001d5246b8190e9ea11d615a158..540ed892bca8110f8013477da7bd9b45 #if HAVE(TM_GMTOFF) double localToUTCTimeOffset = inputTimeType == LocalTime ? calculateUTCOffset() : 0; #else -@@ -1034,4 +1059,65 @@ String makeRFC2822DateString(unsigned dayOfWeek, unsigned day, unsigned month, u +@@ -1019,4 +1044,65 @@ String makeRFC2822DateString(unsigned dayOfWeek, unsigned day, unsigned month, u return stringBuilder.toString(); } @@ -1574,7 +1572,7 @@ index 246ba67c764b629042a7927d24fe89b049d82a0b..68d536878d1f0ba832d1c1d3e36e10b8 WTF_EXPORT_PRIVATE LocalTimeOffset calculateLocalTimeOffset(double utcInMilliseconds, TimeType = UTCTime); diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index f08df873594f78f04903c7edf8dc4b3c67cfc415..ed4edb1b6c8f5129bd58e457529704ef27f63d19 100644 +index fe5164e4a8f5aad58b278b44943d3e328d9a4700..b1cdbe461511e8ac8b3f44721490c04eefe1a65b 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h @@ -403,7 +403,7 @@ @@ -1587,10 +1585,10 @@ index f08df873594f78f04903c7edf8dc4b3c67cfc415..ed4edb1b6c8f5129bd58e457529704ef #if OS(WINDOWS) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 9783851c7a014e6a962a2dbfb524677763a7980b..42a3981710f87123c121938a4de2f2bfde85905c 100644 +index 48ab5e978a71768fcb5712e5583c36838aa2b465..7e59b62fca1939e9ed04ae72da2c5cd7e888d862 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h -@@ -355,7 +355,7 @@ +@@ -347,7 +347,7 @@ #define HAVE_NSHTTPCOOKIESTORAGE__INITWITHIDENTIFIER_WITH_INACCURATE_NULLABILITY 1 #endif @@ -1615,7 +1613,7 @@ index 6d5be9a591a272cd67d6e9d097b30505bdf8ae5e..8f67ba28c380e844c8e4191ee7044665 } diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt -index 51d46a8fcb19cd2d801e1e00086924bd9388ffd7..8148f0f7a8663d7c2635e38aa08170649e437c4a 100644 +index cd7b65d4970ee5643279e227f0812b0ee1eb92c7..f2339abdb5739e0db57697973d8234fa1e8332d2 100644 --- a/Source/WebCore/Sources.txt +++ b/Source/WebCore/Sources.txt @@ -1424,6 +1424,7 @@ inspector/agents/InspectorLayerTreeAgent.cpp @@ -1627,7 +1625,7 @@ index 51d46a8fcb19cd2d801e1e00086924bd9388ffd7..8148f0f7a8663d7c2635e38aa0817064 inspector/agents/InspectorWorkerAgent.cpp inspector/agents/WebConsoleAgent.cpp diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index 71bab3866a179a695c769252584f77c2bcb64606..f2d3d3eababdde1635a649d0fc8a3a7b51fad191 100644 +index dbf7f63893e328b4c4df1c745c12f99c9e403d92..062e726892344e134c7fd1f144af24fce6134640 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt @@ -659,7 +659,7 @@ WHLSLStandardLibraryFunctionMap.cpp @@ -1652,7 +1650,7 @@ index 34f1a72596fb89c8b647fff3348cca3d959c014c..ab6e42c4da2a8a77f66ce532a3a12bb9 __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 4d3179921836de9a911a3698520c8a7070af412d..8c94551b7a6529f5ab29430b34756de6754461ee 100644 +index d7590a4fbf0fb3d612e74353931fc93a8e778d2f..ca2c05b18317c196caa88f1f51fdac9ded5e6d6d 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj @@ -5038,6 +5038,14 @@ @@ -1670,7 +1668,7 @@ index 4d3179921836de9a911a3698520c8a7070af412d..8c94551b7a6529f5ab29430b34756de6 F12171F516A8CED2000053CA /* WebVTTElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F12171F316A8BC63000053CA /* WebVTTElement.cpp */; }; F12171F616A8CF0B000053CA /* WebVTTElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F12171F416A8BC63000053CA /* WebVTTElement.h */; }; F32BDCD92363AACA0073B6AE /* UserGestureEmulationScope.h in Headers */ = {isa = PBXBuildFile; fileRef = F32BDCD72363AACA0073B6AE /* UserGestureEmulationScope.h */; }; -@@ -15694,6 +15702,14 @@ +@@ -15697,6 +15705,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 = ""; }; @@ -1685,7 +1683,7 @@ index 4d3179921836de9a911a3698520c8a7070af412d..8c94551b7a6529f5ab29430b34756de6 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 = ""; }; -@@ -20982,7 +20998,12 @@ +@@ -20983,7 +20999,12 @@ 2D2E34A921A4E191004598B5 /* EditableImageReference.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -1698,7 +1696,7 @@ index 4d3179921836de9a911a3698520c8a7070af412d..8c94551b7a6529f5ab29430b34756de6 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -26256,7 +26277,9 @@ +@@ -26262,7 +26283,9 @@ B2C3D9EC0D006C1D00EF6F26 /* text */, E1EE8B6B2412B2A700E794D6 /* xr */, DFDB912CF8E88A6DA1AD264F /* AbortableTaskQueue.h */, @@ -1708,7 +1706,7 @@ index 4d3179921836de9a911a3698520c8a7070af412d..8c94551b7a6529f5ab29430b34756de6 49AE2D95134EE5F90072920A /* CalculationValue.h */, C330A22113EC196B0000B45B /* ColorChooser.h */, C37CDEBC149EF2030042090D /* ColorChooserClient.h */, -@@ -28616,6 +28639,7 @@ +@@ -28622,6 +28645,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -1716,7 +1714,7 @@ index 4d3179921836de9a911a3698520c8a7070af412d..8c94551b7a6529f5ab29430b34756de6 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 6BDB5DC5227CA0EB00919770 /* DocumentStorageAccess.idl */, -@@ -29500,6 +29524,7 @@ +@@ -29506,6 +29530,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -1724,7 +1722,7 @@ index 4d3179921836de9a911a3698520c8a7070af412d..8c94551b7a6529f5ab29430b34756de6 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -31368,6 +31393,7 @@ +@@ -31374,6 +31399,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -1732,7 +1730,7 @@ index 4d3179921836de9a911a3698520c8a7070af412d..8c94551b7a6529f5ab29430b34756de6 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -33290,9 +33316,11 @@ +@@ -33296,9 +33322,11 @@ A7DBF8DE1276919C006B6008 /* TextCheckingHelper.h in Headers */, B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */, 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */, @@ -1744,7 +1742,7 @@ index 4d3179921836de9a911a3698520c8a7070af412d..8c94551b7a6529f5ab29430b34756de6 B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */, 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */, -@@ -34192,6 +34220,7 @@ +@@ -34198,6 +34226,7 @@ CDDE02ED18B3ED6D00CF7FF1 /* CDMSessionAVFoundationObjC.mm in Sources */, CDDE02F018B5651300CF7FF1 /* CDMSessionAVStreamSession.mm in Sources */, CDE5959D1BF2757100A1CBE8 /* CDMSessionMediaSourceAVFObjC.mm in Sources */, @@ -1752,7 +1750,7 @@ index 4d3179921836de9a911a3698520c8a7070af412d..8c94551b7a6529f5ab29430b34756de6 A14090FB1AA51E1D0091191A /* ContentFilterUnblockHandlerCocoa.mm in Sources */, 07AFF4231EFB144900B545B3 /* CoreAudioCaptureSourceIOS.mm in Sources */, 46C696CC1E7205FC00597937 /* CPUMonitor.cpp in Sources */, -@@ -34265,6 +34294,7 @@ +@@ -34271,6 +34300,7 @@ 51058ADF1D67C229009A538C /* MockGamepad.cpp in Sources */, 51058AE11D67C229009A538C /* MockGamepadProvider.cpp in Sources */, CDF2B0121820540600F2B424 /* MockMediaPlayerMediaSource.cpp in Sources */, @@ -1760,7 +1758,7 @@ index 4d3179921836de9a911a3698520c8a7070af412d..8c94551b7a6529f5ab29430b34756de6 CDF2B0141820540600F2B424 /* MockMediaSourcePrivate.cpp in Sources */, CDF2B0161820540700F2B424 /* MockSourceBufferPrivate.cpp in Sources */, 2D9BF7421DBFDC27007A7D99 /* NavigatorEME.cpp in Sources */, -@@ -34354,6 +34384,7 @@ +@@ -34360,6 +34390,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -1768,7 +1766,7 @@ index 4d3179921836de9a911a3698520c8a7070af412d..8c94551b7a6529f5ab29430b34756de6 DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -34886,6 +34917,7 @@ +@@ -34892,6 +34923,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -1777,7 +1775,7 @@ index 4d3179921836de9a911a3698520c8a7070af412d..8c94551b7a6529f5ab29430b34756de6 2D8B92F5203D13E1009C868F /* UnifiedSource520.cpp in Sources */, 2D8B92F6203D13E1009C868F /* UnifiedSource521.cpp in Sources */, diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp -index 1f7a76607854489dc8725e0a5b8d3fddaa6323da..4fcdc796f57c5837ea637132304a6e7a6424edcd 100644 +index 3f800102457083c873d9bf81592bbb085cb70460..387c77e51b8268d39757608faa6f3f1f98ddd442 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -58,6 +58,7 @@ @@ -1788,7 +1786,7 @@ index 1f7a76607854489dc8725e0a5b8d3fddaa6323da..4fcdc796f57c5837ea637132304a6e7a #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3255,10 +3256,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -3250,10 +3251,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (useParentData ? m_isIgnoredFromParentData.isPresentationalChildOfAriaRole : isPresentationalChildOfAriaRole()) return AccessibilityObjectInclusion::IgnoreObject; @@ -1880,7 +1878,7 @@ index 3e2f9beaf00d25860436b7b608bfe9fb23195bae..e1a18032645fc9f9803ee891a4193030 return; diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp -index f6784b88e479fdd184f0a1496c5e34d3714a1683..0687486f07a45b951054e55603f9b6daf819d822 100644 +index b5b22cb2863ebc6fdd825e5d3fdec34598703826..b2d45001e08173178f9aa8e7c39496157863d376 100644 --- a/Source/WebCore/inspector/InspectorController.cpp +++ b/Source/WebCore/inspector/InspectorController.cpp @@ -84,6 +84,9 @@ @@ -1903,7 +1901,7 @@ index f6784b88e479fdd184f0a1496c5e34d3714a1683..0687486f07a45b951054e55603f9b6da m_agents.append(makeUnique(pageContext)); m_agents.append(makeUnique(pageContext)); -@@ -366,8 +372,8 @@ void InspectorController::inspect(Node* node) +@@ -371,8 +377,8 @@ void InspectorController::inspect(Node* node) if (!enabled()) return; @@ -1914,7 +1912,7 @@ index f6784b88e479fdd184f0a1496c5e34d3714a1683..0687486f07a45b951054e55603f9b6da ensureDOMAgent().inspect(node); } -@@ -500,6 +506,13 @@ JSC::VM& InspectorController::vm() +@@ -505,6 +511,13 @@ JSC::VM& InspectorController::vm() return commonVM(); } @@ -1928,7 +1926,7 @@ index f6784b88e479fdd184f0a1496c5e34d3714a1683..0687486f07a45b951054e55603f9b6da void InspectorController::willComposite(Frame& frame) { InspectorInstrumentation::willComposite(frame); -@@ -510,4 +523,24 @@ void InspectorController::didComposite(Frame& frame) +@@ -515,4 +528,24 @@ void InspectorController::didComposite(Frame& frame) InspectorInstrumentation::didComposite(frame); } @@ -1954,10 +1952,10 @@ index f6784b88e479fdd184f0a1496c5e34d3714a1683..0687486f07a45b951054e55603f9b6da + } // namespace WebCore diff --git a/Source/WebCore/inspector/InspectorController.h b/Source/WebCore/inspector/InspectorController.h -index 3fae9951d703f83d0de805a71dfe0f7260feac58..b128a43568db28c399b7c86bc4f32ed541859689 100644 +index d2f18172df139dd68cf94b715e847da18a8a5845..378faa8166d57167344fbd224bcf25829a1a54ed 100644 --- a/Source/WebCore/inspector/InspectorController.h +++ b/Source/WebCore/inspector/InspectorController.h -@@ -97,9 +97,16 @@ public: +@@ -98,9 +98,16 @@ public: WEBCORE_EXPORT void setIndicating(bool); @@ -1974,7 +1972,7 @@ index 3fae9951d703f83d0de805a71dfe0f7260feac58..b128a43568db28c399b7c86bc4f32ed5 bool isUnderTest() const { return m_isUnderTest; } void setIsUnderTest(bool isUnderTest) { m_isUnderTest = isUnderTest; } WEBCORE_EXPORT void evaluateForTestInFrontend(const String& script); -@@ -149,6 +156,7 @@ private: +@@ -150,6 +157,7 @@ private: bool m_isAutomaticInspection { false }; bool m_pauseAfterInitialization = { false }; bool m_didCreateLazyAgents { false }; @@ -2888,7 +2886,7 @@ index ddbb5d5347f3beabe3cfab201d6838c896d21e39..25f1798cad5a4ef135a27d3bd5146798 class Page; class SecurityOrigin; diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp -index 4bdee3001fdb4fec0eee35f57c992a962d2658cf..323e7b0158ee6931ba99c1383fc878badddd2cb6 100644 +index afcdd2a7faffe0bec982072d894bc85c6e30c44c..6d9e9d4f220a0cff557fb3b020bf29d8c2964d04 100644 --- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp @@ -44,6 +44,7 @@ @@ -3164,7 +3162,7 @@ index 4bdee3001fdb4fec0eee35f57c992a962d2658cf..323e7b0158ee6931ba99c1383fc878ba { m_resourcesData->clear(loaderIdentifier(&loader)); diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.h b/Source/WebCore/inspector/agents/InspectorNetworkAgent.h -index b038a1879c043aa17dae97425693f29be42e3258..d60716b837663004675ffd90bceede4c3a6e98c6 100644 +index bfd131e9b5856c84da7724805e71397b7c7486a9..724353b696bfc01c7f0aaf4a04a36dd22967b2f7 100644 --- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.h +++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.h @@ -87,11 +87,13 @@ public: @@ -4676,7 +4674,7 @@ index b94ed78ad3dbea19543c1fd54653f0481e52fb7c..6341c7ff7ef53577f33c19ecad1b8bfb private: diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp -index 9d703fd8a4e7be94fb8b562e5b8ecb496b615974..83c16a19e037ddb8bf39c0f0abe3ff4f094b7161 100644 +index 77790ce512c13a0a0043d540898071fbc27d94b4..c51586fd2e656e636b81dc6a08b65b060ffc07ee 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp @@ -1295,8 +1295,6 @@ void DocumentLoader::detachFromFrame() @@ -4689,10 +4687,10 @@ index 9d703fd8a4e7be94fb8b562e5b8ecb496b615974..83c16a19e037ddb8bf39c0f0abe3ff4f } diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h -index 410341ef0679b23fb2adfff2ab196dfa7f6214af..1bfa55f810653a023156364c25a04c10d8afb350 100644 +index 048c1d5d1d5df6b3bcaaa60b65d93ba8376a7364..0d4f613c99d37a6654a323effcd8130c819bc9e8 100644 --- a/Source/WebCore/loader/DocumentLoader.h +++ b/Source/WebCore/loader/DocumentLoader.h -@@ -163,9 +163,13 @@ public: +@@ -170,9 +170,13 @@ public: WEBCORE_EXPORT virtual void detachFromFrame(); @@ -4864,10 +4862,10 @@ 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 1f694d158ac8cee6f07a94ff23314f018493d99b..49dd56543ad7ccfe4d82e07793f186b8fddcef65 100644 +index eb092b81a64f28050bdb6b85d0289849b719e2c6..2d383e1a7540e5512b14df45dfab9f30d474f2cf 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h -@@ -275,7 +275,7 @@ public: +@@ -277,7 +277,7 @@ public: #endif #if ENABLE(ORIENTATION_EVENTS) @@ -4877,10 +4875,10 @@ index 1f694d158ac8cee6f07a94ff23314f018493d99b..49dd56543ad7ccfe4d82e07793f186b8 #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index a548f3c76ed7084943eba34fec632fc6e831fc1b..1c7a97a1702686220d8dd904a93ed1185066c879 100644 +index 2cdee17f7b094674a88d62b4d146449c0ce1b52b..7ad4440e38ce4d28bc3e887999ddcea2c57ae96e 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp -@@ -818,9 +818,7 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve +@@ -837,9 +837,7 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve m_mousePressNode = event.targetNode(); m_frame.document()->setFocusNavigationStartingNode(event.targetNode()); @@ -4890,7 +4888,7 @@ index a548f3c76ed7084943eba34fec632fc6e831fc1b..1c7a97a1702686220d8dd904a93ed118 m_mousePressed = true; m_selectionInitiationState = HaveNotStartedSelection; -@@ -859,8 +857,6 @@ VisiblePosition EventHandler::selectionExtentRespectingEditingBoundary(const Vis +@@ -878,8 +876,6 @@ VisiblePosition EventHandler::selectionExtentRespectingEditingBoundary(const Vis return targetNode->renderer()->positionForPoint(LayoutPoint(selectionEndPoint), nullptr); } @@ -4899,7 +4897,7 @@ index a548f3c76ed7084943eba34fec632fc6e831fc1b..1c7a97a1702686220d8dd904a93ed118 #if !PLATFORM(IOS_FAMILY) bool EventHandler::supportsSelectionUpdatesOnMouseDrag() const -@@ -882,8 +878,10 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -901,8 +897,10 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e Ref protectedFrame(m_frame); @@ -4910,7 +4908,7 @@ index a548f3c76ed7084943eba34fec632fc6e831fc1b..1c7a97a1702686220d8dd904a93ed118 Node* targetNode = event.targetNode(); if (event.event().button() != LeftButton || !targetNode) -@@ -904,7 +902,9 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -923,7 +921,9 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e ASSERT(m_mouseDownMayStartSelect || m_mouseDownMayStartAutoscroll); #endif @@ -4920,7 +4918,7 @@ index a548f3c76ed7084943eba34fec632fc6e831fc1b..1c7a97a1702686220d8dd904a93ed118 if (m_mouseDownMayStartAutoscroll && !panScrollInProgress()) { m_autoscrollController->startAutoscrollForSelection(renderer); -@@ -921,6 +921,8 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -940,6 +940,8 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e return true; } @@ -4929,7 +4927,7 @@ index a548f3c76ed7084943eba34fec632fc6e831fc1b..1c7a97a1702686220d8dd904a93ed118 bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const { // This is a pre-flight check of whether the event might lead to a drag being started. Be careful -@@ -952,6 +954,8 @@ bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const +@@ -971,6 +973,8 @@ bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const return targetElement && page->dragController().draggableElement(&m_frame, targetElement, result.roundedPointInInnerNodeFrame(), state); } @@ -4938,7 +4936,7 @@ index a548f3c76ed7084943eba34fec632fc6e831fc1b..1c7a97a1702686220d8dd904a93ed118 void EventHandler::updateSelectionForMouseDrag() { if (!supportsSelectionUpdatesOnMouseDrag()) -@@ -1043,7 +1047,6 @@ void EventHandler::updateSelectionForMouseDrag(const HitTestResult& hitTestResul +@@ -1062,7 +1066,6 @@ void EventHandler::updateSelectionForMouseDrag(const HitTestResult& hitTestResul m_frame.selection().setSelectionByMouseIfDifferent(newSelection, m_frame.selection().granularity(), FrameSelection::EndPointsAdjustmentMode::AdjustAtBidiBoundary); } @@ -4946,7 +4944,7 @@ index a548f3c76ed7084943eba34fec632fc6e831fc1b..1c7a97a1702686220d8dd904a93ed118 void EventHandler::lostMouseCapture() { -@@ -1091,9 +1094,7 @@ bool EventHandler::handleMouseReleaseEvent(const MouseEventWithHitTestResults& e +@@ -1110,9 +1113,7 @@ bool EventHandler::handleMouseReleaseEvent(const MouseEventWithHitTestResults& e // on the selection, the selection goes away. However, if we are // editing, place the caret. if (m_mouseDownWasSingleClickInSelection && m_selectionInitiationState != ExtendedSelection @@ -4956,7 +4954,7 @@ index a548f3c76ed7084943eba34fec632fc6e831fc1b..1c7a97a1702686220d8dd904a93ed118 && m_frame.selection().isRange() && event.event().button() != RightButton) { VisibleSelection newSelection; -@@ -2058,10 +2059,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE +@@ -2073,10 +2074,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE swallowEvent = !dispatchMouseEvent(eventNames().mousemoveEvent, mouseEvent.targetNode(), 0, platformMouseEvent, FireMouseOverOut::Yes); @@ -4968,7 +4966,7 @@ index a548f3c76ed7084943eba34fec632fc6e831fc1b..1c7a97a1702686220d8dd904a93ed118 return swallowEvent; } diff --git a/Source/WebCore/page/EventHandler.h b/Source/WebCore/page/EventHandler.h -index 7b4f27897381b05b10c8fd112cc6604247f5b88a..1b4326f2b1905bb93bf3a610c7c1363e286d7ba9 100644 +index 6ffc83c012ffe095046414051161d7506af192a1..8b5095998153f0c3a5762022459dbd09c21b7dda 100644 --- a/Source/WebCore/page/EventHandler.h +++ b/Source/WebCore/page/EventHandler.h @@ -132,9 +132,7 @@ public: @@ -4981,7 +4979,7 @@ index 7b4f27897381b05b10c8fd112cc6604247f5b88a..1b4326f2b1905bb93bf3a610c7c1363e #if ENABLE(PAN_SCROLLING) void didPanScrollStart(); -@@ -363,10 +361,8 @@ private: +@@ -364,10 +362,8 @@ private: bool handleMousePressEventDoubleClick(const MouseEventWithHitTestResults&); bool handleMousePressEventTripleClick(const MouseEventWithHitTestResults&); @@ -4992,7 +4990,7 @@ index 7b4f27897381b05b10c8fd112cc6604247f5b88a..1b4326f2b1905bb93bf3a610c7c1363e WEBCORE_EXPORT bool handleMouseReleaseEvent(const MouseEventWithHitTestResults&); -@@ -463,10 +459,8 @@ private: +@@ -464,10 +460,8 @@ private: void defaultTabEventHandler(KeyboardEvent&); void defaultArrowEventHandler(FocusDirection, KeyboardEvent&); @@ -5003,7 +5001,7 @@ index 7b4f27897381b05b10c8fd112cc6604247f5b88a..1b4326f2b1905bb93bf3a610c7c1363e // The following are called at the beginning of handleMouseUp and handleDrag. // If they return true it indicates that they have consumed the event. -@@ -474,9 +468,10 @@ private: +@@ -475,9 +469,10 @@ private: #if ENABLE(DRAG_SUPPORT) bool eventLoopHandleMouseDragged(const MouseEventWithHitTestResults&); @@ -5015,7 +5013,7 @@ index 7b4f27897381b05b10c8fd112cc6604247f5b88a..1b4326f2b1905bb93bf3a610c7c1363e enum class SetOrClearLastScrollbar { Clear, Set }; void updateLastScrollbarUnderMouse(Scrollbar*, SetOrClearLastScrollbar); -@@ -527,10 +522,7 @@ private: +@@ -528,10 +523,7 @@ private: enum SelectionInitiationState { HaveNotStartedSelection, PlacedCaret, ExtendedSelection }; SelectionInitiationState m_selectionInitiationState { HaveNotStartedSelection }; @@ -5024,10 +5022,10 @@ index 7b4f27897381b05b10c8fd112cc6604247f5b88a..1b4326f2b1905bb93bf3a610c7c1363e -#endif - Timer m_hoverTimer; - Timer m_cursorUpdateTimer; + bool m_hasScheduledCursorUpdate { false }; diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp -index 76066f52a8a21870b65797c48f53899bd2c3b1fc..613b84a3cb0329b2e8e7174b684686165fbbc014 100644 +index 540f456ee82199bbff71e6688bc0e81fa525dda9..a8bc604ba4a04e180af0605cfe246958d8329026 100644 --- a/Source/WebCore/page/Frame.cpp +++ b/Source/WebCore/page/Frame.cpp @@ -182,6 +182,7 @@ Frame::Frame(Page& page, HTMLFrameOwnerElement* ownerElement, UniqueRef& backgroundColor) { @@ -5102,10 +5100,10 @@ index 38fd7b29b53eab484e30963b51c8ae525c5d7a38..37b2a2b8baeba64a50f12c773f2a1072 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 06818c8256a7a4d69056c9310c1c1d4fff65d7bd..e9bc28e52a85a5cf60f60e678fac8a001c6ba7cc 100644 +index 07beb4e66e280c2adad8a020ff07e81aba438dfd..711aba5dbfa4477ca462e11b06c6ac92757888a1 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp -@@ -89,6 +89,7 @@ +@@ -90,6 +90,7 @@ #include "PerformanceLoggingClient.h" #include "PerformanceMonitor.h" #include "PlatformMediaSessionManager.h" @@ -5113,7 +5111,7 @@ index 06818c8256a7a4d69056c9310c1c1d4fff65d7bd..e9bc28e52a85a5cf60f60e678fac8a00 #include "PlatformStrategies.h" #include "PlugInClient.h" #include "PluginData.h" -@@ -427,6 +428,37 @@ void Page::setOverrideViewportArguments(const Optional& viewp +@@ -428,6 +429,37 @@ void Page::setOverrideViewportArguments(const Optional& viewp document->updateViewportArguments(); } @@ -5152,7 +5150,7 @@ index 06818c8256a7a4d69056c9310c1c1d4fff65d7bd..e9bc28e52a85a5cf60f60e678fac8a00 { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index 81d26a581e1d0ef12abe1db2d362edebcffc17d1..fa9890ff94ba61bf1e7eadf69c5ef14fe4217a31 100644 +index eb92e7402cefea3736f13939ad90611c027741a4..c9f18164ed3bd64dcfb4f5c23b70865142f04d8d 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h @@ -194,6 +194,9 @@ public: @@ -5165,7 +5163,7 @@ index 81d26a581e1d0ef12abe1db2d362edebcffc17d1..fa9890ff94ba61bf1e7eadf69c5ef14f static void refreshPlugins(bool reload); WEBCORE_EXPORT PluginData& pluginData(); void clearPluginData(); -@@ -738,6 +741,11 @@ public: +@@ -740,6 +743,11 @@ public: WEBCORE_EXPORT Vector> editableElementsInRect(const FloatRect&) const; @@ -6234,10 +6232,10 @@ index d1fa427d82884fc43569d1bf0df7d728921502fc..30450ab01cddfcd406e46ac8e08ac50a } diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 61f10cc81264e24a6f76e5194119fd567f37f9f9..6b567d0c641a515544815c83574e7f171c55f8d6 100644 +index 906612866d67bd4f2e23407038b948f1438762b2..c0b52ce5f70222ebd7cb9a66e7221578e00210ec 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -@@ -655,7 +655,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se +@@ -656,7 +656,7 @@ static inline void processServerTrustEvaluation(NetworkSessionCocoa& session, Se NegotiatedLegacyTLS negotiatedLegacyTLS = NegotiatedLegacyTLS::No; if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { @@ -6544,10 +6542,10 @@ index 35fdfbb3097a8174ecc536b181d92c7cd9149581..a98424581b326c780375968b0db5e008 NSEvent* nativeEvent() const { return m_nativeEvent.get(); } #elif PLATFORM(GTK) diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -index a6bf8bc1d21b0aa978cf7a3f49bf9066f92a6b11..b644f3bce73226660412da1aed2d527d1de06aea 100644 +index 9d32dbad703e70428775dc99a069d8e5de5060f5..fe8b25b0acbc3c2efa0f4812018c08f2f2bd420b 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -@@ -1494,6 +1494,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature +@@ -1495,6 +1495,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature encoder << windowFeatures.resizable; encoder << windowFeatures.fullscreen; encoder << windowFeatures.dialog; @@ -6557,7 +6555,7 @@ index a6bf8bc1d21b0aa978cf7a3f49bf9066f92a6b11..b644f3bce73226660412da1aed2d527d } bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& windowFeatures) -@@ -1522,6 +1525,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win +@@ -1523,6 +1526,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win return false; if (!decoder.decode(windowFeatures.dialog)) return false; @@ -6876,10 +6874,10 @@ index 89434b54cde8a18a87c755238fffb0c0c2a372c8..bf86020632afb1dbffd812352f8bda4e UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 9567ae9d8b7f8790dddec8bd607b677fa449c235..8c58211063692f0d9b07659a642e518d8a05a91a 100644 +index b72ac530c1d19d4803dd548186a4fbfbff899dd0..298205de7664a1c3cd4d330d7154999d49f87f06 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -248,6 +248,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm +@@ -249,6 +249,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -6887,7 +6885,7 @@ index 9567ae9d8b7f8790dddec8bd607b677fa449c235..8c58211063692f0d9b07659a642e518d UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -408,6 +409,7 @@ UIProcess/Inspector/Cocoa/InspectorDelegate.mm +@@ -409,6 +410,7 @@ UIProcess/Inspector/Cocoa/InspectorDelegate.mm UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm @@ -6896,7 +6894,7 @@ index 9567ae9d8b7f8790dddec8bd607b677fa449c235..8c58211063692f0d9b07659a642e518d UIProcess/Inspector/mac/WebInspectorProxyMac.mm UIProcess/Inspector/mac/WKInspectorViewController.mm diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt -index 3fbcb41484500aade971edf8a6f4b2e6cfa400ee..e552ab479f52dc0edcc83a9cd236e8728ce590ed 100644 +index 76f1e08ca934a654edc48e199ce3eb120604c28c..4c2d98de146282d0be953bb2c1ddee856f4c60b7 100644 --- a/Source/WebKit/SourcesGTK.txt +++ b/Source/WebKit/SourcesGTK.txt @@ -136,6 +136,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify @@ -6907,7 +6905,7 @@ index 3fbcb41484500aade971edf8a6f4b2e6cfa400ee..e552ab479f52dc0edcc83a9cd236e872 UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify UIProcess/API/glib/WebKitCookieManager.cpp @no-unify UIProcess/API/glib/WebKitCredential.cpp @no-unify -@@ -243,6 +244,7 @@ UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp +@@ -247,6 +248,7 @@ UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp UIProcess/cairo/BackingStoreCairo.cpp @no-unify @@ -6915,15 +6913,15 @@ index 3fbcb41484500aade971edf8a6f4b2e6cfa400ee..e552ab479f52dc0edcc83a9cd236e872 UIProcess/glib/WebProcessPoolGLib.cpp UIProcess/glib/WebProcessProxyGLib.cpp UIProcess/glib/WebsiteDataStoreGLib.cpp @no-unify -@@ -256,6 +258,7 @@ UIProcess/gtk/AcceleratedBackingStoreX11.cpp @no-unify - UIProcess/gtk/DragAndDropHandler.cpp +@@ -262,6 +264,7 @@ UIProcess/gtk/ClipboardGtk3.cpp @no-unify + UIProcess/gtk/ClipboardGtk4.cpp @no-unify UIProcess/gtk/GestureController.cpp UIProcess/gtk/HardwareAccelerationManager.cpp +UIProcess/gtk/InspectorTargetProxyGtk.cpp UIProcess/gtk/KeyBindingTranslator.cpp UIProcess/gtk/PointerLockManager.cpp @no-unify UIProcess/gtk/PointerLockManagerWayland.cpp @no-unify -@@ -266,6 +269,8 @@ UIProcess/gtk/WaylandCompositor.cpp @no-unify +@@ -272,6 +275,8 @@ UIProcess/gtk/WaylandCompositor.cpp @no-unify UIProcess/gtk/WebColorPickerGtk.cpp UIProcess/gtk/WebContextMenuProxyGtk.cpp UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp @@ -7087,7 +7085,7 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..1f707641766b51e3bddcdde0c49ee8cf } #endif diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp -index b68e646c78dab787538efe6bfe3143b3da7cdec4..0b9cde145a1b11986d494aaf4b36dce581bee083 100644 +index ba2feecd2885acc45dd153ff502d49f7650f2c6d..9c4bb27242bfa23a91122d899200a1f1ce151fdb 100644 --- a/Source/WebKit/UIProcess/API/C/WKPage.cpp +++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp @@ -1689,6 +1689,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient @@ -7702,7 +7700,7 @@ index 7222a91cb95a5e370f9229ee6425e412b5f8b078..c4031ba28fc89c771c0a64ee787fd245 /** * WebKitWebContext:use-system-appearance-for-scrollbars: diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp -index 8c54b423ff9266b8307385dd13c3f44924fc2e45..b0a141f2f26cb43af78efeafbe4d12e1883b7919 100644 +index e67e9b580ffbaed8f36a76325f23b018497fbf0d..70be44e3f1fb43e7c45d29232119edf74d9c7e27 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp @@ -130,6 +130,7 @@ enum { @@ -7729,12 +7727,15 @@ index 8c54b423ff9266b8307385dd13c3f44924fc2e45..b0a141f2f26cb43af78efeafbe4d12e1 /** * WebKitWebView::decide-policy: * @web_view: the #WebKitWebView on which the signal is emitted -@@ -2416,6 +2426,20 @@ void webkitWebViewRunJavaScriptBeforeUnloadConfirm(WebKitWebView* webView, const +@@ -2416,6 +2426,23 @@ void webkitWebViewRunJavaScriptBeforeUnloadConfirm(WebKitWebView* webView, const webkit_script_dialog_unref(webView->priv->currentScriptDialog); } +void webkitWebViewHandleJavaScriptDialog(WebKitWebView* webView, bool accept, const String& value) { + auto* dialog = webView->priv->currentScriptDialog; ++#if PLATFORM(WPE) ++ dialog->isUserHandled = false; ++#endif + webkit_script_dialog_ref(dialog); + if (!value.isNull()) + webkitWebViewSetCurrentScriptDialogUserInput(webView, value); @@ -7763,7 +7764,7 @@ index 5ab7574c9378f52db87ce75157627c04e9b2e962..5322d725238f5989c04b045615a2de81 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 68fda1702ccee46ff7f48860c1aec9d19dc6e80d..871561a3586b83b503d159a4142be561d9a32091 100644 +index aab0f7ed0ad0cd00b1769a2f5b1b21ba8cc86978..22ba2103f6b93561039a67719ac4881b4d4d421b 100644 --- a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp +++ b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp @@ -241,6 +241,8 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool @@ -7957,40 +7958,6 @@ index 0000000000000000000000000000000000000000..6dffa4fa10a9a64f778a0a77c760c2e7 +G_END_DECLS + +#endif -diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitScriptDialogWPE.cpp b/Source/WebKit/UIProcess/API/wpe/WebKitScriptDialogWPE.cpp -index 3ad6e613657557045ec07ce4bcdb3eea0d1e7dae..a53a4aa01bd692ba34bacb9f663c335cfd3821a7 100644 ---- a/Source/WebKit/UIProcess/API/wpe/WebKitScriptDialogWPE.cpp -+++ b/Source/WebKit/UIProcess/API/wpe/WebKitScriptDialogWPE.cpp -@@ -22,14 +22,26 @@ - - #include "WebKitScriptDialogPrivate.h" - --void webkitScriptDialogAccept(WebKitScriptDialog*) -+void webkitScriptDialogAccept(WebKitScriptDialog* dialog) - { -+ if (!dialog->completionHandler) -+ return; -+ auto completionHandler = std::exchange(dialog->completionHandler, nullptr); -+ completionHandler(true, String()); - } - --void webkitScriptDialogDismiss(WebKitScriptDialog*) -+void webkitScriptDialogDismiss(WebKitScriptDialog* dialog) - { -+ if (!dialog->completionHandler) -+ return; -+ auto completionHandler = std::exchange(dialog->completionHandler, nullptr); -+ completionHandler(false, String()); - } - --void webkitScriptDialogSetUserInput(WebKitScriptDialog*, const String&) -+void webkitScriptDialogSetUserInput(WebKitScriptDialog* dialog, const String& value) - { -+ if (!dialog->completionHandler) -+ return; -+ auto completionHandler = std::exchange(dialog->completionHandler, nullptr); -+ completionHandler(true, value); - } diff --git a/Source/WebKit/UIProcess/API/wpe/webkit.h b/Source/WebKit/UIProcess/API/wpe/webkit.h index 02e258253e47fbf6594c20f743d0faeac8a4eefe..e051fdf396dc65717def6b36168b5538e3cb2f4d 100644 --- a/Source/WebKit/UIProcess/API/wpe/webkit.h @@ -8569,10 +8536,10 @@ index 39bdcacbca56ab9969da677d6def85e9cd1424d3..e5571ee1e30f1d0c60d60af52640aaf6 { auto delegate = m_uiDelegate.m_delegate.get(); diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index df441776b08e5765bb1cfadb1323b8ea8c1a8fe1..9e4a0baf63dfe52d58085a3fe9b1833aaac05afd 100644 +index 3060a62f2eee2c87da4f7050c176a58e4a3b237f..1e9aff10ae6dfe7e74b36b5b336b75e8195e94fa 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -@@ -371,7 +371,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process +@@ -373,7 +373,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process auto screenProperties = WebCore::collectScreenProperties(); parameters.screenProperties = WTFMove(screenProperties); #if PLATFORM(MAC) @@ -8581,7 +8548,7 @@ index df441776b08e5765bb1cfadb1323b8ea8c1a8fe1..9e4a0baf63dfe52d58085a3fe9b1833a #endif #if PLATFORM(IOS) -@@ -681,8 +681,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -687,8 +687,8 @@ void WebProcessPool::registerNotificationObservers() #if ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING) m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -10739,10 +10706,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 57678852e25e443cb4f066efed611ef1f7ed6c26..a51d79c4284a4f72252854c0a183f02d19b61119 100644 +index 8fc767f7356167fd581602a3f0e8e5ea2021266f..941a50a358450d71df810a1bcaced233216b6b11 100644 --- a/Source/WebKit/UIProcess/PageClient.h +++ b/Source/WebKit/UIProcess/PageClient.h -@@ -280,6 +280,11 @@ public: +@@ -286,6 +286,11 @@ public: virtual void selectionDidChange() = 0; #endif @@ -11701,7 +11668,7 @@ index 0000000000000000000000000000000000000000..20311d530090b0229010957a96fc60f4 + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index eebfba4fbe95eb7c6457179e4656c62fa76ec9fd..848773b6cacbfa57fef6e5137fcea8fd9a811543 100644 +index 4ffe7e38f2e4139ebc2d30dcc54c783a4675fe05..dadc08aeea4feca8e85c75ecd76b2c32f9527d4f 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -946,6 +946,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) @@ -11712,7 +11679,7 @@ index eebfba4fbe95eb7c6457179e4656c62fa76ec9fd..848773b6cacbfa57fef6e5137fcea8fd } void WebPageProxy::didAttachToRunningProcess() -@@ -1290,6 +1291,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1266,6 +1267,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -11734,7 +11701,7 @@ index eebfba4fbe95eb7c6457179e4656c62fa76ec9fd..848773b6cacbfa57fef6e5137fcea8fd RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1745,6 +1761,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1731,6 +1747,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) m_process->processPool().sendToNetworkingProcess(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation)); } @@ -11766,7 +11733,7 @@ index eebfba4fbe95eb7c6457179e4656c62fa76ec9fd..848773b6cacbfa57fef6e5137fcea8fd void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -1887,6 +1928,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -1873,6 +1914,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -11792,7 +11759,7 @@ index eebfba4fbe95eb7c6457179e4656c62fa76ec9fd..848773b6cacbfa57fef6e5137fcea8fd if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2854,7 +2914,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -2831,7 +2891,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -11801,7 +11768,7 @@ index eebfba4fbe95eb7c6457179e4656c62fa76ec9fd..848773b6cacbfa57fef6e5137fcea8fd const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -2887,7 +2947,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -2864,7 +2924,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -11810,15 +11777,15 @@ index eebfba4fbe95eb7c6457179e4656c62fa76ec9fd..848773b6cacbfa57fef6e5137fcea8fd } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3299,6 +3359,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3293,6 +3353,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, RefPtr&& websitePolicies, Ref&& sender, Optional sandboxExtensionHandle, WillContinueLoadInNewProcess willContinueLoadInNewProcess) { + m_inspectorController->didReceivePolicyDecision(action, navigation ? navigation->navigationID() : 0); if (!hasRunningProcess()) { - sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), hasNavigatedAwayFromAppBoundDomain(), PolicyAction::Ignore, 0, DownloadID(), WTF::nullopt }); + sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, DownloadID(), WTF::nullopt }); return; -@@ -4001,6 +4062,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -3995,6 +4056,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -11830,7 +11797,7 @@ index eebfba4fbe95eb7c6457179e4656c62fa76ec9fd..848773b6cacbfa57fef6e5137fcea8fd void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4412,6 +4478,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4414,6 +4480,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) // FIXME: Message check the navigationID. m_navigationState->didDestroyNavigation(navigationID); @@ -11838,7 +11805,7 @@ index eebfba4fbe95eb7c6457179e4656c62fa76ec9fd..848773b6cacbfa57fef6e5137fcea8fd } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4636,6 +4703,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4638,6 +4705,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -11847,7 +11814,7 @@ index eebfba4fbe95eb7c6457179e4656c62fa76ec9fd..848773b6cacbfa57fef6e5137fcea8fd // 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; -@@ -5086,7 +5155,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5079,7 +5148,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) { @@ -11947,7 +11914,7 @@ index eebfba4fbe95eb7c6457179e4656c62fa76ec9fd..848773b6cacbfa57fef6e5137fcea8fd } break; } -@@ -7430,8 +7516,10 @@ static bool shouldReloadAfterProcessTermination(ProcessTerminationReason reason) +@@ -7417,8 +7503,10 @@ static bool shouldReloadAfterProcessTermination(ProcessTerminationReason reason) void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { RELEASE_LOG_IF_ALLOWED(Loading, "dispatchProcessDidTerminate: reason = %d", reason); @@ -11959,7 +11926,7 @@ index eebfba4fbe95eb7c6457179e4656c62fa76ec9fd..848773b6cacbfa57fef6e5137fcea8fd if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -7723,6 +7811,7 @@ void WebPageProxy::resetStateAfterProcessExited(ProcessTerminationReason termina +@@ -7708,6 +7796,7 @@ void WebPageProxy::resetStateAfterProcessExited(ProcessTerminationReason termina WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -11967,7 +11934,7 @@ index eebfba4fbe95eb7c6457179e4656c62fa76ec9fd..848773b6cacbfa57fef6e5137fcea8fd WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -7867,6 +7956,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -7852,6 +7941,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.shouldCaptureDisplayInUIProcess = m_process->processPool().configuration().shouldCaptureDisplayInUIProcess(); parameters.limitsNavigationsToAppBoundDomains = m_limitsNavigationsToAppBoundDomains; @@ -11976,7 +11943,7 @@ index eebfba4fbe95eb7c6457179e4656c62fa76ec9fd..848773b6cacbfa57fef6e5137fcea8fd #if PLATFORM(GTK) parameters.themeName = pageClient().themeName(); #endif -@@ -7938,6 +8029,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, bool +@@ -7923,6 +8014,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, bool void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -11991,7 +11958,7 @@ index eebfba4fbe95eb7c6457179e4656c62fa76ec9fd..848773b6cacbfa57fef6e5137fcea8fd if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = makeRef(*this), authenticationChallenge = authenticationChallenge.copyRef()] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8023,7 +8122,8 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8008,7 +8107,8 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge MESSAGE_CHECK(m_process, frame); // FIXME: Geolocation should probably be using toString() as its string representation instead of databaseIdentifier(). @@ -12001,7 +11968,7 @@ index eebfba4fbe95eb7c6457179e4656c62fa76ec9fd..848773b6cacbfa57fef6e5137fcea8fd auto request = m_geolocationPermissionRequestManager.createRequest(geolocationID); Function completionHandler = [request = WTFMove(request)](bool allowed) { if (allowed) -@@ -8032,6 +8132,14 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8017,6 +8117,14 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -12017,7 +11984,7 @@ index eebfba4fbe95eb7c6457179e4656c62fa76ec9fd..848773b6cacbfa57fef6e5137fcea8fd // 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 acf3493477db2a77e9208b27937da9e5301e33f6..a6ae6ca51d66709ac6ce9dd2b7352908ae16cbf0 100644 +index e551ae553338004fe56312d76e24aae7da36f7d6..141b05dd5beb6c3d079f03a300ebb217b84e5881 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -37,6 +37,7 @@ @@ -12028,7 +11995,7 @@ index acf3493477db2a77e9208b27937da9e5301e33f6..a6ae6ca51d66709ac6ce9dd2b7352908 #include "LayerTreeContext.h" #include "MessageSender.h" #include "NotificationPermissionRequestManagerProxy.h" -@@ -497,6 +498,8 @@ public: +@@ -501,6 +502,8 @@ public: void setControlledByAutomation(bool); WebPageInspectorController& inspectorController() { return *m_inspectorController; } @@ -12037,7 +12004,7 @@ index acf3493477db2a77e9208b27937da9e5301e33f6..a6ae6ca51d66709ac6ce9dd2b7352908 #if PLATFORM(IOS_FAMILY) void showInspectorIndication(); -@@ -571,6 +574,11 @@ public: +@@ -575,6 +578,11 @@ public: void setPageLoadStateObserver(std::unique_ptr&&); @@ -12049,7 +12016,7 @@ index acf3493477db2a77e9208b27937da9e5301e33f6..a6ae6ca51d66709ac6ce9dd2b7352908 void initializeWebPage(); void setDrawingArea(std::unique_ptr&&); -@@ -596,6 +604,7 @@ public: +@@ -600,6 +608,7 @@ public: void closePage(); void addPlatformLoadParameters(LoadParameters&); @@ -12057,7 +12024,7 @@ index acf3493477db2a77e9208b27937da9e5301e33f6..a6ae6ca51d66709ac6ce9dd2b7352908 RefPtr loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemes, 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); -@@ -1082,6 +1091,7 @@ public: +@@ -1087,6 +1096,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -12065,7 +12032,7 @@ index acf3493477db2a77e9208b27937da9e5301e33f6..a6ae6ca51d66709ac6ce9dd2b7352908 void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1399,6 +1409,8 @@ public: +@@ -1404,6 +1414,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(Optional&&); @@ -12074,7 +12041,7 @@ index acf3493477db2a77e9208b27937da9e5301e33f6..a6ae6ca51d66709ac6ce9dd2b7352908 #endif #if ENABLE(WEB_CRYPTO) -@@ -2374,6 +2386,7 @@ private: +@@ -2382,6 +2394,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -12082,7 +12049,7 @@ index acf3493477db2a77e9208b27937da9e5301e33f6..a6ae6ca51d66709ac6ce9dd2b7352908 #if ENABLE(FULLSCREEN_API) std::unique_ptr m_fullScreenManager; -@@ -2804,6 +2817,9 @@ private: +@@ -2810,6 +2823,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -12093,7 +12060,7 @@ index acf3493477db2a77e9208b27937da9e5301e33f6..a6ae6ca51d66709ac6ce9dd2b7352908 #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 8f80ba4081ddebd5fd28cd99c423a3a6067561ec..cc76f6d2bd24b84c7fcaa4e939edbc6e4c4f60ce 100644 +index fc12f7b20ac77c78edeb638011f6af0e93115d5f..710a2609d3c8dc095f881dc60a388c19b2d46583 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -12104,7 +12071,7 @@ index 8f80ba4081ddebd5fd28cd99c423a3a6067561ec..cc76f6d2bd24b84c7fcaa4e939edbc6e #if ENABLE(NETSCAPE_PLUGIN_API) UnavailablePluginButtonClicked(uint32_t pluginUnavailabilityReason, String mimeType, String pluginURLString, String pluginspageAttributeURLString, String frameURLString, String pageURLString) -@@ -207,6 +208,7 @@ messages -> WebPageProxy { +@@ -204,6 +205,7 @@ messages -> WebPageProxy { FindStringCallback(bool found, WebKit::CallbackID callbackID) PageScaleFactorDidChange(double scaleFactor) @@ -12113,7 +12080,7 @@ index 8f80ba4081ddebd5fd28cd99c423a3a6067561ec..cc76f6d2bd24b84c7fcaa4e939edbc6e PluginZoomFactorDidChange(double zoomFactor) diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index 9c3c14eb14ab29cb87f433bd01c3dbf4043de464..fe81c5d6f8c182dc4237a9101b01ced2d8392215 100644 +index abc8888727c89177b420d253d7547ed14ff78bea..60bc5d92194fa9125efa2060f8ff640e3b4f9337 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp @@ -1029,7 +1029,10 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa @@ -12129,10 +12096,10 @@ index 9c3c14eb14ab29cb87f433bd01c3dbf4043de464..fe81c5d6f8c182dc4237a9101b01ced2 parameters.urlSchemesRegisteredAsEmptyDocument = copyToVector(m_schemesToRegisterAsEmptyDocument); parameters.urlSchemesRegisteredAsSecure = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsSecure()); diff --git a/Source/WebKit/UIProcess/WebProcessPool.h b/Source/WebKit/UIProcess/WebProcessPool.h -index 1938f5a0afe8fcbf98c63e1e5102aeab77c3cce0..a1c929532c0b9a1dbb3dea4812494ef5fae5515b 100644 +index c935df2f7d273f9059f638a50dc6f112df6a7dfb..ae529922438a03c1742509a84a04acb28b437bf7 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.h +++ b/Source/WebKit/UIProcess/WebProcessPool.h -@@ -712,8 +712,8 @@ private: +@@ -710,8 +710,8 @@ private: HashMap> m_dictionaryCallbacks; @@ -12144,7 +12111,7 @@ index 1938f5a0afe8fcbf98c63e1e5102aeab77c3cce0..a1c929532c0b9a1dbb3dea4812494ef5 bool m_memoryCacheDisabled { false }; diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index c06f026a36b6e728fd53a5dc3655d9d52c348e21..4dfd85ca542dc3b1a0a95abc7e5d034fa903bd31 100644 +index 14837bd6364ceaad24fdad7b3fb4295278733119..3bd11862f58581ae87dd2775ef7fa759da7b9f93 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp @@ -185,6 +185,8 @@ void WebsiteDataStore::registerProcess(WebProcessProxy& process) @@ -12702,7 +12669,7 @@ index 0000000000000000000000000000000000000000..d0f9827544994e450e24e3f7a427c35e + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm -index 574be22a3f7bb6e4db1a6a97657f6812371cd3e4..bf938d19343f7458ab4aeca26cd528fc68f3a034 100644 +index 5c8a3cd2935ec480c01d9c628e0bc3afbd0d1eed..415f2431b6b326ab669374bd2c2c05c2ef700e98 100644 --- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm +++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm @@ -447,6 +447,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect) @@ -13700,10 +13667,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4cd77dc508 100644 +index 2b7069a13d8c04f5df8c838e6bb26563ce6fe766..5a269fa4fbb1a8c0798a34099a8777b7aa6c762b 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1776,6 +1776,19 @@ +@@ -1777,6 +1777,19 @@ CEE4AE2B1A5DCF430002F49B /* UIKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CEE4AE2A1A5DCF430002F49B /* UIKitSPI.h */; }; D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484311FF4B6500032B39 /* WebPopupMenu.h */; }; D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */; }; @@ -13723,7 +13690,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c 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, ); }; }; E105FE5418D7B9DE008F57A8 /* EditingRange.h in Headers */ = {isa = PBXBuildFile; fileRef = E105FE5318D7B9DE008F57A8 /* EditingRange.h */; }; -@@ -1829,6 +1842,7 @@ +@@ -1830,6 +1843,7 @@ E5CB07DC20E1678F0022C183 /* WKFormColorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */; }; ECA680D81E690E2500731D20 /* WebProcessCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = ECA680D71E690DF800731D20 /* WebProcessCocoa.h */; settings = {ATTRIBUTES = (Private, ); }; }; ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -13731,7 +13698,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c F409BA181E6E64BC009DA28E /* WKDragDestinationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */; settings = {ATTRIBUTES = (Private, ); }; }; F42D634122A0EFDF00D2FB3A /* WebAutocorrectionData.h in Headers */ = {isa = PBXBuildFile; fileRef = F42D633F22A0EFD300D2FB3A /* WebAutocorrectionData.h */; }; F430E9422247335F005FE053 /* WebsiteMetaViewportPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = F430E941224732A9005FE053 /* WebsiteMetaViewportPolicy.h */; }; -@@ -5237,6 +5251,20 @@ +@@ -5246,6 +5260,20 @@ D3B9484311FF4B6500032B39 /* WebPopupMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPopupMenu.h; sourceTree = ""; }; D3B9484411FF4B6500032B39 /* WebSearchPopupMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSearchPopupMenu.cpp; sourceTree = ""; }; D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSearchPopupMenu.h; sourceTree = ""; }; @@ -13752,7 +13719,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c 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 = ""; }; -@@ -5341,6 +5369,9 @@ +@@ -5350,6 +5378,9 @@ ECA680D71E690DF800731D20 /* WebProcessCocoa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebProcessCocoa.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 = ""; }; @@ -13762,7 +13729,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDragDestinationAction.h; sourceTree = ""; }; F40D1B68220BDC0F00B49A01 /* WebAutocorrectionContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WebAutocorrectionContext.h; path = ios/WebAutocorrectionContext.h; sourceTree = ""; }; F41056612130699A0092281D /* APIAttachmentCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = APIAttachmentCocoa.mm; sourceTree = ""; }; -@@ -7175,6 +7206,7 @@ +@@ -7193,6 +7224,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -13770,7 +13737,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -8465,6 +8497,8 @@ +@@ -8489,6 +8521,8 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -13779,7 +13746,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c ); path = Agents; sourceTree = ""; -@@ -8472,6 +8506,7 @@ +@@ -8496,6 +8530,7 @@ 91D970D623DA6D550057DBC3 /* mac */ = { isa = PBXGroup; children = ( @@ -13787,7 +13754,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorProxyMac.mm */, 1CA8B935127C774E00576C2B /* WebInspectorProxyMac.mm */, 994BADF11F7D77EA00B571E7 /* WKInspectorViewController.h */, -@@ -8889,6 +8924,13 @@ +@@ -8913,6 +8948,13 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -13801,7 +13768,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -9173,6 +9215,7 @@ +@@ -9197,6 +9239,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -13809,7 +13776,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -9773,6 +9816,11 @@ +@@ -9797,6 +9840,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -13821,7 +13788,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, C1817362205844A900DFDA65 /* DisplayLink.cpp */, -@@ -10548,6 +10596,7 @@ +@@ -10573,6 +10621,7 @@ 991F492F23A812C60054642B /* _WKInspectorDebuggableInfo.h in Headers */, 99036AE223A949CF0000B06A /* _WKInspectorDebuggableInfoInternal.h in Headers */, 9197940C23DBC50300257892 /* _WKInspectorDelegate.h in Headers */, @@ -13829,7 +13796,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c 5CAFDE472130846A00B1F7E1 /* _WKInspectorInternal.h in Headers */, 9979CA58237F49F10039EC05 /* _WKInspectorPrivate.h in Headers */, A5C0F0AB2000658200536536 /* _WKInspectorWindow.h in Headers */, -@@ -10672,6 +10721,7 @@ +@@ -10697,6 +10746,7 @@ 7C89D2981A6753B2003A5FDE /* APIPageConfiguration.h in Headers */, 1AC1336C18565C7A00F3EC05 /* APIPageHandle.h in Headers */, 1AFDD3151891B54000153970 /* APIPolicyClient.h in Headers */, @@ -13837,7 +13804,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c 7CE4D2201A4914CA00C7F152 /* APIProcessPoolConfiguration.h in Headers */, 49BCA19223A177660028A836 /* APIResourceLoadStatisticsFirstParty.h in Headers */, 49BCA19723A1930D0028A836 /* APIResourceLoadStatisticsThirdParty.h in Headers */, -@@ -10799,6 +10849,7 @@ +@@ -10824,6 +10874,7 @@ BC06F43A12DBCCFB002D78DE /* GeolocationPermissionRequestProxy.h in Headers */, 2DA944A41884E4F000ED86DB /* GestureTypes.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -13845,7 +13812,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -10927,8 +10978,10 @@ +@@ -10952,8 +11003,10 @@ 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 413075AB1DE85F330039EC69 /* NetworkRTCSocket.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -13856,7 +13823,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c 570DAAC22303730300E8FC04 /* NfcConnection.h in Headers */, 570DAAAE23026F5C00E8FC04 /* NfcService.h in Headers */, 31A2EC5614899C0900810D71 /* NotificationPermissionRequest.h in Headers */, -@@ -11012,6 +11065,7 @@ +@@ -11037,6 +11090,7 @@ CD2865EE2255562000606AC7 /* ProcessTaskStateObserver.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -13864,7 +13831,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */, 1A0C227E2451130A00ED614D /* QuickLookThumbnailingSoftLink.h in Headers */, -@@ -11309,6 +11363,7 @@ +@@ -11334,6 +11388,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -13872,7 +13839,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -11439,6 +11494,7 @@ +@@ -11464,6 +11519,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -13880,7 +13847,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -11491,6 +11547,7 @@ +@@ -11516,6 +11572,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -13888,7 +13855,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -11641,6 +11698,7 @@ +@@ -11666,6 +11723,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -13896,7 +13863,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -12695,6 +12753,7 @@ +@@ -12720,6 +12778,7 @@ CDA93DB122F8BCF400490A69 /* FullscreenTouchSecheuristicParameters.cpp in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -13904,7 +13871,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c 2D913441212CF9F000128AFD /* JSNPMethod.cpp in Sources */, 2D913442212CF9F000128AFD /* JSNPObject.cpp in Sources */, 2984F588164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp in Sources */, -@@ -12706,6 +12765,7 @@ +@@ -12731,6 +12790,7 @@ 2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */, 2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */, 2D92A77A212B6A6100F493FD /* Module.cpp in Sources */, @@ -13912,7 +13879,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c 57B826452304F14000B72EB0 /* NearFieldSoftLink.mm in Sources */, 2D913443212CF9F000128AFD /* NetscapeBrowserFuncs.cpp in Sources */, 2D913444212CF9F000128AFD /* NetscapePlugin.cpp in Sources */, -@@ -12730,6 +12790,7 @@ +@@ -12755,6 +12815,7 @@ 1A2D8439127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp in Sources */, 2D92A792212B6AD400F493FD /* NPObjectProxy.cpp in Sources */, 2D92A793212B6AD400F493FD /* NPRemoteObjectMap.cpp in Sources */, @@ -13920,7 +13887,7 @@ index 717e8df55d2662acecaaaad823734e89aa5e9231..956ec035120de1c15060bb8502e3af4c 2D913447212CF9F000128AFD /* NPRuntimeObjectMap.cpp in Sources */, 2D913448212CF9F000128AFD /* NPRuntimeUtilities.cpp in Sources */, 2D92A794212B6AD400F493FD /* NPVariantData.cpp in Sources */, -@@ -13012,6 +13073,7 @@ +@@ -13038,6 +13099,7 @@ 2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -14020,10 +13987,10 @@ index 283afab34d2d73235219f9aad80f6028a9b6faef..bbe4f258383dc21574cc3b5769deae72 } // namespace WebKit diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -index 1324229bf6dd3a90324aa55dff533186f97b52e8..b459bf67142874851e3f6e0caf0a229b3c4fcbad 100644 +index 966787f5cf9005c23079195379add2771b50308f..dff4d9b6b2a95e05505644e60d1403822826652f 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -@@ -412,6 +412,8 @@ void WebChromeClient::setResizable(bool resizable) +@@ -385,6 +385,8 @@ void WebChromeClient::setResizable(bool resizable) void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID) { @@ -14032,7 +13999,7 @@ index 1324229bf6dd3a90324aa55dff533186f97b52e8..b459bf67142874851e3f6e0caf0a229b // Notify the bundle client. m_page.injectedBundleUIClient().willAddMessageToConsole(&m_page, source, level, message, lineNumber, columnNumber, sourceID); } -@@ -810,6 +812,13 @@ bool WebChromeClient::canShowDataListSuggestionLabels() const +@@ -775,6 +777,13 @@ bool WebChromeClient::canShowDataListSuggestionLabels() const #endif @@ -14126,7 +14093,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 62cb38f196a8b46d588895047cd72a4526965997..a59e1f1db698769bde5a55eb0c771522d31114fd 100644 +index 8ba9342bc0fd7cbc53bf809f7fc76d3a3eed22a5..fe2c4cda9dcaa60adf4338ff874a484aa361e91d 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp @@ -765,6 +765,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) @@ -14162,7 +14129,7 @@ index 62cb38f196a8b46d588895047cd72a4526965997..a59e1f1db698769bde5a55eb0c771522 void WebPage::loadRequest(LoadParameters&& loadParameters) { setIsNavigatingToAppBoundDomain(loadParameters.isNavigatingToAppBoundDomain); -@@ -1732,17 +1751,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1730,17 +1749,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -14181,7 +14148,7 @@ index 62cb38f196a8b46d588895047cd72a4526965997..a59e1f1db698769bde5a55eb0c771522 // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -1759,20 +1774,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1757,20 +1772,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -14209,7 +14176,7 @@ index 62cb38f196a8b46d588895047cd72a4526965997..a59e1f1db698769bde5a55eb0c771522 #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -1780,7 +1793,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1778,7 +1791,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -14217,7 +14184,7 @@ index 62cb38f196a8b46d588895047cd72a4526965997..a59e1f1db698769bde5a55eb0c771522 void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2071,6 +2083,7 @@ void WebPage::scaleView(double scale) +@@ -2077,6 +2089,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -14225,7 +14192,7 @@ index 62cb38f196a8b46d588895047cd72a4526965997..a59e1f1db698769bde5a55eb0c771522 scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2175,17 +2188,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2181,17 +2194,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -14244,7 +14211,7 @@ index 62cb38f196a8b46d588895047cd72a4526965997..a59e1f1db698769bde5a55eb0c771522 } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3070,6 +3079,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3076,6 +3085,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -14256,15 +14223,15 @@ index 62cb38f196a8b46d588895047cd72a4526965997..a59e1f1db698769bde5a55eb0c771522 void WebPage::insertNewlineInQuotedContent() { Frame& frame = m_page->focusController().focusedOrMainFrame(); -@@ -3311,6 +3325,7 @@ void WebPage::didCompletePageTransition() +@@ -3316,6 +3330,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); + m_page->inspectorController().didShowNewWindow(); } - void WebPage::setShouldFireResizeEvents(bool shouldFireResizeEvents) -@@ -6403,6 +6418,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe + void WebPage::setShouldFireEvents(bool shouldFireEvents) +@@ -6407,6 +6422,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = WTF::nullopt; } @@ -14275,10 +14242,10 @@ index 62cb38f196a8b46d588895047cd72a4526965997..a59e1f1db698769bde5a55eb0c771522 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index 24c9cc7c910324fdc449fc8174d617f2418083c8..12836aa989b0daac9a73bbd20c2742d730d4343a 100644 +index 15f28cf26735b9026f86dc15525382b18ea0a58d..081cafc5aa1908561fd342debb4fb3377007b24f 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h -@@ -1158,6 +1158,7 @@ public: +@@ -1160,6 +1160,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -14286,7 +14253,7 @@ index 24c9cc7c910324fdc449fc8174d617f2418083c8..12836aa989b0daac9a73bbd20c2742d7 void insertNewlineInQuotedContent(); -@@ -1420,6 +1421,7 @@ private: +@@ -1423,6 +1424,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -14294,7 +14261,7 @@ index 24c9cc7c910324fdc449fc8174d617f2418083c8..12836aa989b0daac9a73bbd20c2742d7 void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1568,9 +1570,7 @@ private: +@@ -1571,9 +1573,7 @@ private: void countStringMatches(const String&, uint32_t findOptions, uint32_t maxMatchCount); void replaceMatches(const Vector& matchIndices, const String& replacementText, bool selectionOnly, CallbackID); @@ -14304,7 +14271,7 @@ index 24c9cc7c910324fdc449fc8174d617f2418083c8..12836aa989b0daac9a73bbd20c2742d7 void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2032,6 +2032,7 @@ private: +@@ -2035,6 +2035,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -14313,7 +14280,7 @@ index 24c9cc7c910324fdc449fc8174d617f2418083c8..12836aa989b0daac9a73bbd20c2742d7 bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index fdbd17d20b945402956037b5263878507326fe7a..94aa8c90708aba9901fa41c4cec360b14ee04350 100644 +index c8c162b4a6ea00fc509335a61d9b3223a7333e1a..e8611c967eb09e9af80806a19a2c8edf60445f2d 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in @@ -131,6 +131,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType @@ -14333,7 +14300,7 @@ index fdbd17d20b945402956037b5263878507326fe7a..94aa8c90708aba9901fa41c4cec360b1 LoadData(struct WebKit::LoadParameters loadParameters) LoadAlternateHTML(struct WebKit::LoadParameters loadParameters) diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index e444133ba491e5918c3eb3ec9b58646438b792fe..096ad69f6ce831e1775913e7951f3fc8787e2f8d 100644 +index 7ed17b898cb6c2cac74c3de29476f12322bb8641..1631fdc3d591761b754a89035da4d5e88698852b 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -81,6 +81,7 @@ @@ -14343,8 +14310,8 @@ index e444133ba491e5918c3eb3ec9b58646438b792fe..096ad69f6ce831e1775913e7951f3fc8 +#include #include #include - #include -@@ -276,6 +277,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter + #include +@@ -275,6 +276,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter platformInitializeProcess(parameters); updateCPULimit(); @@ -14367,7 +14334,7 @@ index 039b7f464a3e49886f57e68bf3430775f510f5ed..5d43d1415bde4fff315882e5a1787bcd - (void)touch:(WebEvent *)event { diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm -index 83d0525ec43edb3fda93618c8301a3b0e8b2c615..d0a20ed02ed8ad02f4ea6670b5136259e51a61ef 100644 +index ad9bfdd5321d17b108e414ac96e0222fdeae97cc..9fc34ccd13b6001b4b1c423dc48cadeef25f17d0 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm @@ -4353,7 +4353,7 @@ IGNORE_WARNINGS_END @@ -14389,7 +14356,7 @@ index 83d0525ec43edb3fda93618c8301a3b0e8b2c615..d0a20ed02ed8ad02f4ea6670b5136259 // For backwards compatibility with the WebBackForwardList API, we honor both // a per-WebView and a per-preferences setting for whether to use the back/forward cache. diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 8fbe678a63724e6b9fc29e9e185e2c07565d490c..49ab3f82bec853264b5da66532556010093d0c59 100644 +index b1ac2660496e0e250a58063be5f970cf38c7ea7a..9aa2e9d07abeb3c3851fe731efbca2307152aa71 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -5,6 +5,7 @@ WEBKIT_OPTION_BEGIN() @@ -14400,7 +14367,7 @@ index 8fbe678a63724e6b9fc29e9e185e2c07565d490c..49ab3f82bec853264b5da66532556010 if (USE_GTK4) set(WEBKITGTK_API_VERSION 5.0) -@@ -196,6 +197,13 @@ if (USE_GTK4) +@@ -197,6 +198,13 @@ if (USE_GTK4) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) endif () @@ -14415,7 +14382,7 @@ index 8fbe678a63724e6b9fc29e9e185e2c07565d490c..49ab3f82bec853264b5da66532556010 # 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 8af4ff94cd93e1677b2883a79c68f23bf4a0c1cb..d5b7ebcf26c66ec869f5ec6cdfd7e4e09d7e8b05 100644 +index 1e32f16e9d2cb73f267ceb19c6aed46236b81587..2d1440b013ff6d7ada5bb76b7063da8d5d925214 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -3,6 +3,7 @@ include(VersioningUtils) @@ -14426,7 +14393,7 @@ index 8af4ff94cd93e1677b2883a79c68f23bf4a0c1cb..d5b7ebcf26c66ec869f5ec6cdfd7e4e0 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT 12 0 9) -@@ -75,13 +76,21 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE OFF) +@@ -76,13 +77,21 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBXR PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})