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 06/03 (#6889)

Browse Source
This commit is contained in:
Yury Semikhatsky 2021-06-03 16:21:39 -07:00 committed by GitHub
parent fb0004c22c
commit cce62da3b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 605 additions and 620 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 @@
1492 1493
Changed: yurys@chromium.org Thu 03 Jun 2021 11:45:44 AM PDT Changed: yurys@chromium.org Thu 03 Jun 2021 03:46:28 PM PDT

2
browser_patches/webkit/UPSTREAM_CONFIG.sh
View File

@ -1,3 +1,3 @@
REMOTE_URL="https://git.webkit.org/git/WebKit.git" REMOTE_URL="https://git.webkit.org/git/WebKit.git"
BASE_BRANCH="master" BASE_BRANCH="master"
BASE_REVISION="92cb2e2c458a415ea246c0e69f63a04435ba269e" BASE_REVISION="bb7adf2388696725912768e008939800b8dffe1d"

5
browser_patches/webkit/embedder/Playwright/win/Common.cpp
View File

@ -34,7 +34,6 @@
#include "PlaywrightReplace.h" #include "PlaywrightReplace.h"
#include <dbghelp.h> #include <dbghelp.h>
#include <shlobj.h> #include <shlobj.h>
#include <wtf/Optional.h>
#include <wtf/StdLibExtras.h> #include <wtf/StdLibExtras.h>
#include <vector> #include <vector>
@ -122,7 +121,7 @@ void createCrashReport(EXCEPTION_POINTERS* exceptionPointers)
} }
} }
Optional<Credential> askCredential(HWND hwnd, const std::wstring& realm) std::optional<Credential> askCredential(HWND hwnd, const std::wstring& realm)
{ {
struct AuthDialog : public Dialog { struct AuthDialog : public Dialog {
std::wstring realm; std::wstring realm;
@ -146,7 +145,7 @@ Optional<Credential> askCredential(HWND hwnd, const std::wstring& realm)
if (dialog.run(hInst, hwnd, IDD_AUTH)) if (dialog.run(hInst, hwnd, IDD_AUTH))
return dialog.credential; return dialog.credential;
return WTF::nullopt; return std::nullopt;
} }
bool askServerTrustEvaluation(HWND hwnd, const std::wstring& text) bool askServerTrustEvaluation(HWND hwnd, const std::wstring& text)

3
browser_patches/webkit/embedder/Playwright/win/Common.h
View File

@ -29,7 +29,6 @@
#include <WebKit/WKRetainPtr.h> #include <WebKit/WKRetainPtr.h>
#include <WebKit/WKString.h> #include <WebKit/WKString.h>
#include <WebKit/WKURL.h> #include <WebKit/WKURL.h>
#include <wtf/Optional.h>
struct CommandLineOptions { struct CommandLineOptions {
bool useFullDesktop { }; bool useFullDesktop { };
@ -55,7 +54,7 @@ void computeFullDesktopFrame();
bool getAppDataFolder(_bstr_t& directory); bool getAppDataFolder(_bstr_t& directory);
CommandLineOptions parseCommandLine(); CommandLineOptions parseCommandLine();
void createCrashReport(EXCEPTION_POINTERS*); void createCrashReport(EXCEPTION_POINTERS*);
Optional<Credential> askCredential(HWND, const std::wstring& realm); std::optional<Credential> askCredential(HWND, const std::wstring& realm);
bool askServerTrustEvaluation(HWND, const std::wstring& text); bool askServerTrustEvaluation(HWND, const std::wstring& text);
std::wstring replaceString(std::wstring src, const std::wstring& oldValue, const std::wstring& newValue); std::wstring replaceString(std::wstring src, const std::wstring& oldValue, const std::wstring& newValue);

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

File diff suppressed because it is too large Load Diff