From 7ef1533cae9ce536824251261d400558aee4ab3e Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Fri, 30 Oct 2020 16:15:53 -0700 Subject: [PATCH] browser(webkit): one more mac build fix after last roll (#4298) --- browser_patches/webkit/BUILD_NUMBER | 4 ++-- browser_patches/webkit/patches/bootstrap.diff | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index abf5311b5e..887d0a5296 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1372 -Changed: yurys@chromium.org Fri 30 Oct 2020 02:45:51 PM PDT +1373 +Changed: yurys@chromium.org Fri 30 Oct 2020 04:14:22 PM PDT diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 675ebda0cc..bdc2a9b08d 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -12594,7 +12594,7 @@ index 0000000000000000000000000000000000000000..6d04f9290135069359ce6bf872654648 + +#endif // ENABLE(REMOTE_INSPECTOR) diff --git a/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm b/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm -index 4dc97e89390e85aaa55ede4ef2801e1b678b3dde..32e3ef06caed295b74a890a031465c82ab81462c 100644 +index 4dc97e89390e85aaa55ede4ef2801e1b678b3dde..b522b3b792ae4e04beb6fbb3567913ed29f59f79 100644 --- a/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm +++ b/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm @@ -140,14 +140,14 @@ static Optional>> getExistingCredenti @@ -12614,6 +12614,17 @@ index 4dc97e89390e85aaa55ede4ef2801e1b678b3dde..32e3ef06caed295b74a890a031465c82 if (it == responseMap.end() || !it->second.isString()) { ASSERT_NOT_REACHED(); return WTF::nullopt; +@@ -291,8 +291,8 @@ void LocalAuthenticator::continueMakeCredentialAfterUserVerification(SecAccessCo + const auto& secAttrLabel = creationOptions.rp.id; + + cbor::CBORValue::MapValue userEntityMap; +- userEntityMap[cbor::CBORValue(kEntityIdMapKey)] = cbor::CBORValue(creationOptions.user.idVector); +- userEntityMap[cbor::CBORValue(kEntityNameMapKey)] = cbor::CBORValue(creationOptions.user.name); ++ userEntityMap[cbor::CBORValue(fido::kEntityIdMapKey)] = cbor::CBORValue(creationOptions.user.idVector); ++ userEntityMap[cbor::CBORValue(fido::kEntityNameMapKey)] = cbor::CBORValue(creationOptions.user.name); + auto userEntity = cbor::CBORWriter::write(cbor::CBORValue(WTFMove(userEntityMap))); + ASSERT(userEntity); + auto secAttrApplicationTag = toNSData(*userEntity); diff --git a/Source/WebKit/UIProcess/WebAuthentication/Mock/MockLocalConnection.h b/Source/WebKit/UIProcess/WebAuthentication/Mock/MockLocalConnection.h index ff90d3de4349c9a3385c20c059729b8e22ebe2e5..d5c4f2cd715551ddef6f5af93ada65cbe78ad213 100644 --- a/Source/WebKit/UIProcess/WebAuthentication/Mock/MockLocalConnection.h