chore: bump chromium to 99.0.4767.0 (main) (#31986)
* chore: bump chromium in DEPS to 98.0.4726.0 * 3292117: Remove unneeded base/compiler_specific.h includes in //chrome.3292117* 3289198: Enables calculating line, word and sentence boundaries on the browser3289198* 3276176: Remove expired gdi-text-printing flag and associated code.3276176* 3240963: content: allow embedder to prevent locking scheme registry3240963* 3269899: Rename WebContentsImpl::GetFrameTree to GetPrimaryFrameTree3269899* chore: fixup patch indices * 3276279: Enable -Wshadow by default for the "chromium code" config.3276279* 3279737: appcache: Remove WebPreference/WebSetting3279737* 3275564: [api] Advance API deprecation for APIs last marked in v9.63275564* 3261873: Clean up WebScriptSource constructors3261873* 3279346: appcache: Remove ConsoleMessage appcache field3279346* 3264212: Move legacy file loading to legacy_test_runner3264212Both Persistence and UI have been removed from globals, but the issues they seemed to be patching are no longer reproducible from what I can tell, and so we can just delete these and re-evaluate if something surfaces. * 3290415: x11: remove the USE_X11 define.3290415* chore: bump Chromium to 98.0.4728.0 * 3179530: Defer system calls in PrintingContext for OOP printing3179530* 3299445: Consolidate is_win conditionals in chrome/test/BUILD.gn.3299445* chore: update patch indices * 3223975: Break PrintJobWorker OOP logic into separate class3223975* chore: bump chromium in DEPS to 98.0.4730.0 * 3279001: Remove support for font-family: -webkit-pictograph3279001* chore: fixup patch indices * chore: bump chromium in DEPS to 98.0.4732.0 * chore: update patches * chore: bump chromium in DEPS to 98.0.4734.0 * chore: bump chromium in DEPS to 98.0.4736.0 * chore: update patches * chore: update printing patch for miracle ptr * chore: add noexcept to fix clang error * chore: bump chromium in DEPS to 98.0.4738.0 * chore: update patches * chore: bump chromium in DEPS to 98.0.4740.0 * chore: bump chromium in DEPS to 98.0.4742.0 * chore: bump chromium in DEPS to 98.0.4744.0 * chore: bump chromium in DEPS to 98.0.4746.0 * chore: bump chromium in DEPS to 98.0.4748.0 * chore: bump chromium in DEPS to 98.0.4750.0 * chore: update patches * 3293841: Remove File Handling permissions code Ref:3293841* chore: update patches 3311700: Move the PpapiPluginSandboxedProcessLauncherDelegate |3311700* 3289260: [CodeHealth]: Remove uses of Notification Service Ref:3289260* 3301600: Disable scripted print in fenced frames Ref:3301600* chore: add missing thread_restrictions headers * 3305132: Rewrite most `Foo* field_` pointer fields to `raw_ptr<Foo> field_`. Ref:3305132* fix: add ppapi_sandbox header for linux 3311700: Move the PpapiPluginSandboxedProcessLauncherDelegate |3311700* chore: manually bump chromium in DEPS to 98.0.4757.0 * chore: update patches * 3321044: Remove DictionaryValue::Clear() Ref:3321044* chore: update printing.patch Refs: - 3304556: [code health] Remove notification observation from PrintJob. |3304556- 3305095: [code health] Remove NotificationService from PrintViewManagerBase. |3305095* build: add v8-embedder-state headers to GN patch * chore: bump chromium in DEPS to 99.0.4767.0 * chore: update patches * chore: rename CookiePartitionKeychain ...to CookiePartitionKeyCollection * chore: update video consumers * refactor: use newer base::Value API * 3232598: Convert net::DnsOverHttpsServerConfig into a class |3232598* 3327865: Remove the default WebContentsUserData ctor. |3327865* 3302814: DevTools: Add getPreference binding |3302814* 3301474: [tq][runtime] Use build flags for JS context promise hooks |3301474* oops 😵💫 * 3272411: Reland "base/allocator: Enable PartitionAlloc-Everywhere on macOS" |3272411build: turn PartitionAlloc back off on mac for now * fix: WCO method got renamed * 3344749: Revert "Stop using NSRunLoop in renderer process"3344749* 3288746: [serial] Fix BluetoothSerialDeviceEnumerator threading issues.3288746* Revert "3288746: [serial] Fix BluetoothSerialDeviceEnumerator threading issues." This reverts commit 5cc69f102e43ca72ac9ef45063711bcc7d849740. * chore: disable serial device enumerator sequence dcheck * fix: comment out line in DeviceService dtor * fixup! 3279001: Remove support for font-family: -webkit-pictograph * fixup! 3279346: appcache: Remove ConsoleMessage appcache field * chore: update patches after rebase Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: VerteDinde <khammond@slack-corp.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
This commit is contained in:
electron-roller[bot]
GitHub
parent
483808a8cf
commit
b0f315a637
134 changed files with 985 additions and 947 deletions
|
|
@ -33,6 +33,7 @@
|
|||
#include "content/public/browser/render_frame_host.h"
|
||||
#include "content/public/common/content_switches.h"
|
||||
#include "media/audio/audio_manager.h"
|
||||
#include "net/dns/public/dns_over_https_server_config.h"
|
||||
#include "net/dns/public/util.h"
|
||||
#include "net/ssl/client_cert_identity.h"
|
||||
#include "net/ssl/ssl_cert_request_info.h"
|
||||
|
|
@ -1640,31 +1641,15 @@ void ConfigureHostResolver(v8::Isolate* isolate,
|
|||
}
|
||||
std::string server_method;
|
||||
std::vector<net::DnsOverHttpsServerConfig> dns_over_https_servers;
|
||||
absl::optional<std::vector<network::mojom::DnsOverHttpsServerPtr>>
|
||||
servers_mojo;
|
||||
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 (!net::dns_util::IsValidDohTemplate(server_template, &server_method)) {
|
||||
continue;
|
||||
if (auto server_config = net::DnsOverHttpsServerConfig::FromString(
|
||||
std::string(server_template))) {
|
||||
dns_over_https_servers.push_back(server_config.value());
|
||||
}
|
||||
|
||||
bool use_post = server_method == "POST";
|
||||
dns_over_https_servers.emplace_back(std::string(server_template),
|
||||
use_post);
|
||||
|
||||
if (!servers_mojo.has_value()) {
|
||||
servers_mojo = absl::make_optional<
|
||||
std::vector<network::mojom::DnsOverHttpsServerPtr>>();
|
||||
}
|
||||
|
||||
network::mojom::DnsOverHttpsServerPtr server_mojo =
|
||||
network::mojom::DnsOverHttpsServer::New();
|
||||
server_mojo->server_template = std::string(server_template);
|
||||
server_mojo->use_post = use_post;
|
||||
servers_mojo->emplace_back(std::move(server_mojo));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1691,25 +1676,16 @@ void ConfigureHostResolver(v8::Isolate* isolate,
|
|||
thrower.ThrowTypeError("secureDnsServers must be an array of strings");
|
||||
return;
|
||||
}
|
||||
servers_mojo = absl::nullopt;
|
||||
dns_over_https_servers.clear();
|
||||
for (const std::string& server_template : secure_dns_server_strings) {
|
||||
std::string server_method;
|
||||
if (!net::dns_util::IsValidDohTemplate(server_template, &server_method)) {
|
||||
if (auto server_config =
|
||||
net::DnsOverHttpsServerConfig::FromString(server_template)) {
|
||||
dns_over_https_servers.push_back(server_config.value());
|
||||
} else {
|
||||
thrower.ThrowTypeError(std::string("not a valid DoH template: ") +
|
||||
server_template);
|
||||
return;
|
||||
}
|
||||
bool use_post = server_method == "POST";
|
||||
if (!servers_mojo.has_value()) {
|
||||
servers_mojo = absl::make_optional<
|
||||
std::vector<network::mojom::DnsOverHttpsServerPtr>>();
|
||||
}
|
||||
|
||||
network::mojom::DnsOverHttpsServerPtr server_mojo =
|
||||
network::mojom::DnsOverHttpsServer::New();
|
||||
server_mojo->server_template = std::string(server_template);
|
||||
server_mojo->use_post = use_post;
|
||||
servers_mojo->emplace_back(std::move(server_mojo));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1723,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(servers_mojo),
|
||||
additional_dns_query_types_enabled);
|
||||
enable_built_in_resolver, secure_dns_mode,
|
||||
std::move(dns_over_https_servers), additional_dns_query_types_enabled);
|
||||
}
|
||||
|
||||
// static
|
||||
|
|
|
|||
|
|
@ -249,7 +249,7 @@ v8::Local<v8::Promise> Cookies::Get(v8::Isolate* isolate,
|
|||
options.set_do_not_update_access_time();
|
||||
|
||||
manager->GetCookieList(GURL(url), options,
|
||||
net::CookiePartitionKeychain::Todo(),
|
||||
net::CookiePartitionKeyCollection::Todo(),
|
||||
base::BindOnce(&FilterCookieWithStatuses,
|
||||
std::move(dict), std::move(promise)));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,8 +39,6 @@ std::string MessageSourceToString(
|
|||
return "console-api";
|
||||
if (source == blink::mojom::ConsoleMessageSource::kStorage)
|
||||
return "storage";
|
||||
if (source == blink::mojom::ConsoleMessageSource::kAppCache)
|
||||
return "app-cache";
|
||||
if (source == blink::mojom::ConsoleMessageSource::kRendering)
|
||||
return "rendering";
|
||||
if (source == blink::mojom::ConsoleMessageSource::kSecurity)
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
#include "media/capture/mojom/video_capture_buffer.mojom.h"
|
||||
#include "media/capture/mojom/video_capture_types.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/remote.h"
|
||||
#include "services/viz/privileged/mojom/compositing/frame_sink_video_capture.mojom-shared.h"
|
||||
#include "ui/gfx/geometry/size_conversions.h"
|
||||
#include "ui/gfx/image/image.h"
|
||||
#include "ui/gfx/skbitmap_operations.h"
|
||||
|
|
@ -49,10 +50,9 @@ void FrameSubscriber::AttachToHost(content::RenderWidgetHost* host) {
|
|||
video_capturer_->SetResolutionConstraints(size, size, true);
|
||||
video_capturer_->SetAutoThrottlingEnabled(false);
|
||||
video_capturer_->SetMinSizeChangePeriod(base::TimeDelta());
|
||||
video_capturer_->SetFormat(media::PIXEL_FORMAT_ARGB,
|
||||
gfx::ColorSpace::CreateREC709());
|
||||
video_capturer_->SetFormat(media::PIXEL_FORMAT_ARGB);
|
||||
video_capturer_->SetMinCapturePeriod(base::Seconds(1) / kMaxFrameRate);
|
||||
video_capturer_->Start(this);
|
||||
video_capturer_->Start(this, viz::mojom::BufferFormatPreference::kDefault);
|
||||
}
|
||||
|
||||
void FrameSubscriber::DetachFromHost() {
|
||||
|
|
@ -83,11 +83,13 @@ void FrameSubscriber::RenderViewHostChanged(content::RenderViewHost* old_host,
|
|||
}
|
||||
|
||||
void FrameSubscriber::OnFrameCaptured(
|
||||
base::ReadOnlySharedMemoryRegion data,
|
||||
::media::mojom::VideoBufferHandlePtr data,
|
||||
::media::mojom::VideoFrameInfoPtr info,
|
||||
const gfx::Rect& content_rect,
|
||||
mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
|
||||
callbacks) {
|
||||
auto& data_region = data->get_read_only_shmem_region();
|
||||
|
||||
gfx::Size size = GetRenderViewSize();
|
||||
if (size != content_rect.size()) {
|
||||
video_capturer_->SetResolutionConstraints(size, size, true);
|
||||
|
|
@ -97,11 +99,11 @@ void FrameSubscriber::OnFrameCaptured(
|
|||
|
||||
mojo::Remote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
|
||||
callbacks_remote(std::move(callbacks));
|
||||
if (!data.IsValid()) {
|
||||
if (!data_region.IsValid()) {
|
||||
callbacks_remote->Done();
|
||||
return;
|
||||
}
|
||||
base::ReadOnlySharedMemoryMapping mapping = data.Map();
|
||||
base::ReadOnlySharedMemoryMapping mapping = data_region.Map();
|
||||
if (!mapping.IsValid()) {
|
||||
DLOG(ERROR) << "Shared memory mapping failed.";
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
#include "components/viz/host/client_frame_sink_video_capturer.h"
|
||||
#include "content/public/browser/web_contents.h"
|
||||
#include "content/public/browser/web_contents_observer.h"
|
||||
#include "media/capture/mojom/video_capture_buffer.mojom-forward.h"
|
||||
#include "mojo/public/cpp/bindings/pending_remote.h"
|
||||
#include "v8/include/v8.h"
|
||||
|
||||
|
|
@ -53,7 +54,7 @@ class FrameSubscriber : public content::WebContentsObserver,
|
|||
|
||||
// viz::mojom::FrameSinkVideoConsumer implementation.
|
||||
void OnFrameCaptured(
|
||||
base::ReadOnlySharedMemoryRegion data,
|
||||
::media::mojom::VideoBufferHandlePtr data,
|
||||
::media::mojom::VideoFrameInfoPtr info,
|
||||
const gfx::Rect& content_rect,
|
||||
mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue