mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
chore: bump chromium to 147.0.7687.0 (main) (#49782)
* chore: bump chromium in DEPS to 147.0.7683.0 * fix(patch): constant moved to header Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7536483 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(patch): occlusion simplification upstream Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7563790 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: remove upstreamed patches Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: update patches (trivial only) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: bump chromium in DEPS to 147.0.7685.0 * fix(patch): V1 Keychain removal Upstream deleted the V1 Keychain API. Removed V1 hunks and adapted keychain_password_mac.mm to use KeychainV2 APIs. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7540447 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: update patches (trivial only) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * 7535923: Rename ozone buildflags Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7535923 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * 7528398: [LNA] Rename PNA-named files to LNA-named files Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7528398 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * 7534194: Convert some functions in ui::Clipboard to async Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7534194 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * 7544580: [DevTools] Add command to restart Chrome to DevTools UI bindings Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7544580 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: bump chromium in DEPS to 147.0.7687.0 * chore: update patches (trivial only) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: incorporate learnings into claude skill I asked Claude to reflect on our upgrade session, consider what it learned and should know in the future, and to update its skill documents. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
committed by
GitHub
parent
0da0c3a47e
commit
c98cf69f40
@@ -75,14 +75,32 @@ std::string Clipboard::Read(const std::string& format_string) {
|
||||
}
|
||||
// Otherwise, resolve custom format names
|
||||
std::map<std::string, std::string> custom_format_names;
|
||||
custom_format_names =
|
||||
clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kCopyPaste,
|
||||
/* data_dst = */ nullptr);
|
||||
{
|
||||
base::RunLoop run_loop(base::RunLoop::Type::kNestableTasksAllowed);
|
||||
clipboard->ExtractCustomPlatformNames(
|
||||
ui::ClipboardBuffer::kCopyPaste, /* data_dst = */ std::nullopt,
|
||||
base::BindOnce(
|
||||
[](std::map<std::string, std::string>* out, base::OnceClosure quit,
|
||||
std::map<std::string, std::string> result) {
|
||||
*out = std::move(result);
|
||||
std::move(quit).Run();
|
||||
},
|
||||
&custom_format_names, run_loop.QuitClosure()));
|
||||
run_loop.Run();
|
||||
}
|
||||
#if BUILDFLAG(IS_LINUX)
|
||||
if (!custom_format_names.contains(format_string)) {
|
||||
custom_format_names =
|
||||
clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kSelection,
|
||||
/* data_dst = */ nullptr);
|
||||
base::RunLoop run_loop(base::RunLoop::Type::kNestableTasksAllowed);
|
||||
clipboard->ExtractCustomPlatformNames(
|
||||
ui::ClipboardBuffer::kSelection, /* data_dst = */ std::nullopt,
|
||||
base::BindOnce(
|
||||
[](std::map<std::string, std::string>* out, base::OnceClosure quit,
|
||||
std::map<std::string, std::string> result) {
|
||||
*out = std::move(result);
|
||||
std::move(quit).Run();
|
||||
},
|
||||
&custom_format_names, run_loop.QuitClosure()));
|
||||
run_loop.Run();
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -243,7 +261,7 @@ gfx::Image Clipboard::ReadImage(gin::Arguments* const args) {
|
||||
base::RepeatingClosure callback = run_loop.QuitClosure();
|
||||
clipboard->ReadPng(
|
||||
GetClipboardBuffer(args),
|
||||
/* data_dst = */ nullptr,
|
||||
/* data_dst = */ std::nullopt,
|
||||
base::BindOnce(
|
||||
[](std::optional<gfx::Image>* image, base::RepeatingClosure cb,
|
||||
const std::vector<uint8_t>& result) {
|
||||
|
||||
@@ -127,13 +127,13 @@ class SimpleURLLoaderWrapper final
|
||||
void OnDataUseUpdate(int32_t network_traffic_annotation_id_hash,
|
||||
base::ByteSize recv_bytes,
|
||||
base::ByteSize sent_bytes) override {}
|
||||
void OnWebSocketConnectedToPrivateNetwork(
|
||||
void OnWebSocketConnectedToLocalNetwork(
|
||||
const GURL& request_url,
|
||||
network::mojom::IPAddressSpace ip_address_space) override {}
|
||||
void Clone(
|
||||
mojo::PendingReceiver<network::mojom::URLLoaderNetworkServiceObserver>
|
||||
observer) override;
|
||||
void OnUrlLoaderConnectedToPrivateNetwork(
|
||||
void OnUrlLoaderConnectedToLocalNetwork(
|
||||
const GURL& request_url,
|
||||
network::mojom::IPAddressSpace response_address_space,
|
||||
network::mojom::IPAddressSpace client_address_space,
|
||||
|
||||
Reference in New Issue
Block a user