mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 111.0.5522.0 * chore: bump chromium in DEPS to 111.0.5524.0 * chore: bump chromium in DEPS to 111.0.5526.0 * chore: bump chromium in DEPS to 111.0.5528.0 * chore: update patches/chromium/mas_avoid_usage_of_private_macos_apis.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4132807 Fix simple code shear * chore: update patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4130675 Fix simple code shear * chore: update patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/disable_unload_metrics.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126173 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/feat_add_data_parameter_to_processsingleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/preconnect_manager.patch https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/v8/force_cppheapcreateparams_to_be_noncopyable.patch https://chromium-review.googlesource.com/c/v8/v8/+/3533019 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches * chore: update patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4128765 Upstream added a new call to HeaderContext(), whose signature we have patched * chore: bump chromium in DEPS to 111.0.5530.0 * chore: update patches * Move ChildProcessHost* from content/common to content/browser Xref: Move ChildProcessHost* from content/common to content/browser * Remove RenderViewHostChanged Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [upstream removal of RenderViewHostChanged] Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4092763 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4093234 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133892 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [examples of upstream code adjusting to the change] Upstream handles this change in roughly two approaches: 1. Move the code over to RenderFrameHostChanged(old_host, new_host) but test for new_host->IsInPrimaryMainFrame() before acting 2. Migrate to the PrimaryPageChanged(page) API and use page.GetMainDocument() to get the RenderFrameHost. I've chosen 1. because electron_api_web_contents needed that pointer to old_host to call RemoveInputEventListener(), but I may be missing some context & would appreciate review on this commit. * Make electron/shell/browser/relauncher_win.cc use <winternl.h> Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4129135 Many internal Windows types are now available in winternl.h so upstrem no longer defines the types themselves. * Move ChildProcessHost* from content/common to content/browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134795 * fixup! Make electron/shell/browser/relauncher_win.cc use <winternl.h> winternl.h does not define the field we need, so clone the struct Chromium was using into unnamed namespace * fixup! Move ChildProcessHost* from content/common to content/browser chore: update #includes too * chore: bump chromium in DEPS to 111.0.5532.0 * chore: sync patches/chromium/pepper_plugin_support.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/chromium/mas_no_private_api.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4143865 the content/common/pseudonymization_salt.cc patch is no longer needed * chore: sync patches/chromium/mas_disable_remote_accessibility.patch patch-fuzz update; no manual changes * chore: sync patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4111725 manually reync patch; no code changes * chore: sync patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch Xref: https://chromium-review.googlesource.com/c/v8/v8/+/4127230 patch-fuzz update; no manual changes * chore: rebuild patches * fixup! Remove RenderViewHostChanged Use PrimaryPageChanged() * chore: remove unused method TabsUpdateFunction::OnExecuteCodeFinished() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133991 This private, already-unused function showed up as a FTBFS because it took a base::ListValue parameter and ListValue was removed upstream. * task posting v3: remove includes of runner handles and IWYU task runners Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 * chore: lint * chore: more lint * fixup! task posting v3: remove includes of runner handles and IWYU task runners macOS, too * fixup! task posting v3: remove includes of runner handles and IWYU task runners * chore: bump chromium in DEPS to 111.0.5534.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: sync patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4153110 Sync to minor upstream changes. Add const correctness. * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch sync https://chromium-review.googlesource.com/c/v8/v8/+/4147787 patch-fuzz update; no manual changes * chore: update patches * chore: bump chromium in DEPS to 111.0.5536.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 Sync with upstream code changes. Minor code golf for readability. Note: upstream is laying groundwork for being able to work off of env vars instead of switches. Doesn't affect us yet but worth being aware of. > + // Environment variables could be supported in the future, but are not > + // currently supported when launching with the zygote. * chore: update patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126836 patch-fuzz update; no manual changes * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 manual sync * chore: sync electron/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch https://chromium-review.googlesource.com/c/v8/v8/+/4147788 fuzz-patch * chore: rebuild patches * chore: bump chromium in DEPS to 111.0.5538.0 * chore: bump chromium in DEPS to 111.0.5540.0 * chore: update patches * Remove sdk_forward_declarations https://chromium-review.googlesource.com/c/chromium/src/+/4166680 * task posting v3: Remove task runner handles from codebase entirely Refs https://chromium-review.googlesource.com/c/chromium/src/+/4150928 * Cleanup child_process_launcher_helper* Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * fix: utilityprocess spec on macOS * fix: build on windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * chore: fix lint * chore: bump chromium 111.0.5544.3 * chore: gen filenames.libcxx.gni * Add check for Executable+Writable handles in renderer processes. Refs https://chromium-review.googlesource.com/c/chromium/src/+/3774416 * fixup! Add check for Executable+Writable handles in renderer processes. * 4143761: [110] Disable SwiftShader for WebGL on M1 Macs. https://chromium-review.googlesource.com/c/chromium/src/+/4143761 (cherry picked from commit2f74db3c21) * chore: bump chromium to 111.0.5555.0 * 56085: Remove hmac.h include from ssl.h. https://boringssl-review.googlesource.com/c/boringssl/+/56085 * 4167020: Remove forwarding headers https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * chore: bump chromium to 111.0.5559.0 * 4181044: Restrict WebCursor usage to RenderWidgetHostViewAura https://chromium-review.googlesource.com/c/chromium/src/+/4181044 * 4189437: views: rename ink_drop_host_view to ink_drop_host https://chromium-review.googlesource.com/c/chromium/src/+/4189437 * chore: bump chromium to 111.0.5560.0 * 4167016: win7dep: remove non aeroglass code https://chromium-review.googlesource.com/c/chromium/src/+/4167016 * fixup after rebase: Remove forwarding header s https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * 4125755: Reland "Reject getDisplayMedia calls without user activation" https://chromium-review.googlesource.com/c/chromium/src/+/4125755 * test: add workaround * chore: update patches * fix: alter coreModuleRegExp to prevent arm crash * Revert "fix: alter coreModuleRegExp to prevent arm crash" This reverts commit7e50630c98. * 4218354: Disable the use of preserve_most on arm64 Windows https://chromium-review.googlesource.com/c/v8/v8/+/4218354 * chore: review changes --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
330 lines
10 KiB
Plaintext
330 lines
10 KiB
Plaintext
// Copyright (c) 2017 Amaplex Software, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/mac/in_app_purchase_product.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/functional/bind.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
|
|
#import <StoreKit/StoreKit.h>
|
|
|
|
// ============================================================================
|
|
// InAppPurchaseProduct
|
|
// ============================================================================
|
|
|
|
// --------------------------------- Interface --------------------------------
|
|
|
|
@interface InAppPurchaseProduct : NSObject <SKProductsRequestDelegate> {
|
|
@private
|
|
in_app_purchase::InAppPurchaseProductsCallback callback_;
|
|
}
|
|
|
|
- (id)initWithCallback:(in_app_purchase::InAppPurchaseProductsCallback)callback;
|
|
|
|
@end
|
|
|
|
// ------------------------------- Implementation -----------------------------
|
|
|
|
@implementation InAppPurchaseProduct
|
|
|
|
/**
|
|
* Init with a callback.
|
|
*
|
|
* @param callback - The callback that will be called to return the products.
|
|
*/
|
|
- (id)initWithCallback:
|
|
(in_app_purchase::InAppPurchaseProductsCallback)callback {
|
|
if ((self = [super init])) {
|
|
callback_ = std::move(callback);
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
/**
|
|
* Return products.
|
|
*
|
|
* @param productIDs - The products' id to fetch.
|
|
*/
|
|
- (void)getProducts:(NSSet*)productIDs {
|
|
SKProductsRequest* productsRequest;
|
|
productsRequest =
|
|
[[SKProductsRequest alloc] initWithProductIdentifiers:productIDs];
|
|
|
|
productsRequest.delegate = self;
|
|
[productsRequest start];
|
|
}
|
|
|
|
/**
|
|
* @see SKProductsRequestDelegate
|
|
*/
|
|
- (void)productsRequest:(SKProductsRequest*)request
|
|
didReceiveResponse:(SKProductsResponse*)response {
|
|
// Release request object.
|
|
[request release];
|
|
|
|
// Get the products.
|
|
NSArray* products = response.products;
|
|
|
|
// Convert the products.
|
|
std::vector<in_app_purchase::Product> converted;
|
|
converted.reserve([products count]);
|
|
|
|
for (SKProduct* product in products) {
|
|
converted.push_back([self skProductToStruct:product]);
|
|
}
|
|
|
|
// Send the callback to the browser thread.
|
|
content::GetUIThreadTaskRunner({})->PostTask(
|
|
FROM_HERE, base::BindOnce(std::move(callback_), converted));
|
|
|
|
[self release];
|
|
}
|
|
|
|
/**
|
|
* Format local price.
|
|
*
|
|
* @param price - The price to format.
|
|
* @param priceLocal - The local format.
|
|
*/
|
|
- (NSString*)formatPrice:(NSDecimalNumber*)price
|
|
withLocal:(NSLocale*)priceLocal {
|
|
NSNumberFormatter* numberFormatter = [[NSNumberFormatter alloc] init];
|
|
|
|
[numberFormatter setFormatterBehavior:NSNumberFormatterBehavior10_4];
|
|
[numberFormatter setNumberStyle:NSNumberFormatterCurrencyStyle];
|
|
[numberFormatter setLocale:priceLocal];
|
|
|
|
return [numberFormatter stringFromNumber:price];
|
|
}
|
|
|
|
/**
|
|
* Convert a SKProductSubscriptionPeriod object to a ProductSubscriptionPeriod
|
|
* structure.
|
|
*
|
|
* @param productProductSubscriptionPeriod - The SKProductSubscriptionPeriod
|
|
* object to convert.
|
|
*/
|
|
- (in_app_purchase::ProductSubscriptionPeriod)
|
|
skProductSubscriptionPeriodToStruct:
|
|
(SKProductSubscriptionPeriod*)productSubscriptionPeriod
|
|
API_AVAILABLE(macosx(10.13.2)) {
|
|
in_app_purchase::ProductSubscriptionPeriod productSubscriptionPeriodStruct;
|
|
|
|
productSubscriptionPeriodStruct.numberOfUnits =
|
|
(int)productSubscriptionPeriod.numberOfUnits;
|
|
|
|
if (productSubscriptionPeriod.unit == SKProductPeriodUnitDay) {
|
|
productSubscriptionPeriodStruct.unit = "day";
|
|
} else if (productSubscriptionPeriod.unit == SKProductPeriodUnitWeek) {
|
|
productSubscriptionPeriodStruct.unit = "week";
|
|
} else if (productSubscriptionPeriod.unit == SKProductPeriodUnitMonth) {
|
|
productSubscriptionPeriodStruct.unit = "month";
|
|
} else if (productSubscriptionPeriod.unit == SKProductPeriodUnitYear) {
|
|
productSubscriptionPeriodStruct.unit = "year";
|
|
}
|
|
|
|
return productSubscriptionPeriodStruct;
|
|
}
|
|
|
|
/**
|
|
* Convert a SKProductDiscount object to a ProductDiscount structure.
|
|
*
|
|
* @param productDiscount - The SKProductDiscount object to convert.
|
|
*/
|
|
- (in_app_purchase::ProductDiscount)skProductDiscountToStruct:
|
|
(SKProductDiscount*)productDiscount API_AVAILABLE(macosx(10.13.2)) {
|
|
in_app_purchase::ProductDiscount productDiscountStruct;
|
|
|
|
if (productDiscount.paymentMode == SKProductDiscountPaymentModePayAsYouGo) {
|
|
productDiscountStruct.paymentMode = "payAsYouGo";
|
|
} else if (productDiscount.paymentMode ==
|
|
SKProductDiscountPaymentModePayUpFront) {
|
|
productDiscountStruct.paymentMode = "payUpFront";
|
|
} else if (productDiscount.paymentMode ==
|
|
SKProductDiscountPaymentModeFreeTrial) {
|
|
productDiscountStruct.paymentMode = "freeTrial";
|
|
}
|
|
|
|
productDiscountStruct.numberOfPeriods = (int)productDiscount.numberOfPeriods;
|
|
|
|
if (productDiscount.priceLocale != nil) {
|
|
productDiscountStruct.priceLocale =
|
|
[[self formatPrice:productDiscount.price
|
|
withLocal:productDiscount.priceLocale] UTF8String];
|
|
}
|
|
|
|
if (productDiscount.subscriptionPeriod != nil) {
|
|
productDiscountStruct.subscriptionPeriod = [self
|
|
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];
|
|
}
|
|
|
|
return productDiscountStruct;
|
|
}
|
|
|
|
/**
|
|
* Convert a skProduct object to Product structure.
|
|
*
|
|
* @param product - The SKProduct object to convert.
|
|
*/
|
|
- (in_app_purchase::Product)skProductToStruct:(SKProduct*)product {
|
|
in_app_purchase::Product productStruct;
|
|
|
|
// Product Identifier
|
|
if (product.productIdentifier != nil) {
|
|
productStruct.productIdentifier = [product.productIdentifier UTF8String];
|
|
}
|
|
|
|
// Product Attributes
|
|
if (product.localizedDescription != nil) {
|
|
productStruct.localizedDescription =
|
|
[product.localizedDescription UTF8String];
|
|
}
|
|
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) {
|
|
productStruct.price = [product.price doubleValue];
|
|
|
|
if (product.priceLocale != nil) {
|
|
productStruct.formattedPrice =
|
|
[[self formatPrice:product.price
|
|
withLocal:product.priceLocale] UTF8String];
|
|
|
|
// Currency Information
|
|
if (product.priceLocale.currencyCode != nil) {
|
|
productStruct.currencyCode =
|
|
[product.priceLocale.currencyCode UTF8String];
|
|
}
|
|
}
|
|
}
|
|
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]);
|
|
}
|
|
}
|
|
}
|
|
|
|
// 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]);
|
|
|
|
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]);
|
|
|
|
for (NSNumber* contentLength in product.contentLengths) {
|
|
productStruct.downloadContentLengths.push_back(
|
|
[contentLength longLongValue]);
|
|
}
|
|
}
|
|
}
|
|
|
|
return productStruct;
|
|
}
|
|
|
|
@end
|
|
|
|
// ============================================================================
|
|
// C++ in_app_purchase
|
|
// ============================================================================
|
|
|
|
namespace in_app_purchase {
|
|
|
|
ProductSubscriptionPeriod::ProductSubscriptionPeriod(
|
|
const ProductSubscriptionPeriod&) = default;
|
|
ProductSubscriptionPeriod::ProductSubscriptionPeriod() = default;
|
|
ProductSubscriptionPeriod::~ProductSubscriptionPeriod() = default;
|
|
|
|
ProductDiscount::ProductDiscount(const ProductDiscount&) = default;
|
|
ProductDiscount::ProductDiscount() = default;
|
|
ProductDiscount::~ProductDiscount() = default;
|
|
|
|
Product::Product() = default;
|
|
Product::Product(const Product&) = default;
|
|
Product::~Product() = default;
|
|
|
|
void GetProducts(const std::vector<std::string>& productIDs,
|
|
InAppPurchaseProductsCallback callback) {
|
|
auto* iapProduct =
|
|
[[InAppPurchaseProduct alloc] initWithCallback:std::move(callback)];
|
|
|
|
// Convert the products' id to NSSet.
|
|
NSMutableSet* productsIDSet =
|
|
[NSMutableSet setWithCapacity:productIDs.size()];
|
|
|
|
for (auto& productID : productIDs) {
|
|
[productsIDSet addObject:base::SysUTF8ToNSString(productID)];
|
|
}
|
|
|
|
// Fetch the products.
|
|
[iapProduct getProducts:productsIDSet];
|
|
}
|
|
|
|
} // namespace in_app_purchase
|