yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

browser(webkit): roll to 01-04 (#4882)

Browse Source
This commit is contained in:
Yury Semikhatsky 2021-01-05 09:13:13 -08:00 committed by GitHub
parent 4a89158293
commit 849a5b3795
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser_patches/webkit/BUILD_NUMBER
View File

@ -1,2 +1,2 @@
1412
Changed: yurys@chromium.org Mon 04 Jan 2021 01:36:20 PM PST
1413
Changed: yurys@chromium.org Mon 04 Jan 2021 02:16:49 PM PST

2
browser_patches/webkit/UPSTREAM_CONFIG.sh
View File

@ -1,3 +1,3 @@
REMOTE_URL="https://git.webkit.org/git/WebKit.git"
BASE_BRANCH="master"
BASE_REVISION="0472d39eba552a5696b769c343e28e6480141a53"
BASE_REVISION="f73092d4a81ef44ed4933e45e94bc56dc30b09b3"

92
browser_patches/webkit/patches/bootstrap.diff
View File

@ -1883,10 +1883,10 @@ index 1d56fe2397aa683922f9e65e3ccd74707e73744e..129d21a0c83a7fdc576291f2955121ac
list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt
index 84f5868761e29a9460c6ca565e4cccd1e0f502b0..ae47e801848f5b86fc0e21990880464b6a338ea6 100644
index 3be1758cd875539ac7d2c6daa078f0cb302c8713..3ccf6a1da41b1b916b82eccc37ccb1f6ac290654 100644
--- a/Source/WebCore/SourcesCocoa.txt
+++ b/Source/WebCore/SourcesCocoa.txt
@@ -611,3 +611,9 @@ platform/graphics/angle/TemporaryANGLESetting.cpp @no-unify
@@ -612,3 +612,9 @@ platform/graphics/angle/TemporaryANGLESetting.cpp @no-unify
// Derived Sources
WHLSLStandardLibraryFunctionMap.cpp
@ -1935,10 +1935,10 @@ index ef168b76819216d984b7a2d0f760005fb9d24de8..2d6cf51f3b45191ad84106429d4f108f
__ZN7WebCore14DocumentLoaderD2Ev
__ZN7WebCore14DocumentLoader17clearMainResourceEv
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
index 1b8fd531a607d8248d8841ed4aaab86130f2fa28..21a73c5afaa1a733caecf0526a37e8ff4e633ae5 100644
index 53e3dd0ed1e8ef0445aad11cb8a543d5572e8486..06066ccdec277952ec70cb752159622a8f3d6b34 100644
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -5232,6 +5232,14 @@
@@ -5233,6 +5233,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, ); }; };
@ -1953,7 +1953,7 @@ index 1b8fd531a607d8248d8841ed4aaab86130f2fa28..21a73c5afaa1a733caecf0526a37e8ff
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, ); }; };
@@ -16509,6 +16517,14 @@
@@ -16516,6 +16524,14 @@
EDEC98020AED7E170059137F /* WebCorePrefix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCorePrefix.h; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
EFB7287B2124C73D005C2558 /* CanvasActivityRecord.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CanvasActivityRecord.cpp; sourceTree = "<group>"; };
EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanvasActivityRecord.h; sourceTree = "<group>"; };
@ -1968,7 +1968,7 @@ index 1b8fd531a607d8248d8841ed4aaab86130f2fa28..21a73c5afaa1a733caecf0526a37e8ff
F12171F316A8BC63000053CA /* WebVTTElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebVTTElement.cpp; sourceTree = "<group>"; };
F12171F416A8BC63000053CA /* WebVTTElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVTTElement.h; sourceTree = "<group>"; };
F32BDCD52363AAC90073B6AE /* UserGestureEmulationScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserGestureEmulationScope.cpp; sourceTree = "<group>"; };
@@ -22034,7 +22050,12 @@
@@ -22041,7 +22057,12 @@
93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */,
1AF326770D78B9440068F0C4 /* EditorClient.h */,
93C09A800B064F00005ABD4D /* EventHandler.cpp */,
@ -1981,7 +1981,7 @@ index 1b8fd531a607d8248d8841ed4aaab86130f2fa28..21a73c5afaa1a733caecf0526a37e8ff
E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */,
E0FEF371B17C53EAC1C1FBEE /* EventSource.h */,
E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */,
@@ -27478,7 +27499,9 @@
@@ -27489,7 +27510,9 @@
B2C3D9EC0D006C1D00EF6F26 /* text */,
E1EE8B6B2412B2A700E794D6 /* xr */,
DFDB912CF8E88A6DA1AD264F /* AbortableTaskQueue.h */,
@ -1991,7 +1991,7 @@ index 1b8fd531a607d8248d8841ed4aaab86130f2fa28..21a73c5afaa1a733caecf0526a37e8ff
49AE2D95134EE5F90072920A /* CalculationValue.h */,
C330A22113EC196B0000B45B /* ColorChooser.h */,
C37CDEBC149EF2030042090D /* ColorChooserClient.h */,
@@ -29994,6 +30017,7 @@
@@ -30007,6 +30030,7 @@
BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */,
AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */,
AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */,
@ -1999,7 +1999,7 @@ index 1b8fd531a607d8248d8841ed4aaab86130f2fa28..21a73c5afaa1a733caecf0526a37e8ff
6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */,
6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */,
86D982F6125C154000AD9E3D /* DocumentTiming.h */,
@@ -31017,6 +31041,7 @@
@@ -31030,6 +31054,7 @@
93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */,
29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */,
0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */,
@ -2007,7 +2007,7 @@ index 1b8fd531a607d8248d8841ed4aaab86130f2fa28..21a73c5afaa1a733caecf0526a37e8ff
29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */,
69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */,
AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */,
@@ -32987,6 +33012,7 @@
@@ -33000,6 +33025,7 @@
6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */,
E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */,
81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */,
@ -2015,7 +2015,7 @@ index 1b8fd531a607d8248d8841ed4aaab86130f2fa28..21a73c5afaa1a733caecf0526a37e8ff
7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */,
C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */,
C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */,
@@ -34982,9 +35008,11 @@
@@ -34996,9 +35022,11 @@
B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */,
26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */,
DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */,
@ -2027,7 +2027,7 @@ index 1b8fd531a607d8248d8841ed4aaab86130f2fa28..21a73c5afaa1a733caecf0526a37e8ff
B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */,
B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */,
9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */,
@@ -36012,6 +36040,7 @@
@@ -36026,6 +36054,7 @@
51058ADF1D67C229009A538C /* MockGamepad.cpp in Sources */,
51058AE11D67C229009A538C /* MockGamepadProvider.cpp in Sources */,
CDF2B0121820540600F2B424 /* MockMediaPlayerMediaSource.cpp in Sources */,
@ -2035,7 +2035,7 @@ index 1b8fd531a607d8248d8841ed4aaab86130f2fa28..21a73c5afaa1a733caecf0526a37e8ff
CDF2B0141820540600F2B424 /* MockMediaSourcePrivate.cpp in Sources */,
CDF2B0161820540700F2B424 /* MockSourceBufferPrivate.cpp in Sources */,
2D9BF7421DBFDC27007A7D99 /* NavigatorEME.cpp in Sources */,
@@ -36043,6 +36072,7 @@
@@ -36057,6 +36086,7 @@
6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */,
CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */,
51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */,
@ -2043,7 +2043,7 @@ index 1b8fd531a607d8248d8841ed4aaab86130f2fa28..21a73c5afaa1a733caecf0526a37e8ff
538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */,
538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */,
538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */,
@@ -36091,6 +36121,7 @@
@@ -36105,6 +36135,7 @@
538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */,
DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */,
538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */,
@ -2051,7 +2051,7 @@ index 1b8fd531a607d8248d8841ed4aaab86130f2fa28..21a73c5afaa1a733caecf0526a37e8ff
DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */,
538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */,
DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */,
@@ -36623,6 +36654,7 @@
@@ -36637,6 +36668,7 @@
2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */,
2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */,
2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */,
@ -4295,7 +4295,7 @@ index b94ed78ad3dbea19543c1fd54653f0481e52fb7c..6341c7ff7ef53577f33c19ecad1b8bfb
private:
diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp
index 8b70249d5f5964446645133d3bf317e350aae35c..f72282e1ab28408291c4aa1c28a43443ab8eb4de 100644
index 26c212a9690e30c9cb3dca19ba92f2dd1255ccd2..ef650a8d3b14ddf81e3b6db1fef4416d8fb1a261 100644
--- a/Source/WebCore/loader/DocumentLoader.cpp
+++ b/Source/WebCore/loader/DocumentLoader.cpp
@@ -1379,8 +1379,6 @@ void DocumentLoader::detachFromFrame()
@ -4326,10 +4326,10 @@ index aae9b49716ccfcba82ab8738ef5ca9b7cfb835c7..b4681abd5a353783d7f38a030e85ba63
DocumentWriter& writer() const { return m_writer; }
diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
index 215822782c4e505788d59e998c141ef7114ed813..a33dd2471baefb62f9eebdafb8965151e5eb4d22 100644
index 3952c933278e16369409390b1db80dea9495d624..28e07147fb965e6a0711506f486359cd0f36622c 100644
--- a/Source/WebCore/loader/FrameLoader.cpp
+++ b/Source/WebCore/loader/FrameLoader.cpp
@@ -1164,6 +1164,7 @@ void FrameLoader::loadInSameDocument(const URL& url, SerializedScriptValue* stat
@@ -1152,6 +1152,7 @@ void FrameLoader::loadInSameDocument(const URL& url, SerializedScriptValue* stat
}
m_client->dispatchDidNavigateWithinPage();
@ -4337,7 +4337,7 @@ index 215822782c4e505788d59e998c141ef7114ed813..a33dd2471baefb62f9eebdafb8965151
m_frame.document()->statePopped(stateObject ? Ref<SerializedScriptValue> { *stateObject } : SerializedScriptValue::nullValue());
m_client->dispatchDidPopStateWithinPage();
@@ -1475,6 +1476,7 @@ void FrameLoader::load(FrameLoadRequest&& request)
@@ -1463,6 +1464,7 @@ void FrameLoader::load(FrameLoadRequest&& request)
void FrameLoader::loadWithNavigationAction(const ResourceRequest& request, NavigationAction&& action, FrameLoadType type, RefPtr<FormState>&& formState, AllowNavigationToInvalidURL allowNavigationToInvalidURL, CompletionHandler<void()>&& completionHandler)
{
@ -4345,7 +4345,7 @@ index 215822782c4e505788d59e998c141ef7114ed813..a33dd2471baefb62f9eebdafb8965151
FRAMELOADER_RELEASE_LOG_IF_ALLOWED(ResourceLoading, "loadWithNavigationAction: frame load started");
Ref<DocumentLoader> loader = m_client->createDocumentLoader(request, defaultSubstituteDataForURL(request.url()));
@@ -1578,6 +1580,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
@@ -1566,6 +1568,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
const String& httpMethod = loader->request().httpMethod();
if (shouldPerformFragmentNavigation(isFormSubmission, httpMethod, policyChecker().loadType(), newURL)) {
@ -4354,7 +4354,7 @@ index 215822782c4e505788d59e998c141ef7114ed813..a33dd2471baefb62f9eebdafb8965151
RefPtr<DocumentLoader> oldDocumentLoader = m_documentLoader;
NavigationAction action { *m_frame.document(), loader->request(), InitiatedByMainFrame::Unknown, policyChecker().loadType(), isFormSubmission };
@@ -3156,6 +3160,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error)
@@ -3159,6 +3163,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error)
checkCompleted();
if (m_frame.page())
checkLoadComplete();
@ -4363,7 +4363,7 @@ index 215822782c4e505788d59e998c141ef7114ed813..a33dd2471baefb62f9eebdafb8965151
}
void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, bool shouldContinue)
@@ -3918,9 +3924,6 @@ String FrameLoader::referrer() const
@@ -3921,9 +3927,6 @@ String FrameLoader::referrer() const
void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
{
@ -4373,7 +4373,7 @@ index 215822782c4e505788d59e998c141ef7114ed813..a33dd2471baefb62f9eebdafb8965151
Vector<Ref<DOMWrapperWorld>> worlds;
ScriptController::getAllWorlds(worlds);
for (auto& world : worlds)
@@ -3929,13 +3932,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
@@ -3932,13 +3935,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world)
{
@ -6077,7 +6077,7 @@ index 4a4f6c72b54a2e6c5462aa4366b71b67d82e3582..9b15f8992bc32892e24e27025870c09b
#endif
diff --git a/Source/WebCore/platform/ScrollableArea.h b/Source/WebCore/platform/ScrollableArea.h
index d5139b7e6f688f023739ec3e14e4b102ac92a7df..7ae21cba067ada0f9e84248e2f6230d607aae07b 100644
index 9fcd549abb6eda206e220c0bd8dd91fef272f30e..09b81b7975db5f9fb65409783e3f24d5fcc823cd 100644
--- a/Source/WebCore/platform/ScrollableArea.h
+++ b/Source/WebCore/platform/ScrollableArea.h
@@ -111,7 +111,7 @@ public:
@ -8287,7 +8287,7 @@ index b838fca9702c1432602176bb13ef052db224e82e..d802e555369176e74b37495ae924b04e
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 d76654b64f62a091cd936dfc03f004adfc199cb5..5cf79767de4cff71e4b64792b9854ad13f276812 100644
index faaa2adcf991b136593c55960646ff1f480cf1d7..771c9a318b16b407b5f737805c695cdefc9d510f 100644
--- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp
+++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp
@@ -113,6 +113,10 @@
@ -14523,7 +14523,7 @@ index 0000000000000000000000000000000000000000..01b8f65e87b4898b1418f47f4d95c401
+
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d117c750a96 100644
index 5716d67d700e2d1a97b304a2949aabca24358d5c..57ade9830b106e7d9c2dba6dc2322a350ccb0aa8 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
@@ -236,7 +236,7 @@
@ -14830,7 +14830,7 @@ index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d11
auto completionHandler = [this, protectedThis = makeRef(*this), mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement] (RefPtr<WebPageProxy> newPage) mutable {
if (!newPage) {
reply(WTF::nullopt, WTF::nullopt);
@@ -5584,6 +5720,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa
@@ -5594,6 +5730,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa
void WebPageProxy::showPage()
{
m_uiClient->showPage(this);
@ -14838,7 +14838,7 @@ index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d11
}
void WebPageProxy::exitFullscreenImmediately()
@@ -5619,6 +5756,10 @@ void WebPageProxy::closePage()
@@ -5629,6 +5766,10 @@ void WebPageProxy::closePage()
if (isClosed())
return;
@ -14849,7 +14849,7 @@ index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d11
RELEASE_LOG_IF_ALLOWED(Process, "closePage:");
pageClient().clearAllEditCommands();
m_uiClient->close(this);
@@ -5638,6 +5779,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f
@@ -5648,6 +5789,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f
if (auto* automationSession = process().processPool().automationSession())
automationSession->willShowJavaScriptDialog(*this);
}
@ -14858,7 +14858,7 @@ index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d11
m_uiClient->runJavaScriptAlert(*this, message, frame, WTFMove(frameInfo), WTFMove(reply));
}
@@ -5655,6 +5798,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&&
@@ -5665,6 +5808,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&&
if (auto* automationSession = process().processPool().automationSession())
automationSession->willShowJavaScriptDialog(*this);
}
@ -14867,7 +14867,7 @@ index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d11
m_uiClient->runJavaScriptConfirm(*this, message, frame, WTFMove(frameInfo), WTFMove(reply));
}
@@ -5673,6 +5818,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&&
@@ -5683,6 +5828,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&&
if (auto* automationSession = process().processPool().automationSession())
automationSession->willShowJavaScriptDialog(*this);
}
@ -14876,7 +14876,7 @@ index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d11
m_uiClient->runJavaScriptPrompt(*this, message, defaultValue, frame, WTFMove(frameInfo), WTFMove(reply));
}
@@ -5828,6 +5975,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf
@@ -5838,6 +5985,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf
return;
}
}
@ -14885,7 +14885,7 @@ index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d11
// Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer.
m_process->stopResponsivenessTimer();
@@ -7005,6 +7154,10 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled)
@@ -7015,6 +7164,10 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled)
if (auto* automationSession = process().processPool().automationSession())
automationSession->mouseEventsFlushedForPage(*this);
didFinishProcessingAllPendingMouseEvents();
@ -14896,7 +14896,7 @@ index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d11
}
break;
}
@@ -7031,7 +7184,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled)
@@ -7041,7 +7194,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());
@ -14904,7 +14904,7 @@ index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d11
MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty());
auto event = m_keyEventQueue.takeFirst();
MESSAGE_CHECK(m_process, type == event.type());
@@ -7050,7 +7202,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled)
@@ -7060,7 +7212,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled)
// The call to doneWithKeyEvent may close this WebPage.
// Protect against this being destroyed.
Ref<WebPageProxy> protect(*this);
@ -14912,7 +14912,7 @@ index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d11
pageClient().doneWithKeyEvent(event, handled);
if (!handled)
m_uiClient->didNotHandleKeyEvent(this, event);
@@ -7059,6 +7210,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled)
@@ -7069,6 +7220,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled)
if (!canProcessMoreKeyEvents) {
if (auto* automationSession = process().processPool().automationSession())
automationSession->keyboardEventsFlushedForPage(*this);
@ -14920,7 +14920,7 @@ index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d11
}
break;
}
@@ -7474,7 +7626,6 @@ static bool shouldReloadAfterProcessTermination(ProcessTerminationReason reason)
@@ -7484,7 +7636,6 @@ static bool shouldReloadAfterProcessTermination(ProcessTerminationReason reason)
void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason)
{
RELEASE_LOG_ERROR_IF_ALLOWED(Loading, "dispatchProcessDidTerminate: reason = %d", reason);
@ -14928,7 +14928,7 @@ index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d11
// We notify the client asynchronously because several pages may share the same process
// and we want to make sure all pages are aware their process has crashed before the
// the client reacts to the process termination.
@@ -7482,7 +7633,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason)
@@ -7492,7 +7643,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason)
if (!weakThis)
return;
@ -14940,7 +14940,7 @@ index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d11
if (m_loaderClient)
handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this);
else
@@ -7842,6 +7996,7 @@ static const Vector<ASCIILiteral>& mediaRelatedIOKitClasses()
@@ -7852,6 +8006,7 @@ static const Vector<ASCIILiteral>& mediaRelatedIOKitClasses()
WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr<API::WebsitePolicies>&& websitePolicies)
{
@ -14948,7 +14948,7 @@ index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d11
WebPageCreationParameters parameters;
parameters.processDisplayName = configuration().processDisplayName();
@@ -8014,6 +8169,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
@@ -8024,6 +8179,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
parameters.shouldRelaxThirdPartyCookieBlocking = m_configuration->shouldRelaxThirdPartyCookieBlocking();
parameters.canUseCredentialStorage = m_canUseCredentialStorage;
@ -14957,7 +14957,7 @@ index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d11
#if PLATFORM(GTK)
parameters.themeName = pageClient().themeName();
#endif
@@ -8085,6 +8242,14 @@ void WebPageProxy::gamepadActivity(const Vector<GamepadData>& gamepadDatas, Even
@@ -8095,6 +8252,14 @@ void WebPageProxy::gamepadActivity(const Vector<GamepadData>& gamepadDatas, Even
void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref<AuthenticationChallengeProxy>&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS)
{
@ -14972,7 +14972,7 @@ index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d11
if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) {
m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = makeRef(*this), authenticationChallenge] (bool shouldAllowLegacyTLS) {
if (shouldAllowLegacyTLS)
@@ -8170,7 +8335,8 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge
@@ -8180,7 +8345,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().
@ -14982,7 +14982,7 @@ index 1807ff490e2e742ed07a6ccfdcc60f4f1c4252ea..a6488b4fe8baaaa094e06cf0591b6d11
auto request = m_geolocationPermissionRequestManager.createRequest(geolocationID);
Function<void(bool)> completionHandler = [request = WTFMove(request)](bool allowed) {
if (allowed)
@@ -8179,6 +8345,14 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge
@@ -8189,6 +8355,14 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge
request->deny();
};
@ -17610,7 +17610,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 31a14c127d8ce33422550eaa3ea4f48529df5bd9..e97d04213a16101e1050d8851fc57746ec385742 100644
index 6b23ffeb305a40e6acd0cd949139b08d4ccffd33..fe40d49c210c1afa8f06289ce527da109d2d8a07 100644
--- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
@@ -829,6 +829,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
@ -18260,7 +18260,7 @@ index bbb1bc783000214ca469ea232314637dd4063573..20866bbcc6cec6d6df7cb44ff3da95c3
# Private options specific to the WPE port.
diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake
index 631da70f3f324fac60e1142b799a6e7812a225e9..1972934ed8543fd7e1b2e7d25aa55679ddd9c983 100644
index 9ebae8abd937595cfe73f67e355fdf33b1c29597..5acab6bee4681300591f907eab9d2338a1904d56 100644
--- a/Source/cmake/OptionsWin.cmake
+++ b/Source/cmake/OptionsWin.cmake
@@ -7,8 +7,9 @@ add_definitions(-D_WINDOWS -DWINVER=0x601 -D_WIN32_WINNT=0x601)
@ -18274,7 +18274,7 @@ index 631da70f3f324fac60e1142b799a6e7812a225e9..1972934ed8543fd7e1b2e7d25aa55679
set(ENABLE_WEBKIT OFF)
endif ()
@@ -86,6 +87,13 @@ if (${WTF_PLATFORM_WIN_CAIRO})
@@ -87,6 +88,13 @@ if (${WTF_PLATFORM_WIN_CAIRO})
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})