chore: bump chromium to 100.0.4894.0 (main) (#32852)
* chore: bump chromium in DEPS to 100.0.4880.0 * resolve conflicts * chore: update patches * fix patch * PIP20: add a new DocumentOverlayWindowViews subtype3252789
* Clean up PictureInPictureWindowManager::EnterPictureInPicture()3424145
* Remove StoragePartitionId.2811120
* Remove FLoC code3424359
* media: Make AddSupportedKeySystems() Async3430502
* [Extensions] Move some l10n file util methods to //extensions/browser3408192
* chore: IWYU * Reland "webhid: Grant permissions for policy-allowed devices"3444147
* Migrate base::Value::GetList() to base::Value::GetListDeprecated(): 2/N.3435727
3440910
3440088
* [text blink period] Cache blink period instead of fetching from defaults3419059
* chore: update picture-in-picture.patch3252789
* ci: update to Xcode 13.2.13437552
* chore: bump chromium in DEPS to 100.0.4882.1 * chore: update patches * chore: bump chromium in DEPS to 100.0.4884.0 * chore: update patches * chore: bump chromium in DEPS to 100.0.4886.0 * chore: update patches * Refactor DownloadManager to use StoragePartitionConfig3222011
* Remove ToWebInputElement() in favor of new WebNode::DynamicTo<> helpers.3433852
* refactor: autofill to use the color pipeline https://bugs.chromium.org/p/chromium/issues/detail?id=1249558 https://bugs.chromium.org/p/chromium/issues/detail?id=1003612 * [ProcessSingleton] Add many more trace events to cover all scenarios3429325
* fixup! PIP20: add a new DocumentOverlayWindowViews subtype * chore: bump chromium in DEPS to 100.0.4888.0 * chore: update patches * chore: update picture-in-picture.patch * fixup! refactor: autofill to use the color pipeline * ci: fixup fix sync (cherry picked from commit c1e3e395465739bce5ca8e1c5ec1f5bd72b99ebd) * chore: bump chromium in DEPS to 100.0.4889.0 * chore: update patches * chore: fix feat_add_data_transfer_to_requestsingleinstancelock.patch * fixup! PIP20: add a new DocumentOverlayWindowViews subtype * Remove remaining NativeTheme::GetSystemColor() machinery.3421719
* ci: fetch proper esbuild for macos * ci: fixup fetch proper esbuild for macos * fix: failing Node.js test on outdated CurrentValueSerializerFormatVersion * chore: bump chromium in DEPS to 100.0.4892.0 * 3460365: Set V8 fatal error callbacks during Isolate initialization3460365
* 3454343: PIP20: use permanent top controls3454343
* 3465574: Move most of GTK color mixers to ui/color/.3465574
* chore: fixup patch indices * 3445327: [locales] Remove locales reference3445327
* 3456548: [DBB][#7] Blue border falls back to all tab if cropped-to zero pixels3456548
* 3441196: Convert GuestView's remaining legacy IPC messages to Mojo3441196
* 3455491: Don't include run_loop.h in thread_task_runner_handle.h3455491
* fixup! 3454343: PIP20: use permanent top controls * 3442501: Add missing includes of //base/observer_list.h3442501
* 3437552: mac: Deploy a new hermetic build of Xcode 13.2.1 13C1003437552
* chore: bump chromium in DEPS to 100.0.4894.0 * fixup! 3460365: Set V8 fatal error callbacks during Isolate initialization * chore: update patches * 3425231: Use DnsOverHttpsConfig where appropriate3425231
* test: disable test-heapsnapshot-near-heap-limit-worker.js As a result of CLs linked in https://bugs.chromium.org/p/v8/issues/detail?id=12503, heap snapshotting near the heap limit DCHECKS in Node.js specs. This will likely require a larger refactor in Node.js so i've disabled the test for now and opened an upstream issue on node-v8 issue at https://github.com/nodejs/node-v8/issues/218. * Port all usage of NativeTheme color IDs to color pipeline https://bugs.chromium.org/p/chromium/issues/detail?id=1249558 * chore: update patches after rebase * ci: use gen2 machine for more disk space * ci: don't try to make root volume writeable * ci: use older xcode/macos for tests * fix: html fullscreen transitions stacking (cherry picked from commit 5e10965cdd7b2a024def5fc568912cefd0f05b44) * ci: speed up woa testing (cherry picked from commit 75c33c48b032137794f5734348a9ee3daa60d9de) (cherry picked from commit e81996234029669663bf0daaababd34684dcbb17) * ci: disable flaky tests on WOA * ci: run remote tests separately to isolate issue there * tests: disable node test parallel/test-worker-debug for now * revert: fix: html fullscreen transitions stacking * tests: disable flaky test on macOS arm64 * fixup circleci config so build tools can find xcode version * make sure the workspace is clean before job runs (cherry picked from commit 75f713c9748ac1a356846c39f268886130554fd6) * tests: disable flaky test on Linux * ci: debug why windows i32 is crashing * Revert "ci: debug why windows i32 is crashing" This reverts commit 4c4bba87ea76f16ef3b304dadff59ad4d366f60f. Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
parent
c1a667c931
commit
3da598015b
135 changed files with 1038 additions and 852 deletions
|
@ -34,7 +34,7 @@
|
|||
#include "content/public/common/content_switches.h"
|
||||
#include "crypto/crypto_buildflags.h"
|
||||
#include "media/audio/audio_manager.h"
|
||||
#include "net/dns/public/dns_over_https_server_config.h"
|
||||
#include "net/dns/public/dns_over_https_config.h"
|
||||
#include "net/dns/public/util.h"
|
||||
#include "net/ssl/client_cert_identity.h"
|
||||
#include "net/ssl/ssl_cert_request_info.h"
|
||||
|
@ -1640,18 +1640,14 @@ void ConfigureHostResolver(v8::Isolate* isolate,
|
|||
}
|
||||
default_doh_templates = features::kDnsOverHttpsTemplatesParam.Get();
|
||||
}
|
||||
std::string server_method;
|
||||
std::vector<net::DnsOverHttpsServerConfig> dns_over_https_servers;
|
||||
|
||||
net::DnsOverHttpsConfig doh_config;
|
||||
if (!default_doh_templates.empty() &&
|
||||
secure_dns_mode != net::SecureDnsMode::kOff) {
|
||||
for (base::StringPiece server_template :
|
||||
SplitStringPiece(default_doh_templates, " ", base::TRIM_WHITESPACE,
|
||||
base::SPLIT_WANT_NONEMPTY)) {
|
||||
if (auto server_config = net::DnsOverHttpsServerConfig::FromString(
|
||||
std::string(server_template))) {
|
||||
dns_over_https_servers.push_back(server_config.value());
|
||||
}
|
||||
}
|
||||
auto maybe_doh_config =
|
||||
net::DnsOverHttpsConfig::FromString(default_doh_templates);
|
||||
if (maybe_doh_config.has_value())
|
||||
doh_config = maybe_doh_config.value();
|
||||
}
|
||||
|
||||
bool enable_built_in_resolver =
|
||||
|
@ -1677,17 +1673,20 @@ void ConfigureHostResolver(v8::Isolate* isolate,
|
|||
thrower.ThrowTypeError("secureDnsServers must be an array of strings");
|
||||
return;
|
||||
}
|
||||
dns_over_https_servers.clear();
|
||||
|
||||
// Validate individual server templates prior to batch-assigning to
|
||||
// doh_config.
|
||||
for (const std::string& server_template : secure_dns_server_strings) {
|
||||
if (auto server_config =
|
||||
net::DnsOverHttpsServerConfig::FromString(server_template)) {
|
||||
dns_over_https_servers.push_back(server_config.value());
|
||||
} else {
|
||||
absl::optional<net::DnsOverHttpsConfig> server_config =
|
||||
net::DnsOverHttpsConfig::FromString(server_template);
|
||||
if (!server_config.has_value()) {
|
||||
thrower.ThrowTypeError(std::string("not a valid DoH template: ") +
|
||||
server_template);
|
||||
return;
|
||||
}
|
||||
}
|
||||
doh_config = *net::DnsOverHttpsConfig::FromStrings(
|
||||
std::move(secure_dns_server_strings));
|
||||
}
|
||||
|
||||
if (opts.Has("enableAdditionalDnsQueryTypes") &&
|
||||
|
@ -1700,8 +1699,8 @@ void ConfigureHostResolver(v8::Isolate* isolate,
|
|||
// Configure the stub resolver. This must be done after the system
|
||||
// NetworkContext is created, but before anything has the chance to use it.
|
||||
content::GetNetworkService()->ConfigureStubHostResolver(
|
||||
enable_built_in_resolver, secure_dns_mode,
|
||||
std::move(dns_over_https_servers), additional_dns_query_types_enabled);
|
||||
enable_built_in_resolver, secure_dns_mode, doh_config,
|
||||
additional_dns_query_types_enabled);
|
||||
}
|
||||
|
||||
// static
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
#include "gin/handle.h"
|
||||
#include "net/base/network_change_notifier.h"
|
||||
#include "net/http/http_util.h"
|
||||
#include "services/network/public/cpp/features.h"
|
||||
#include "shell/browser/api/electron_api_url_loader.h"
|
||||
#include "shell/common/gin_helper/dictionary.h"
|
||||
|
|
|
@ -261,9 +261,11 @@ void DownloadIdCallback(content::DownloadManager* download_manager,
|
|||
const base::Time& start_time,
|
||||
uint32_t id) {
|
||||
download_manager->CreateDownloadItem(
|
||||
base::GenerateGUID(), id, path, path, url_chain, GURL(), GURL(), GURL(),
|
||||
GURL(), absl::nullopt, mime_type, mime_type, start_time, base::Time(),
|
||||
etag, last_modified, offset, length, std::string(),
|
||||
base::GenerateGUID(), id, path, path, url_chain, GURL(),
|
||||
content::StoragePartitionConfig::CreateDefault(
|
||||
download_manager->GetBrowserContext()),
|
||||
GURL(), GURL(), absl::nullopt, mime_type, mime_type, start_time,
|
||||
base::Time(), etag, last_modified, offset, length, std::string(),
|
||||
download::DownloadItem::INTERRUPTED,
|
||||
download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
|
||||
download::DOWNLOAD_INTERRUPT_REASON_NETWORK_TIMEOUT, false, base::Time(),
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
#include "mojo/public/cpp/bindings/remote.h"
|
||||
#include "mojo/public/cpp/system/data_pipe_producer.h"
|
||||
#include "net/base/load_flags.h"
|
||||
#include "net/http/http_util.h"
|
||||
#include "services/network/public/cpp/resource_request.h"
|
||||
#include "services/network/public/cpp/simple_url_loader.h"
|
||||
#include "services/network/public/mojom/chunked_data_pipe_getter.mojom.h"
|
||||
|
|
|
@ -390,9 +390,10 @@ void OnCapturePageDone(gin_helper::Promise<gfx::Image> promise,
|
|||
|
||||
absl::optional<base::TimeDelta> GetCursorBlinkInterval() {
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
base::TimeDelta interval;
|
||||
if (ui::TextInsertionCaretBlinkPeriod(&interval))
|
||||
return interval;
|
||||
absl::optional<base::TimeDelta> system_value(
|
||||
ui::TextInsertionCaretBlinkPeriodFromDefaults());
|
||||
if (system_value)
|
||||
return *system_value;
|
||||
#elif BUILDFLAG(IS_LINUX)
|
||||
if (auto* linux_ui = views::LinuxUI::instance())
|
||||
return linux_ui->GetCursorBlinkInterval();
|
||||
|
@ -1086,7 +1087,7 @@ content::WebContents* WebContents::CreateCustomWebContents(
|
|||
const GURL& opener_url,
|
||||
const std::string& frame_name,
|
||||
const GURL& target_url,
|
||||
const content::StoragePartitionId& partition_id,
|
||||
const content::StoragePartitionConfig& partition_config,
|
||||
content::SessionStorageNamespace* session_storage_namespace) {
|
||||
return nullptr;
|
||||
}
|
||||
|
@ -2773,7 +2774,7 @@ void WebContents::Print(gin::Arguments* args) {
|
|||
continue;
|
||||
}
|
||||
}
|
||||
if (!page_range_list.GetList().empty())
|
||||
if (!page_range_list.GetListDeprecated().empty())
|
||||
settings.SetPath(printing::kSettingPageRange, std::move(page_range_list));
|
||||
}
|
||||
|
||||
|
@ -3530,12 +3531,10 @@ bool WebContents::TakeFocus(content::WebContents* source, bool reverse) {
|
|||
}
|
||||
|
||||
content::PictureInPictureResult WebContents::EnterPictureInPicture(
|
||||
content::WebContents* web_contents,
|
||||
const viz::SurfaceId& surface_id,
|
||||
const gfx::Size& natural_size) {
|
||||
content::WebContents* web_contents) {
|
||||
#if BUILDFLAG(ENABLE_PICTURE_IN_PICTURE)
|
||||
return PictureInPictureWindowManager::GetInstance()->EnterPictureInPicture(
|
||||
web_contents, surface_id, natural_size);
|
||||
return PictureInPictureWindowManager::GetInstance()
|
||||
->EnterVideoPictureInPicture(web_contents);
|
||||
#else
|
||||
return content::PictureInPictureResult::kNotSupported;
|
||||
#endif
|
||||
|
@ -3687,7 +3686,8 @@ void WebContents::DevToolsIndexPath(
|
|||
std::unique_ptr<base::Value> parsed_excluded_folders =
|
||||
base::JSONReader::ReadDeprecated(excluded_folders_message);
|
||||
if (parsed_excluded_folders && parsed_excluded_folders->is_list()) {
|
||||
for (const base::Value& folder_path : parsed_excluded_folders->GetList()) {
|
||||
for (const base::Value& folder_path :
|
||||
parsed_excluded_folders->GetListDeprecated()) {
|
||||
if (folder_path.is_string())
|
||||
excluded_folders.push_back(folder_path.GetString());
|
||||
}
|
||||
|
|
|
@ -500,7 +500,7 @@ class WebContents : public ExclusiveAccessContext,
|
|||
const GURL& opener_url,
|
||||
const std::string& frame_name,
|
||||
const GURL& target_url,
|
||||
const content::StoragePartitionId& partition_id,
|
||||
const content::StoragePartitionConfig& partition_config,
|
||||
content::SessionStorageNamespace* session_storage_namespace) override;
|
||||
void WebContentsCreatedWithFullParams(
|
||||
content::WebContents* source_contents,
|
||||
|
@ -689,9 +689,7 @@ class WebContents : public ExclusiveAccessContext,
|
|||
bool IsFullscreenForTabOrPending(const content::WebContents* source) override;
|
||||
bool TakeFocus(content::WebContents* source, bool reverse) override;
|
||||
content::PictureInPictureResult EnterPictureInPicture(
|
||||
content::WebContents* web_contents,
|
||||
const viz::SurfaceId&,
|
||||
const gfx::Size& natural_size) override;
|
||||
content::WebContents* web_contents) override;
|
||||
void ExitPictureInPicture() override;
|
||||
|
||||
// InspectableWebContentsDelegate:
|
||||
|
|
|
@ -145,6 +145,8 @@ void FrameSubscriber::OnFrameCaptured(
|
|||
Done(content_rect, bitmap);
|
||||
}
|
||||
|
||||
void FrameSubscriber::OnFrameWithEmptyRegionCapture() {}
|
||||
|
||||
void FrameSubscriber::OnStopped() {}
|
||||
|
||||
void FrameSubscriber::OnLog(const std::string& message) {}
|
||||
|
|
|
@ -59,6 +59,7 @@ class FrameSubscriber : public content::WebContentsObserver,
|
|||
const gfx::Rect& content_rect,
|
||||
mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
|
||||
callbacks) override;
|
||||
void OnFrameWithEmptyRegionCapture() override;
|
||||
void OnStopped() override;
|
||||
void OnLog(const std::string& message) override;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue