mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
chore: bump chromium to 124.0.6351.0 (main) (#41514)
* chore: bump chromium in DEPS to 124.0.6339.0 * chore: update patches * chore: bump chromium in DEPS to 124.0.6341.0 * chore: update patches * chore: bump chromium in DEPS to 124.0.6343.0 * chore: bump chromium in DEPS to 124.0.6345.0 * chore: update patches * build: temporarily patch out usage of reclient inputs cfg * chore: implement missing OnPortConnectedStateChanged Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5039155 * fix: move NativeHandlers in extensions to new RendererAPIProvider Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5332839 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5334058 * chore: add missing websocket method * refactor: use std::erase instead of base::Erase Ref: https://issues.chromium.org/issues/40256229 * build: fix reclient inputs processor bug (workaround) * fix: delay extensions::Dispatcher construction * chore: bump chromium in DEPS to 124.0.6347.0 * chore: bump chromium in DEPS to 124.0.6349.0 * 5326217: [ViewsAX] Remove WebAXPlatformTreeManagerDelegate https://chromium-review.googlesource.com/c/chromium/src/+/5326217 * 5347916: Get origin from parent for process-isolated srcdoc. https://chromium-review.googlesource.com/c/chromium/src/+/5347916 * chore: patches fixup * 4866222: [api] Deprecate vector<v8::Local>, part 1 https://chromium-review.googlesource.com/c/v8/v8/+/4866222 * 5337304: Remove DXDiag telemetry code. https://chromium-review.googlesource.com/c/chromium/src/+/5337304 * 5328275: Implement watermark routing to the BrowserView https://chromium-review.googlesource.com/c/chromium/src/+/5328275 * [libc++] Rename __fwd/hash.h to __fwd/functional.h and add reference_wrapper * chore: bump chromium in DEPS to 124.0.6351.0 * chore: update patches * 5342763: [object] Fast path for adding props with existing transition https://chromium-review.googlesource.com/c/v8/v8/+/5342763 --------- 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: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
committed by
GitHub
parent
1252f92431
commit
150c2bcef9
@@ -32,8 +32,7 @@ GPUInfoManager::~GPUInfoManager() {
|
||||
// https://chromium.googlesource.com/chromium/src.git/+/69.0.3497.106/content/browser/gpu/gpu_data_manager_impl_private.cc#838
|
||||
bool GPUInfoManager::NeedsCompleteGpuInfoCollection() const {
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
return gpu_data_manager_->DxdiagDx12VulkanRequested() &&
|
||||
gpu_data_manager_->GetGPUInfo().dx_diagnostics.IsEmpty();
|
||||
return gpu_data_manager_->DxdiagDx12VulkanRequested();
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
@@ -51,9 +50,6 @@ void GPUInfoManager::ProcessCompleteInfo() {
|
||||
}
|
||||
|
||||
void GPUInfoManager::OnGpuInfoUpdate() {
|
||||
// Ignore if called when not asked for complete GPUInfo
|
||||
if (NeedsCompleteGpuInfoCollection())
|
||||
return;
|
||||
base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
|
||||
FROM_HERE, base::BindOnce(&GPUInfoManager::ProcessCompleteInfo,
|
||||
base::Unretained(this)));
|
||||
@@ -63,13 +59,8 @@ void GPUInfoManager::OnGpuInfoUpdate() {
|
||||
void GPUInfoManager::CompleteInfoFetcher(
|
||||
gin_helper::Promise<base::Value> promise) {
|
||||
complete_info_promise_set_.emplace_back(std::move(promise));
|
||||
|
||||
if (NeedsCompleteGpuInfoCollection()) {
|
||||
gpu_data_manager_->RequestDxdiagDx12VulkanVideoGpuInfoIfNeeded(
|
||||
content::GpuDataManagerImpl::kGpuInfoRequestAll, /* delayed */ false);
|
||||
} else {
|
||||
GPUInfoManager::OnGpuInfoUpdate();
|
||||
}
|
||||
gpu_data_manager_->RequestDx12VulkanVideoGpuInfoIfNeeded(
|
||||
content::GpuDataManagerImpl::kGpuInfoRequestAll, /* delayed */ false);
|
||||
}
|
||||
|
||||
void GPUInfoManager::FetchCompleteInfo(
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
#include "base/containers/contains.h"
|
||||
#include "base/functional/bind.h"
|
||||
#include "base/ranges/algorithm.h"
|
||||
#include "base/stl_util.h"
|
||||
#include "gin/data_object_builder.h"
|
||||
#include "services/device/public/cpp/hid/hid_blocklist.h"
|
||||
#include "services/device/public/cpp/hid/hid_switches.h"
|
||||
@@ -350,7 +349,7 @@ bool HidChooserController::RemoveDeviceInfo(
|
||||
auto find_it = device_map_.find(id);
|
||||
DCHECK(find_it != device_map_.end());
|
||||
auto& device_infos = find_it->second;
|
||||
base::EraseIf(device_infos,
|
||||
std::erase_if(device_infos,
|
||||
[&device](const device::mojom::HidDeviceInfoPtr& d) {
|
||||
return d->guid == device.guid;
|
||||
});
|
||||
@@ -358,7 +357,7 @@ bool HidChooserController::RemoveDeviceInfo(
|
||||
return false;
|
||||
// A device was disconnected. Remove it from the chooser list.
|
||||
device_map_.erase(find_it);
|
||||
base::Erase(items_, id);
|
||||
std::erase(items_, id);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ void PrintViewManagerElectron::DidPrintToPdf(
|
||||
PrintToPdfCallback callback,
|
||||
print_to_pdf::PdfPrintResult result,
|
||||
scoped_refptr<base::RefCountedMemory> memory) {
|
||||
base::Erase(pdf_jobs_, cookie);
|
||||
std::erase(pdf_jobs_, cookie);
|
||||
std::move(callback).Run(result, memory);
|
||||
}
|
||||
|
||||
|
||||
@@ -55,6 +55,8 @@ class ElectronSerialDelegate : public content::SerialDelegate,
|
||||
// SerialChooserContext::PortObserver:
|
||||
void OnPortAdded(const device::mojom::SerialPortInfo& port) override;
|
||||
void OnPortRemoved(const device::mojom::SerialPortInfo& port) override;
|
||||
void OnPortConnectedStateChanged(
|
||||
const device::mojom::SerialPortInfo& port) override {}
|
||||
void OnPortManagerConnectionError() override;
|
||||
void OnPermissionRevoked(const url::Origin& origin) override {}
|
||||
void OnSerialChooserContextShutdown() override;
|
||||
|
||||
@@ -87,6 +87,8 @@ class SerialChooserContext : public KeyedService,
|
||||
// SerialPortManagerClient implementation.
|
||||
void OnPortAdded(device::mojom::SerialPortInfoPtr port) override;
|
||||
void OnPortRemoved(device::mojom::SerialPortInfoPtr port) override;
|
||||
void OnPortConnectedStateChanged(
|
||||
device::mojom::SerialPortInfoPtr port) override {}
|
||||
|
||||
private:
|
||||
void EnsurePortManagerConnection();
|
||||
|
||||
@@ -46,6 +46,8 @@ class SerialChooserController final : public SerialChooserContext::PortObserver,
|
||||
// SerialChooserContext::PortObserver:
|
||||
void OnPortAdded(const device::mojom::SerialPortInfo& port) override;
|
||||
void OnPortRemoved(const device::mojom::SerialPortInfo& port) override;
|
||||
void OnPortConnectedStateChanged(
|
||||
const device::mojom::SerialPortInfo& port) override {}
|
||||
void OnPortManagerConnectionError() override;
|
||||
void OnPermissionRevoked(const url::Origin& origin) override {}
|
||||
void OnSerialChooserContextShutdown() override;
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
#include <utility>
|
||||
|
||||
#include "base/containers/contains.h"
|
||||
#include "base/containers/cxx20_erase.h"
|
||||
#include "base/observer_list.h"
|
||||
#include "base/observer_list_types.h"
|
||||
#include "base/scoped_observation.h"
|
||||
@@ -34,8 +33,6 @@
|
||||
|
||||
namespace {
|
||||
|
||||
using ::content::UsbChooser;
|
||||
|
||||
electron::UsbChooserContext* GetChooserContext(
|
||||
content::BrowserContext* browser_context) {
|
||||
return electron::UsbChooserContextFactory::GetForBrowserContext(
|
||||
@@ -159,7 +156,7 @@ void ElectronUsbDelegate::AdjustProtectedInterfaceClasses(
|
||||
classes = permission_manager->CheckProtectedUSBClasses(classes);
|
||||
}
|
||||
|
||||
std::unique_ptr<UsbChooser> ElectronUsbDelegate::RunChooser(
|
||||
std::unique_ptr<content::UsbChooser> ElectronUsbDelegate::RunChooser(
|
||||
content::RenderFrameHost& frame,
|
||||
blink::mojom::WebUsbRequestDeviceOptionsPtr options,
|
||||
blink::mojom::WebUsbService::GetPermissionCallback callback) {
|
||||
|
||||
Reference in New Issue
Block a user