browser(webkit): roll to 06/03 (#6889)

Author: yury-s

browser_patches/webkit/BUILD_NUMBER

@@ -1,2 +1,2 @@
-1492
-Changed: [email protected] Thu 03 Jun 2021 11:45:44 AM PDT
+1493
+Changed: [email protected] Thu 03 Jun 2021 03:46:28 PM PDT

browser_patches/webkit/UPSTREAM_CONFIG.sh

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

browser_patches/webkit/embedder/Playwright/win/Common.cpp

@@ -34,7 +34,6 @@
 #include "PlaywrightReplace.h"
 #include <dbghelp.h>
 #include <shlobj.h>
-#include <wtf/Optional.h>
 #include <wtf/StdLibExtras.h>
 #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 {
         std::wstring realm;
@@ -146,7 +145,7 @@ Optional<Credential> askCredential(HWND hwnd, const std::wstring& realm)
 
     if (dialog.run(hInst, hwnd, IDD_AUTH))
         return dialog.credential;
-    return WTF::nullopt;
+    return std::nullopt;
 }
 
 bool askServerTrustEvaluation(HWND hwnd, const std::wstring& text)

browser_patches/webkit/embedder/Playwright/win/Common.h

@@ -29,7 +29,6 @@
 #include <WebKit/WKRetainPtr.h>
 #include <WebKit/WKString.h>
 #include <WebKit/WKURL.h>
-#include <wtf/Optional.h>
 
 struct CommandLineOptions {
     bool useFullDesktop { };
@@ -55,7 +54,7 @@ void computeFullDesktopFrame();
 bool getAppDataFolder(_bstr_t& directory);
 CommandLineOptions parseCommandLine();
 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);
 std::wstring replaceString(std::wstring src, const std::wstring& oldValue, const std::wstring& newValue);