mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
chore: bump chromium to 140.0.7301.0 (38-x-y) (#47849)
* chore: bump chromium in DEPS to 140.0.7296.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 6702959: Remove OwnedByWidgetPassKey usage from content analysis dialog tests | https://chromium-review.googlesource.com/c/chromium/src/+/6702959 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 6722750: Remove un-used `stream_id` argument for `AidaCodeComplete` | https://chromium-review.googlesource.com/c/chromium/src/+/6722750 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 6696478: Reland Reland [video pip] Add fade in/out animation to controls visibility changes | https://chromium-review.googlesource.com/c/chromium/src/+/6696478 Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> * chore: update libc++-filenames Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> * build: explicitly include cstdlib in Boyer-Moore patch Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> * chore: bump chromium in DEPS to 140.0.7297.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 6729537: [FPF] Pipe flag state from the browser to the renderer | https://chromium-review.googlesource.com/c/chromium/src/+/6729537 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 6727996: [Win] Detect pre-IPC crashes in sandboxed utility processes | https://chromium-review.googlesource.com/c/chromium/src/+/6727996 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 6707182: Move wtf/cross_thread_copier*.* to "blink" namespace | https://chromium-review.googlesource.com/c/chromium/src/+/6707182 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 6730796: extensions: Extract safe browsing/telemetry methods to new client class | https://chromium-review.googlesource.com/c/chromium/src/+/6730796 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * chore: bump chromium in DEPS to 140.0.7299.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: patchup[bot] <73610968+patchup[bot]@users.noreply.github.com> * chore: update main patches Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * build: reset the minimum macOS SDK to 15 to match upstream This reverts commit499e987c77. Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 6730215: Remove IPC_MESSAGE_LOG_ENABLED ifdef blocks. | https://chromium-review.googlesource.com/c/chromium/src/+/6730215 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 6690442: Delete ppapi/buildflags/buildflags.h | https://chromium-review.googlesource.com/c/chromium/src/+/6690442 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 6667681: Use more binaries from clang toolchain in mac build | https://chromium-review.googlesource.com/c/chromium/src/+/6667681 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * chore: bump chromium in DEPS to 140.0.7301.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 6656309: extensions: Port proxy API to desktop Android | https://chromium-review.googlesource.com/c/chromium/src/+/6656309 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 6758510: Reland 'Move GN enable_plugins variable out of //ppapi' | https://chromium-review.googlesource.com/c/chromium/src/+/6758510 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 6701466: [Extensions] Remove NaCl arch info from Update Client URLs | https://chromium-review.googlesource.com/c/chromium/src/+/6701466 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 6735979: [FSA] Replace `request_writable` with a new enum `FileSystemAccessPermissionMode`. | https://chromium-review.googlesource.com/c/chromium/src/+/6735979 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 6712080: Reland "Turn on gender translation PAK generation everywhere" | https://chromium-review.googlesource.com/c/chromium/src/+/6712080 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 6730796: extensions: Extract safe browsing/telemetry methods to new client class | https://chromium-review.googlesource.com/c/chromium/src/+/6730796 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * build: restore minimum macOS SDK to 10, restore patch This reverts commita04c579b99. Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * fixup! 6701466: [Extensions] Remove NaCl arch info from Update Client URLs | https://chromium-review.googlesource.com/c/chromium/src/+/6701466 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * chore: correct node patches Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> * fixup! 6667681: Use more binaries from clang toolchain in mac build | https://chromium-review.googlesource.com/c/chromium/src/+/6667681 Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: patchup[bot] <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
trop[bot]
@@ -12,12 +12,12 @@
|
||||
#include "base/containers/extend.h"
|
||||
#include "base/files/file_util.h"
|
||||
#include "base/strings/string_split.h"
|
||||
#include "content/public/common/buildflags.h"
|
||||
#include "content/public/common/content_constants.h"
|
||||
#include "electron/buildflags/buildflags.h"
|
||||
#include "electron/fuses.h"
|
||||
#include "extensions/common/constants.h"
|
||||
#include "pdf/buildflags.h"
|
||||
#include "ppapi/buildflags/buildflags.h"
|
||||
#include "shell/common/options_switches.h"
|
||||
#include "shell/common/process_util.h"
|
||||
#include "third_party/widevine/cdm/buildflags.h"
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
#include "electron/fuses.h"
|
||||
#include "electron/mas.h"
|
||||
#include "extensions/common/constants.h"
|
||||
#include "ipc/ipc_buildflags.h"
|
||||
#include "sandbox/policy/switches.h"
|
||||
#include "services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.h"
|
||||
#include "shell/app/command_line_args.h"
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
#include "shell/common/v8_util.h"
|
||||
#include "third_party/blink/public/common/messaging/message_port_descriptor.h"
|
||||
#include "third_party/blink/public/common/messaging/transferable_message_mojom_traits.h"
|
||||
#include "third_party/blink/public/mojom/blob/blob.mojom.h"
|
||||
|
||||
#if BUILDFLAG(IS_POSIX)
|
||||
#include "base/posix/eintr_wrapper.h"
|
||||
|
||||
@@ -521,8 +521,7 @@ void WebFrameMain::CollectedJavaScriptCallStack(
|
||||
const blink::LocalFrameToken& frame_token =
|
||||
render_frame_host()->GetFrameToken();
|
||||
if (remote_frame_token == frame_token) {
|
||||
base::Value base_value(untrusted_javascript_call_stack);
|
||||
promise.Resolve(base_value);
|
||||
promise.Resolve(base::Value(untrusted_javascript_call_stack));
|
||||
} else if (!remote_frame_token) {
|
||||
// Failed to collect call stack. See logic in:
|
||||
// third_party/blink/renderer/controller/javascript_call_stack_collector.cc
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "base/process/process.h"
|
||||
#include "base/values.h"
|
||||
#include "content/public/browser/frame_tree_node_id.h"
|
||||
#include "content/public/browser/global_routing_id.h"
|
||||
#include "gin/wrappable.h"
|
||||
@@ -20,6 +21,7 @@
|
||||
#include "shell/common/api/api.mojom.h"
|
||||
#include "shell/common/gin_helper/constructible.h"
|
||||
#include "shell/common/gin_helper/pinnable.h"
|
||||
#include "shell/common/gin_helper/promise.h"
|
||||
#include "third_party/blink/public/mojom/page/page_visibility_state.mojom-forward.h"
|
||||
|
||||
class GURL;
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
#include "third_party/abseil-cpp/absl/container/flat_hash_set.h"
|
||||
#include "third_party/blink/public/common/messaging/transferable_message.h"
|
||||
#include "third_party/blink/public/common/messaging/transferable_message_mojom_traits.h"
|
||||
#include "third_party/blink/public/mojom/blob/blob.mojom.h"
|
||||
#include "third_party/blink/public/mojom/messaging/transferable_message.mojom.h"
|
||||
|
||||
namespace electron {
|
||||
|
||||
@@ -72,18 +72,6 @@ bool ElectronRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
|
||||
NOTREACHED();
|
||||
}
|
||||
|
||||
if (const std::string_view nacl_arch =
|
||||
update_client::UpdateQueryParams::GetNaclArch();
|
||||
nacl_arch == "arm") {
|
||||
info->nacl_arch = extensions::api::runtime::PlatformNaclArch::kArm;
|
||||
} else if (nacl_arch == "x86-32") {
|
||||
info->nacl_arch = extensions::api::runtime::PlatformNaclArch::kX86_32;
|
||||
} else if (nacl_arch == "x86-64") {
|
||||
info->nacl_arch = extensions::api::runtime::PlatformNaclArch::kX86_64;
|
||||
} else {
|
||||
NOTREACHED();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
#include "extensions/browser/extension_protocols.h"
|
||||
#include "extensions/browser/extensions_browser_interface_binders.h"
|
||||
#include "extensions/browser/null_app_sorting.h"
|
||||
#include "extensions/browser/safe_browsing_delegate.h"
|
||||
#include "extensions/browser/updater/null_extension_cache.h"
|
||||
#include "extensions/browser/url_request_util.h"
|
||||
#include "extensions/common/features/feature_channel.h"
|
||||
@@ -55,7 +56,9 @@ using extensions::ExtensionsBrowserClient;
|
||||
namespace electron {
|
||||
|
||||
ElectronExtensionsBrowserClient::ElectronExtensionsBrowserClient()
|
||||
: extension_cache_(std::make_unique<extensions::NullExtensionCache>()) {
|
||||
: extension_cache_(std::make_unique<extensions::NullExtensionCache>()),
|
||||
safe_browsing_delegate_(
|
||||
std::make_unique<extensions::SafeBrowsingDelegate>()) {
|
||||
AddAPIProvider(
|
||||
std::make_unique<extensions::CoreExtensionsBrowserAPIProvider>());
|
||||
AddAPIProvider(
|
||||
@@ -383,6 +386,11 @@ extensions::KioskDelegate* ElectronExtensionsBrowserClient::GetKioskDelegate() {
|
||||
return kiosk_delegate_.get();
|
||||
}
|
||||
|
||||
extensions::SafeBrowsingDelegate*
|
||||
ElectronExtensionsBrowserClient::GetSafeBrowsingDelegate() {
|
||||
return safe_browsing_delegate_.get();
|
||||
}
|
||||
|
||||
std::string ElectronExtensionsBrowserClient::GetApplicationLocale() {
|
||||
return ElectronBrowserClient::Get()->GetApplicationLocale();
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
#include "content/public/browser/frame_tree_node_id.h"
|
||||
#include "extensions/browser/extensions_browser_client.h"
|
||||
#include "extensions/browser/kiosk/kiosk_delegate.h"
|
||||
#include "extensions/browser/safe_browsing_delegate.h"
|
||||
#include "services/network/public/cpp/resource_request.h"
|
||||
#include "services/network/public/mojom/fetch_api.mojom.h"
|
||||
#include "url/origin.h"
|
||||
@@ -24,6 +25,7 @@ class KioskDelegate;
|
||||
class ProcessManagerDelegate;
|
||||
class ElectronProcessManagerDelegate;
|
||||
class ProcessMap;
|
||||
class SafeBrowsingDelegate;
|
||||
class ElectronComponentExtensionResourceManager;
|
||||
} // namespace extensions
|
||||
|
||||
@@ -145,6 +147,7 @@ class ElectronExtensionsBrowserClient
|
||||
mojo::BinderMapWithContext<content::RenderFrameHost*>* map,
|
||||
content::RenderFrameHost* render_frame_host,
|
||||
const extensions::Extension* extension) const override;
|
||||
extensions::SafeBrowsingDelegate* GetSafeBrowsingDelegate() override;
|
||||
|
||||
// Sets the API client.
|
||||
void SetAPIClientForTest(extensions::ExtensionsAPIClient* api_client);
|
||||
@@ -162,6 +165,8 @@ class ElectronExtensionsBrowserClient
|
||||
|
||||
std::unique_ptr<extensions::KioskDelegate> kiosk_delegate_;
|
||||
|
||||
std::unique_ptr<extensions::SafeBrowsingDelegate> safe_browsing_delegate_;
|
||||
|
||||
std::unique_ptr<extensions::ElectronComponentExtensionResourceManager>
|
||||
resource_manager_;
|
||||
};
|
||||
|
||||
@@ -884,7 +884,8 @@ std::u16string FileSystemAccessPermissionContext::GetPickerTitle(
|
||||
kDirectoryPickerOptions:
|
||||
title = l10n_util::GetStringUTF16(
|
||||
options->type_specific_options->get_directory_picker_options()
|
||||
->request_writable
|
||||
->permission_mode ==
|
||||
blink::mojom::FileSystemAccessPermissionMode::kReadWrite
|
||||
? IDS_FILE_SYSTEM_ACCESS_CHOOSER_OPEN_WRITABLE_DIRECTORY_TITLE
|
||||
: IDS_FILE_SYSTEM_ACCESS_CHOOSER_OPEN_READABLE_DIRECTORY_TITLE);
|
||||
break;
|
||||
|
||||
@@ -191,8 +191,7 @@ class InspectableWebContents
|
||||
const std::string& request,
|
||||
int stream_id) override {}
|
||||
void AidaCodeComplete(DispatchCallback callback,
|
||||
const std::string& request,
|
||||
int stream_id) override {}
|
||||
const std::string& request) override {}
|
||||
void RegisterAidaClientEvent(DispatchCallback callback,
|
||||
const std::string& request) override {}
|
||||
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
#include "shell/common/node_includes.h"
|
||||
#include "shell/common/v8_util.h"
|
||||
#include "third_party/blink/public/common/messaging/transferable_message_mojom_traits.h"
|
||||
#include "third_party/blink/public/mojom/blob/blob.mojom.h"
|
||||
|
||||
namespace electron {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user