mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 124.0.6355.1 (30-x-y) (#41490)

Browse source 
* chore: bump chromium to 124.0.6351.0

* 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: 5039155

* fix: move NativeHandlers in extensions to new RendererAPIProvider

Ref: 5332839
Ref: 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

5326217

* 5347916: Get origin from parent for process-isolated srcdoc.

5347916

* chore: patches fixup

* 4866222: [api] Deprecate vector<v8::Local>, part 1

4866222

* 5337304: Remove DXDiag telemetry code.

5337304

* 5328275: Implement watermark routing to the BrowserView

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

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>

* chore: bump chromium to 124.0.6353.0

* chore: bump chromium in DEPS to 124.0.6353.0

* chore: update patches

* 5365462: Add missing perfetto::Flow and TRACE_EVENT includes

5365462

* 5356336: Ensure destruction of mojo channel when destructing KeySystemsImpl

5356336

* 5332839: [Extensions] Register NativeHandlers with the RendererAPIProvider

5332839

* 5148827: Add permission types for keyboard lock and pointer lock [1/N]

5148827

* 5358818: Revert "[object] Fast path for adding props with existing transition"

5358818

---------

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: 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:
electron-roller[bot] 2024-03-14 10:42:18 -04:00 • committed by GitHub
parent b39f36496d
commit b713e34947
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
83 changed files with 583 additions and 385 deletions
Download patch file Download diff file Expand all files Collapse all files

15
shell/browser/api/gpuinfo_manager.cc
View file

@ -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(

5
shell/browser/hid/hid_chooser_controller.cc
View file

@ -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;
}

2
shell/browser/printing/print_view_manager_electron.cc
View file

@ -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);
}

2
shell/browser/serial/electron_serial_delegate.h
View file

@ -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;

2
shell/browser/serial/serial_chooser_context.h
View file

@ -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();

2
shell/browser/serial/serial_chooser_controller.h
View file

@ -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;

5
shell/browser/usb/electron_usb_delegate.cc
View file

@ -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) {

13
shell/browser/web_contents_permission_helper.cc
View file

@ -247,12 +247,11 @@ void WebContentsPermissionHelper::RequestPointerLockPermission(
bool last_unlocked_by_target,
base::OnceCallback<void(content::WebContents*, bool, bool, bool)>
callback) {
RequestPermission(
web_contents_->GetPrimaryMainFrame(),
static_cast<blink::PermissionType>(PermissionType::POINTER_LOCK),
base::BindOnce(std::move(callback), web_contents_, user_gesture,
last_unlocked_by_target),
user_gesture);
RequestPermission(web_contents_->GetPrimaryMainFrame(),
blink::PermissionType::POINTER_LOCK,
base::BindOnce(std::move(callback), web_contents_,
user_gesture, last_unlocked_by_target),
user_gesture);
}
void WebContentsPermissionHelper::RequestKeyboardLockPermission(
@ -260,7 +259,7 @@ void WebContentsPermissionHelper::RequestKeyboardLockPermission(
base::OnceCallback<void(content::WebContents*, bool, bool)> callback) {
RequestPermission(
web_contents_->GetPrimaryMainFrame(),
static_cast<blink::PermissionType>(PermissionType::KEYBOARD_LOCK),
blink::PermissionType::KEYBOARD_LOCK,
base::BindOnce(std::move(callback), web_contents_, esc_key_locked));
}

6
shell/browser/web_contents_permission_helper.h
View file

@ -26,13 +26,11 @@ class WebContentsPermissionHelper
delete;
enum class PermissionType {
POINTER_LOCK = static_cast<int>(blink::PermissionType::NUM) + 1,
FULLSCREEN,
FULLSCREEN = static_cast<int>(blink::PermissionType::NUM) + 1,
OPEN_EXTERNAL,
SERIAL,
HID,
USB,
KEYBOARD_LOCK
USB
};
// Asynchronous Requests