chore: bump chromium to 120.0.6078.0 (main) (#40114)
* chore: bump chromium in DEPS to 120.0.6049.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6050.0 * chore: update patches * 4910494: Reland "[autopip] Show autopip UI for video pip"4910494
* 4812338: Move partition_alloc into a "partition_alloc" dir.4812338
* [Extensions Cleanup] Remove mojom ViewType::kExtensionDialog4909897
* 4894923: Force enable raw_ptrs pointer arithmetic check.4894923
* gin: Prevent wrappables from being constructed from author code.4905829
* chore: update patches * chore: bump chromium in DEPS to 120.0.6052.0 * chore: bump chromium in DEPS to 120.0.6054.0 * chore: bump chromium in DEPS to 120.0.6056.0 * chore: fix patches * 4918545: Reland "[autopip] Add permissions embargo"4918545
* 4881761: UI bindings for visual logging with structured metrics.4881761
* chore: bump chromium in DEPS to 120.0.6058.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6060.0 * chore: bump chromium in DEPS to 120.0.6061.0 * chore: bump chromium in DEPS to 120.0.6062.0 * chore: gen libc++ filenames * chore: update patches * 4911894: Move //c/b/ui/views/eye_dropper to //components4911894
* chore: bump chromium in DEPS to 120.0.6064.0 * chore: bump chromium in DEPS to 120.0.6066.0 * chore: bump chromium in DEPS to 120.0.6068.0 * chore: bump chromium in DEPS to 120.0.6070.0 * chore: remove temp_prevent_unused_function_error.patch Xref:4931270
* chore: add TransferDragSecurityInfo() Xref:4928028
* mark TransferDragSecurityInfo() as NOTREACHED A follow-up to previous commit. I think this is commit is correct (i.e. that this function shouldn't get called) but am not positive, so I'm including it in a standalone commit in case we need to revert. * chore: update signature of OnPrivateNetworkAccessPermissionRequired() Xref:4919478
Our impl is a no-op, so updating the signature is the only change. * chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6072.0 * chore: update patches * chore: sync ParseMatchPattern() param order with upstream change Xref:4944243
* chore: update fix_crash_loading_non-standard_schemes_in_iframes.patch Xref:4939602
* chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6073.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6074.0 * chore: update disable_color_correct_rendering.patch Xref:4908053
no manual changes; patch applied with fuzz 1 * chore: update fix_handle_no_top_level_aura_window_in_webcontentsimpl.patch Xref:4936315
minor manual sync to upstream code shear * chore: rebuild patches * chore: update ClearHttpAuthCache arguments Xref:4937937
adding ClearDataFilterPtr arg. Upstream added this arg, which is already present in other NetworkContext methods. Our code uses `nullptr` there. * chore: bump chromium in DEPS to 120.0.6076.0 * chore: update mas_disable_remote_accessibility.patch Xref:4865412
minor manual sync to upstream code shear * chore: update disable_color_correct_rendering.patch Xref:4942936
minor manual sync to upstream code shear * fix: move x11_util.h include to top of source file This is a short-term fix to unblock the roll. I will follow up a better fix in a standalone PR. * chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6077.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6078.0 * chore: update patches * refactor: add BrowserProcessImpl::os_crypt_async() Xref:4455776
This is one to keep an eye on. This commit copies the upstream impl, which appears to be an interim step with more upstream code changes still forthcoming. Xref: https://bugs.chromium.org/p/chromium/issues/detail?id=1373092 * fixup! refactor: add BrowserProcessImpl::os_crypt_async() chore: make 'gn check' happy * chore: remove ensure_messageports_get_gced_when_not_referenced.patch Xref: ensure_messageports_get_gced_when_not_referenced.patch no longer needed because upstreamed * chore: remove webrtc/pipewire_capturer_make_restore_tokens_re-usable_more_than_one_time.patch Xref: https://webrtc-review.googlesource.com/c/src/+/322621 no longer needed because upstreamed * chore: add //components/compose:buildflags dep Xref:4912601
needed by browser/ui/browser_dialogs.h * chore: update filenames.libcxx.gni node ./script/gen-libc++-filenames.js * test: fix UI.InspectorView -> UI.InspectorView.instance() --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
parent
54ff706b71
commit
be44a2c5b7
113 changed files with 711 additions and 705 deletions
|
@ -130,7 +130,7 @@ class DataPipeReader {
|
|||
std::vector<char> buffer_;
|
||||
|
||||
// The head of buffer.
|
||||
raw_ptr<char> head_ = nullptr;
|
||||
raw_ptr<char, AllowPtrArithmetic> head_ = nullptr;
|
||||
|
||||
// Remaining data to read.
|
||||
uint64_t remaining_size_ = 0;
|
||||
|
|
|
@ -747,6 +747,7 @@ v8::Local<v8::Promise> Session::ClearAuthCache() {
|
|||
->GetNetworkContext()
|
||||
->ClearHttpAuthCache(
|
||||
base::Time(), base::Time::Max(),
|
||||
nullptr /*mojom::ClearDataFilterPtr*/,
|
||||
base::BindOnce(gin_helper::Promise<void>::ResolvePromise,
|
||||
std::move(promise)));
|
||||
|
||||
|
|
|
@ -93,8 +93,8 @@ class SimpleURLLoaderWrapper
|
|||
void OnPrivateNetworkAccessPermissionRequired(
|
||||
const GURL& url,
|
||||
const net::IPAddress& ip_address,
|
||||
const std::string& private_network_device_id,
|
||||
const std::string& private_network_device_name,
|
||||
const absl::optional<std::string>& private_network_device_id,
|
||||
const absl::optional<std::string>& private_network_device_name,
|
||||
OnPrivateNetworkAccessPermissionRequiredCallback callback) override {}
|
||||
void OnClearSiteData(
|
||||
const GURL& url,
|
||||
|
|
|
@ -737,7 +737,6 @@ WebContents::Type GetTypeFromViewType(extensions::mojom::ViewType view_type) {
|
|||
|
||||
case extensions::mojom::ViewType::kAppWindow:
|
||||
case extensions::mojom::ViewType::kComponent:
|
||||
case extensions::mojom::ViewType::kExtensionDialog:
|
||||
case extensions::mojom::ViewType::kExtensionPopup:
|
||||
case extensions::mojom::ViewType::kBackgroundContents:
|
||||
case extensions::mojom::ViewType::kExtensionGuest:
|
||||
|
|
|
@ -14,6 +14,8 @@
|
|||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/common/chrome_paths.h"
|
||||
#include "chrome/common/chrome_switches.h"
|
||||
#include "components/os_crypt/async/browser/key_provider.h"
|
||||
#include "components/os_crypt/async/browser/os_crypt_async.h"
|
||||
#include "components/os_crypt/sync/os_crypt.h"
|
||||
#include "components/prefs/in_memory_pref_store.h"
|
||||
#include "components/prefs/json_pref_store.h"
|
||||
|
@ -129,6 +131,7 @@ void BrowserProcessImpl::PreCreateThreads() {
|
|||
|
||||
void BrowserProcessImpl::PreMainMessageLoopRun() {
|
||||
CreateNetworkQualityObserver();
|
||||
CreateOSCryptAsync();
|
||||
}
|
||||
|
||||
void BrowserProcessImpl::PostMainMessageLoopRun() {
|
||||
|
@ -301,6 +304,10 @@ UsbSystemTrayIcon* BrowserProcessImpl::usb_system_tray_icon() {
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
os_crypt_async::OSCryptAsync* BrowserProcessImpl::os_crypt_async() {
|
||||
return os_crypt_async_.get();
|
||||
}
|
||||
|
||||
void BrowserProcessImpl::SetSystemLocale(const std::string& locale) {
|
||||
system_locale_ = locale;
|
||||
}
|
||||
|
@ -375,3 +382,18 @@ void BrowserProcessImpl::CreateNetworkQualityObserver() {
|
|||
content::CreateNetworkQualityObserver(GetNetworkQualityTracker());
|
||||
DCHECK(network_quality_observer_);
|
||||
}
|
||||
|
||||
void BrowserProcessImpl::CreateOSCryptAsync() {
|
||||
// source: https://chromium-review.googlesource.com/c/chromium/src/+/4455776
|
||||
|
||||
// For now, initialize OSCryptAsync with no providers. This delegates all
|
||||
// encryption operations to OSCrypt.
|
||||
// TODO(crbug.com/1373092): Add providers behind features, as support for them
|
||||
// is added.
|
||||
os_crypt_async_ = std::make_unique<os_crypt_async::OSCryptAsync>(
|
||||
std::vector<
|
||||
std::pair<size_t, std::unique_ptr<os_crypt_async::KeyProvider>>>());
|
||||
|
||||
// Trigger async initialization of OSCrypt key providers.
|
||||
std::ignore = os_crypt_async_->GetInstance(base::DoNothing());
|
||||
}
|
||||
|
|
|
@ -108,6 +108,7 @@ class BrowserProcessImpl : public BrowserProcess {
|
|||
SerialPolicyAllowedPorts* serial_policy_allowed_ports() override;
|
||||
HidSystemTrayIcon* hid_system_tray_icon() override;
|
||||
UsbSystemTrayIcon* usb_system_tray_icon() override;
|
||||
os_crypt_async::OSCryptAsync* os_crypt_async() override;
|
||||
void CreateDevToolsProtocolHandler() override {}
|
||||
void CreateDevToolsAutoOpener() override {}
|
||||
void set_background_mode_manager_for_test(
|
||||
|
@ -122,6 +123,7 @@ class BrowserProcessImpl : public BrowserProcess {
|
|||
|
||||
private:
|
||||
void CreateNetworkQualityObserver();
|
||||
void CreateOSCryptAsync();
|
||||
network::NetworkQualityTracker* GetNetworkQualityTracker();
|
||||
|
||||
#if BUILDFLAG(ENABLE_PRINTING)
|
||||
|
@ -139,6 +141,8 @@ class BrowserProcessImpl : public BrowserProcess {
|
|||
std::unique_ptr<
|
||||
network::NetworkQualityTracker::RTTAndThroughputEstimatesObserver>
|
||||
network_quality_observer_;
|
||||
|
||||
std::unique_ptr<os_crypt_async::OSCryptAsync> os_crypt_async_;
|
||||
};
|
||||
|
||||
#endif // ELECTRON_SHELL_BROWSER_BROWSER_PROCESS_IMPL_H_
|
||||
|
|
|
@ -479,9 +479,9 @@ std::unique_ptr<UserScript> ParseUserScript(
|
|||
*content_script.matches,
|
||||
base::OptionalToPtr(content_script.exclude_matches),
|
||||
extension.creation_flags(), scripting::kScriptsCanExecuteEverywhere,
|
||||
valid_schemes, scripting::kAllUrlsIncludesChromeUrls, result.get(),
|
||||
error, /*wants_file_access=*/nullptr,
|
||||
/*definition_index=*/absl::nullopt)) {
|
||||
valid_schemes, scripting::kAllUrlsIncludesChromeUrls,
|
||||
/*definition_index=*/absl::nullopt, result.get(), error,
|
||||
/*wants_file_access=*/nullptr)) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include <utility>
|
||||
|
||||
#include "base/allocator/partition_alloc_features.h"
|
||||
#include "base/allocator/partition_allocator/partition_alloc.h"
|
||||
#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
|
||||
#include "base/bits.h"
|
||||
#include "base/command_line.h"
|
||||
#include "base/feature_list.h"
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <string>
|
||||
|
||||
#include "base/allocator/buildflags.h"
|
||||
#include "base/allocator/partition_allocator/shim/allocator_shim.h"
|
||||
#include "base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.h"
|
||||
#include "base/mac/mac_util.h"
|
||||
#include "base/strings/sys_string_conversions.h"
|
||||
#include "base/values.h"
|
||||
|
|
|
@ -2,6 +2,19 @@
|
|||
// Use of this source code is governed by the MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#if defined(USE_OZONE)
|
||||
#include "ui/ozone/buildflags.h"
|
||||
#if BUILDFLAG(OZONE_PLATFORM_X11)
|
||||
#define USE_OZONE_PLATFORM_X11
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// FIXME(ckerr) this incorrect #include order is a temporary
|
||||
// fix to unblock the roll. Will fix in an upgrade followup.
|
||||
#ifdef USE_OZONE_PLATFORM_X11
|
||||
#include "ui/base/x/x11_util.h"
|
||||
#endif
|
||||
|
||||
#include "shell/browser/native_window_views.h"
|
||||
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
|
@ -55,7 +68,7 @@
|
|||
#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
|
||||
#include "ui/views/window/native_frame_view.h"
|
||||
|
||||
#if defined(USE_OZONE)
|
||||
#if defined(USE_OZONE_PLATFORM_X11)
|
||||
#include "shell/browser/ui/views/global_menu_bar_x11.h"
|
||||
#include "shell/browser/ui/x/event_disabler.h"
|
||||
#include "shell/browser/ui/x/x_window_utils.h"
|
||||
|
@ -64,6 +77,8 @@
|
|||
#include "ui/gfx/x/x11_atom_cache.h"
|
||||
#include "ui/gfx/x/xproto.h"
|
||||
#include "ui/gfx/x/xproto_util.h"
|
||||
#endif
|
||||
#if defined(USE_OZONE)
|
||||
#include "ui/ozone/public/ozone_platform.h"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -104,7 +104,9 @@ content::DropData* OffScreenWebContentsView::GetDropData() const {
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
void OffScreenWebContentsView::CancelDragDropForPortalActivation() {}
|
||||
void OffScreenWebContentsView::TransferDragSecurityInfo(WebContentsView* view) {
|
||||
NOTREACHED();
|
||||
}
|
||||
|
||||
gfx::Rect OffScreenWebContentsView::GetViewBounds() const {
|
||||
return GetView() ? GetView()->GetViewBounds() : gfx::Rect();
|
||||
|
|
|
@ -53,7 +53,7 @@ class OffScreenWebContentsView : public content::WebContentsView,
|
|||
void RestoreFocus() override;
|
||||
void FocusThroughTabTraversal(bool reverse) override;
|
||||
content::DropData* GetDropData() const override;
|
||||
void CancelDragDropForPortalActivation() override;
|
||||
void TransferDragSecurityInfo(WebContentsView* view) override;
|
||||
gfx::Rect GetViewBounds() const override;
|
||||
void CreateView(gfx::NativeView context) override;
|
||||
content::RenderWidgetHostViewBase* CreateViewForWidget(
|
||||
|
|
|
@ -165,6 +165,10 @@ class InspectableWebContents
|
|||
void RecordPerformanceHistogram(const std::string& name,
|
||||
double duration) override {}
|
||||
void RecordUserMetricsAction(const std::string& name) override {}
|
||||
void RecordImpression(const ImpressionEvent& event) override {}
|
||||
void RecordClick(const ClickEvent& event) override {}
|
||||
void RecordChange(const ChangeEvent& event) override {}
|
||||
void RecordKeyDown(const KeyDownEvent& event) override {}
|
||||
void ShowSurvey(DispatchCallback callback,
|
||||
const std::string& trigger) override {}
|
||||
void CanShowSurvey(DispatchCallback callback,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue