chore: bump chromium to 117.0.5852.0 (main) (#38891)
* chore: bump chromium in DEPS to 117.0.5846.0 * chore: update patches * 4628901: Bump the macOS deployment target to 10.154628901
* 4593350: [Private Network Access] Trigger Permission Prompt4593350
* 4631011: Remove unlaunched "InstallReplacementAndroidApp" Platform App APIs4631011
* chore: disable API deprecation warnings in NSKeyedArchiver * chore: update libcxx filenames * chore: bump chromium in DEPS to 117.0.5848.2 * chore: update feat_add_set_theme_source_to_allow_apps_to.patch Xref:4629743
No manual changes; patch succeeded with fuzz * chore: update process_singleton.patch Xref:4605398
Trivial manual patch adjustments to account for code shear. * chore: remove electron::BrowserContext::GetMediaDeviceIDSalt() Xref:4608130
upstream tldr: - content::BrowserContext::GetMediaDeviceIDSalt() - content::ContentBrowserClient::ArePersistentMediaDeviceIDsAllowed() + content::ContentBrowserClient::GetMediaDeviceIDSalt() This commit leaves ElectronBrowserContext::GetMediaDeviceIDSalt() in place (now non-virtual, non-override). It is now called by the new function ElectronBrowserClient::GetMediaDeviceIDSalt(). As a followup, we might want to consider using the new upstream media_device_salt::MediaDeviceSaltService and removing our electron::MediaDeviceIDSalt code. CC @MarshallOfSound for 2nd opinion since he has done the most work on MediaDeviceIDSalt and may have more context. * chore: fix iwyu breakage Xref:4629624
electron_browser_main_parts.cc uses ui::ColorProviderManager but didn't include it. Things worked anyway because we got it indirectly from content/public/browser/web_contents.h until 4629624. * chore: remove call to base::mac::IsAtLeastOS10_14 upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in IAP upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in electron_application_delegate upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove broken-before-macOS-10.15 patch in mas_avoid_usage_of_private_macos_apis.patch Upstream has bumped minimum to macOS 10.15 * chore: remove @available(macOS 10.14) check Upstream minimum requirement for macOS is now 10.15 * chore: update patches * chore: bump chromium in DEPS to 117.0.5850.0 * chore: update patches * chore: bump chromium in DEPS to 117.0.5852.0 * chore: update patches * Move two params from NetworkContextParams to NetworkContextFilePaths.4615930
* WebUSB: Add exclusionFilters to USBRequestDeviceOptions4614682
* Convert /chrome/browser/ui to use ARC4615920
* fixup! Bump the macOS deployment target to 10.15 * fixup! Bump the macOS deployment target to 10.15 * chore: update libcxx files * win: Remove 10Glass from Windows10Glass function and var names4641314
* chore: revert 392e5f43 from chromium * Add an ExecutionContext to ScriptState4609446
* fixup! Add an ExecutionContext to ScriptState * chore: fix header * Revert "chore: revert 392e5f43 from chromium" This reverts commit b7f782943e4ce83cae8cd35780d8d3618cf0772c. * fix: return correct min/max sizes in WinFrameView * fixup! Revert chore: revert 392e5f43 from chromium * fixup! Add an ExecutionContext to ScriptState * Revert "fixup! Revert chore: revert 392e5f43 from chromium" This reverts commit 7e2c7281abfc4f309255339fdba073d90a9ae3eb. * Revert "fix: return correct min/max sizes in WinFrameView" This reverts commit 3f418b1ab5155686730e087ae6cabe4a21b4bb61. * Revert "Revert "chore: revert 392e5f43 from chromium"" This reverts commit 56296d8b7c434147e032e3c3b08c0e371b6c27ba. --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
This commit is contained in:
parent
499d893040
commit
ccd4531bfb
93 changed files with 1054 additions and 652 deletions
|
@ -24,7 +24,7 @@
|
|||
#endif
|
||||
|
||||
static NSDictionary* UNNotificationResponseToNSDictionary(
|
||||
UNNotificationResponse* response) API_AVAILABLE(macosx(10.14)) {
|
||||
UNNotificationResponse* response) {
|
||||
if (![response respondsToSelector:@selector(actionIdentifier)] ||
|
||||
![response respondsToSelector:@selector(notification)]) {
|
||||
return nil;
|
||||
|
@ -82,7 +82,7 @@ static NSDictionary* UNNotificationResponseToNSDictionary(
|
|||
if ([user_notification isKindOfClass:[NSUserNotification class]]) {
|
||||
notification_info =
|
||||
[static_cast<NSUserNotification*>(user_notification) userInfo];
|
||||
} else if (@available(macOS 10.14, *)) {
|
||||
} else {
|
||||
notification_info = UNNotificationResponseToNSDictionary(
|
||||
static_cast<UNNotificationResponse*>(user_notification));
|
||||
}
|
||||
|
|
|
@ -99,7 +99,7 @@ using InAppTransactionCallback = base::RepeatingCallback<void(
|
|||
* @param paymentDiscount - The SKPaymentDiscount object to convert.
|
||||
*/
|
||||
- (in_app_purchase::PaymentDiscount)skPaymentDiscountToStruct:
|
||||
(SKPaymentDiscount*)paymentDiscount API_AVAILABLE(macosx(10.14.4)) {
|
||||
(SKPaymentDiscount*)paymentDiscount {
|
||||
in_app_purchase::PaymentDiscount paymentDiscountStruct;
|
||||
|
||||
paymentDiscountStruct.identifier = [paymentDiscount.identifier UTF8String];
|
||||
|
@ -133,11 +133,9 @@ using InAppTransactionCallback = base::RepeatingCallback<void(
|
|||
[payment.applicationUsername UTF8String];
|
||||
}
|
||||
|
||||
if (@available(macOS 10.14.4, *)) {
|
||||
if (payment.paymentDiscount != nil) {
|
||||
paymentStruct.paymentDiscount =
|
||||
[self skPaymentDiscountToStruct:payment.paymentDiscount];
|
||||
}
|
||||
if (payment.paymentDiscount != nil) {
|
||||
paymentStruct.paymentDiscount =
|
||||
[self skPaymentDiscountToStruct:payment.paymentDiscount];
|
||||
}
|
||||
|
||||
return paymentStruct;
|
||||
|
|
|
@ -45,8 +45,6 @@ struct Product {
|
|||
// Product Attributes
|
||||
std::string localizedDescription;
|
||||
std::string localizedTitle;
|
||||
std::string contentVersion;
|
||||
std::vector<uint32_t> contentLengths;
|
||||
|
||||
// Pricing Information
|
||||
double price = 0.0;
|
||||
|
|
|
@ -114,8 +114,7 @@
|
|||
*/
|
||||
- (in_app_purchase::ProductSubscriptionPeriod)
|
||||
skProductSubscriptionPeriodToStruct:
|
||||
(SKProductSubscriptionPeriod*)productSubscriptionPeriod
|
||||
API_AVAILABLE(macosx(10.13.2)) {
|
||||
(SKProductSubscriptionPeriod*)productSubscriptionPeriod {
|
||||
in_app_purchase::ProductSubscriptionPeriod productSubscriptionPeriodStruct;
|
||||
|
||||
productSubscriptionPeriodStruct.numberOfUnits =
|
||||
|
@ -140,7 +139,7 @@
|
|||
* @param productDiscount - The SKProductDiscount object to convert.
|
||||
*/
|
||||
- (in_app_purchase::ProductDiscount)skProductDiscountToStruct:
|
||||
(SKProductDiscount*)productDiscount API_AVAILABLE(macosx(10.13.2)) {
|
||||
(SKProductDiscount*)productDiscount {
|
||||
in_app_purchase::ProductDiscount productDiscountStruct;
|
||||
|
||||
if (productDiscount.paymentMode == SKProductDiscountPaymentModePayAsYouGo) {
|
||||
|
@ -166,14 +165,11 @@
|
|||
skProductSubscriptionPeriodToStruct:productDiscount.subscriptionPeriod];
|
||||
}
|
||||
|
||||
if (@available(macOS 10.14.4, *)) {
|
||||
productDiscountStruct.type = (int)productDiscount.type;
|
||||
if (productDiscount.identifier != nil) {
|
||||
productDiscountStruct.identifier =
|
||||
[productDiscount.identifier UTF8String];
|
||||
}
|
||||
productDiscountStruct.price = [productDiscount.price doubleValue];
|
||||
productDiscountStruct.type = (int)productDiscount.type;
|
||||
if (productDiscount.identifier != nil) {
|
||||
productDiscountStruct.identifier = [productDiscount.identifier UTF8String];
|
||||
}
|
||||
productDiscountStruct.price = [productDiscount.price doubleValue];
|
||||
|
||||
return productDiscountStruct;
|
||||
}
|
||||
|
@ -199,16 +195,6 @@
|
|||
if (product.localizedTitle != nil) {
|
||||
productStruct.localizedTitle = [product.localizedTitle UTF8String];
|
||||
}
|
||||
if (product.contentVersion != nil) {
|
||||
productStruct.contentVersion = [product.contentVersion UTF8String];
|
||||
}
|
||||
if (product.contentLengths != nil) {
|
||||
productStruct.contentLengths.reserve([product.contentLengths count]);
|
||||
|
||||
for (NSNumber* contentLength in product.contentLengths) {
|
||||
productStruct.contentLengths.push_back([contentLength longLongValue]);
|
||||
}
|
||||
}
|
||||
|
||||
// Pricing Information
|
||||
if (product.price != nil) {
|
||||
|
@ -226,62 +212,45 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
if (@available(macOS 10.13.2, *)) {
|
||||
if (product.introductoryPrice != nil) {
|
||||
productStruct.introductoryPrice =
|
||||
[self skProductDiscountToStruct:product.introductoryPrice];
|
||||
}
|
||||
if (product.subscriptionPeriod != nil) {
|
||||
productStruct.subscriptionPeriod =
|
||||
[self skProductSubscriptionPeriodToStruct:product.subscriptionPeriod];
|
||||
}
|
||||
}
|
||||
if (@available(macOS 10.14, *)) {
|
||||
if (product.subscriptionGroupIdentifier != nil) {
|
||||
productStruct.subscriptionGroupIdentifier =
|
||||
[product.subscriptionGroupIdentifier UTF8String];
|
||||
}
|
||||
}
|
||||
if (@available(macOS 10.14.4, *)) {
|
||||
if (product.discounts != nil) {
|
||||
productStruct.discounts.reserve([product.discounts count]);
|
||||
|
||||
for (SKProductDiscount* discount in product.discounts) {
|
||||
productStruct.discounts.push_back(
|
||||
[self skProductDiscountToStruct:discount]);
|
||||
}
|
||||
if (product.introductoryPrice != nil) {
|
||||
productStruct.introductoryPrice =
|
||||
[self skProductDiscountToStruct:product.introductoryPrice];
|
||||
}
|
||||
if (product.subscriptionPeriod != nil) {
|
||||
productStruct.subscriptionPeriod =
|
||||
[self skProductSubscriptionPeriodToStruct:product.subscriptionPeriod];
|
||||
}
|
||||
|
||||
if (product.subscriptionGroupIdentifier != nil) {
|
||||
productStruct.subscriptionGroupIdentifier =
|
||||
[product.subscriptionGroupIdentifier UTF8String];
|
||||
}
|
||||
|
||||
if (product.discounts != nil) {
|
||||
productStruct.discounts.reserve([product.discounts count]);
|
||||
|
||||
for (SKProductDiscount* discount in product.discounts) {
|
||||
productStruct.discounts.push_back(
|
||||
[self skProductDiscountToStruct:discount]);
|
||||
}
|
||||
}
|
||||
|
||||
// Downloadable Content Information
|
||||
productStruct.isDownloadable = [product downloadable];
|
||||
if (@available(macOS 10.14, *)) {
|
||||
if (product.downloadContentVersion != nil) {
|
||||
productStruct.downloadContentVersion =
|
||||
[product.downloadContentVersion UTF8String];
|
||||
}
|
||||
if (product.downloadContentLengths != nil) {
|
||||
productStruct.downloadContentLengths.reserve(
|
||||
[product.downloadContentLengths count]);
|
||||
productStruct.isDownloadable = [product isDownloadable];
|
||||
|
||||
for (NSNumber* contentLength in product.downloadContentLengths) {
|
||||
productStruct.downloadContentLengths.push_back(
|
||||
[contentLength longLongValue]);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (product.contentVersion != nil) {
|
||||
productStruct.downloadContentVersion =
|
||||
[product.contentVersion UTF8String];
|
||||
}
|
||||
if (product.contentLengths != nil) {
|
||||
productStruct.downloadContentLengths.reserve(
|
||||
[product.contentLengths count]);
|
||||
if (product.downloadContentVersion != nil) {
|
||||
productStruct.downloadContentVersion =
|
||||
[product.downloadContentVersion UTF8String];
|
||||
}
|
||||
|
||||
for (NSNumber* contentLength in product.contentLengths) {
|
||||
productStruct.downloadContentLengths.push_back(
|
||||
[contentLength longLongValue]);
|
||||
}
|
||||
if (product.downloadContentLengths != nil) {
|
||||
productStruct.downloadContentLengths.reserve(
|
||||
[product.downloadContentLengths count]);
|
||||
|
||||
for (NSNumber* contentLength in product.downloadContentLengths) {
|
||||
productStruct.downloadContentLengths.push_back(
|
||||
[contentLength longLongValue]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue