chore: bump chromium to ec5bc1743792d64724693eb357083 (master) (#24984)
* chore: bump chromium in DEPS to cbdeef954dfc34e94c8ca9cf72ad326b4a121158 * chore: bump chromium in DEPS to 29723f905baeab1d4228eef2c31cdb341ebeffe0 * chore: bump chromium in DEPS to 44d6d78e852137fff58c14ed26ab1e803e5bf822 * update patches * chore: bump chromium in DEPS to 8a3a0fccb39d6b8334c9a0496c0d5056e50cdb3f * chore: update patches * refactor: fix PrintBackend::CreateInstance() calls Refs:2354541* chore: bump chromium in DEPS to b9ebec3bcb1cabdd1426f367636f54cc98e0500e * chore: remove patches to code that was deleted upstream CL:2360314* Remove uses of kCGColorSpaceITUR_2020_PQ_EOTF/HLG CL:2363950just garden variety code shear * chore: update patch indices * Move ColorModel to //printing/mojom/print.mojom2355083sync with printing ColorModel changes: moved to mojo, different naming scheme * chore: bump chromium in DEPS to 56c4b4d2ce5ba941acd2e0fdb5100e8a48847134 * chore: bump chromium in DEPS to 130501f220b684a79dc82c17e236e63ac1f2a093 * Convert PrintHostMsg_DidGetPrintedPagesCount to Mojo2326857Update argument list to Print() * chore: update patch indices * DumpAccTree: convert utf16 to utf8 in PropertyFilter2360218* chore: bump chromium in DEPS to 3058368c6646e0dc8be6f8ea838b0343428b7998 * chore: bump chromium in DEPS to f51b4e6555364363c61438dac7afd988c8347bfc * chore: bump chromium in DEPS to 2dcc6f8fc23ac41b2499eb69dee0b4017e9d1046 * update patches * chore: bump chromium in DEPS to 2d8e98ecedc7e4905540b053bc1c87e964715be5 * update patches * 2345900: Move content::RecordContentToVisibleTimeRequest struct to mojo2345900* update patches * 2345900: Move content::RecordContentToVisibleTimeRequest struct to mojo2345900* 2367394: Remove net::LOAD_DO_NOT_SEND_COOKIES and net::LOAD_DO_NOT_SEND_AUTH_DATA.2367394* 2373227: [XProto] Consolidate all <X11/*> includes to //ui/gfx/x/x11.h2373227* fixup! 2373227: [XProto] Consolidate all <X11/*> includes to //ui/gfx/x/x11.h * chore: bump chromium in DEPS to c090e3f960520cbd2328608b97f87238c76d6143 * update patches * chore: bump chromium in DEPS to 13a25e0a755de9a14271022c595f3d2e29829e1a * chore: bump chromium in DEPS to 6adbb767b012c41efaeab0d1bdbb3eefed0977bc * chore: bump chromium in DEPS to 339ec5455c5932ef1322ea9953a6349b0732199e * chore: bump chromium in DEPS to 20291807c33f7ef4ef4f57d62075e099b027bfe6 * chore: bump chromium in DEPS to 226fbd1b8b17d4ac84fdb9548ef3a1c646878d47 * update patches * fixup disable_color_correct_rendering patch * chore: bump chromium in DEPS to 577c45979cad4359f2e206d68efd9317d3d79315 * update patches * viz: Rename RenderPass to CompositorRenderPass (and related types).2380730* chore: bump chromium in DEPS to 37e2ad5303f2c03a1b5d8eda65341bf2561196cd * update patches * add kOmitCookies_Electron * update patch * chore: bump chromium in DEPS to 256e42409ea63a7e71016de07818a983a97db463 * update patches * fix worker script ready hook2335713* Fixup printing page ranges patch * [printing] Move PrintMsg_PrintPages_Params to print.mojom2340854* Add MIME sniffer overloads that take base::StringPieces2382896* [printing] Move PrintHostMsg_PreviewIds to print.mojom2379455* fixup test due to new DCHECK2333750* stop sending cookies when useSessionCookies is false * chore: bump chromium in DEPS to dd429dbc556449951ee8160d8a4d61fd95a139d5 * update patches * chore: bump chromium in DEPS to 5202bde3f9f44c2065f5dacf27e7000dd19e4e4d * chore: bump chromium in DEPS to 099e8e07b89da65932431bb0fd51b6f7f5344c19 * chore: bump chromium in DEPS to 104e5da2a43b759732d5b94bfc750b3a9a639653 * chore: bump chromium in DEPS to a4519ce657af25834e355315fd7fefa77b13426a * update patches * Make FileURLLoaderFactory always owned by its |receivers_|.2337411* Make FileURLLoaderFactory always owned by its |receivers_|.2337411* chore: bump chromium in DEPS to 1b62e9e8c8eaf6b8e3a9c77ee67a4c1bfa6a4d6b * chore: update patches * fixup! Make FileURLLoaderFactory always owned by its |receivers_|. * chore: update patches - mac: Disable CoreServices _CSCheckFix.2401334- [XProto] Remove bad DCHECK in x11_error_tracker.cc2402304- Move content/browser/frame_host/* over to content/browser/renderer_host/2401303* Refactor WebContentSettingsClient to dedupe AllowXYZ methods2353552* Introduce NonNetworkURLLoaderFactoryBase class.2357559* [XProto] Remove usage of all Xlib headers2392140* fixup! chore: update patches * chore: bump chromium in DEPS to c1df55fbeb8207d036a604f59e4ea4e8ee79930a * chore: update patches * Move content::WebPreferences struct to Blink2397670* chore: bump chromium in DEPS to 57a23ec4884fff6c2f8d9b8536131cdc9b551ec2 * Set appid on Pip windows.2388274* fixup! Set appid on Pip windows. * fix: add a patch to remove deprecated factory * chore: bump chromium in DEPS to 1a9ddb7ea43955877823d5c4dcbf241b64228635 * fix compilation on windows * chore: bump chromium in DEPS to 234e6c6a77f61ffad9335099d9b13892cf88fd44 * chore: update patches * chore: bump chromium in DEPS to 7631eb0a9f57a8a47d3c28e1d265961b3a4d6b2b * chore: update patches * chore: bump chromium in DEPS to f9c34cd485845b95c2d17a7f55fdf92cda9a1b3a * chore: update patches * chore: implement GetSurveyAPIKey Refs:2362182* chore: replace CreateWebUIURLLoader with CreateWebUIURLLoaderFactory Refs:2358309* chore: bump chromium in DEPS to 5bdbd2373da884adf41c087be1465fcc344d168c * chore: update node patches for common.gypi * chore: update patches * chore: non_network_url_loader_factory_base was moved Refs:2357431* 2415752: Reland "Reland "OOR-CORS: Remove BlinkCORS supporting code outside Blink"" Refs:2415752* chore: bump chromium in DEPS to b943d006a33ec5bc1743792d64724693eb357083 * fix: replace x11::None with x11::Window::None * chore: update patches * chore: update patches * fix: cast x11::Window to int * 2402123: Use end date when deleting http auth cache Refs:2402123* 2320268: Migrate DragHostMsg_StartDragging to Mojo Refs:2320268* 2401303: Move content/browser/frame_host/* over to content/browser/renderer_host/2401303* chore: fix lint * chore: fix build * Update config.yml Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Samuel Attard <sattard@slack-corp.com>
This commit is contained in:
Electron Bot
GitHub
parent
e50d6e47c4
commit
69f1731bbb
107 changed files with 956 additions and 853 deletions
|
|
@ -34,6 +34,7 @@
|
|||
#include "content/public/browser/browser_task_traits.h"
|
||||
#include "content/public/browser/client_certificate_delegate.h"
|
||||
#include "content/public/browser/login_delegate.h"
|
||||
#include "content/public/browser/non_network_url_loader_factory_base.h"
|
||||
#include "content/public/browser/overlay_window.h"
|
||||
#include "content/public/browser/render_frame_host.h"
|
||||
#include "content/public/browser/render_process_host.h"
|
||||
|
|
@ -46,7 +47,6 @@
|
|||
#include "content/public/common/content_switches.h"
|
||||
#include "content/public/common/service_names.mojom.h"
|
||||
#include "content/public/common/url_constants.h"
|
||||
#include "content/public/common/web_preferences.h"
|
||||
#include "electron/buildflags/buildflags.h"
|
||||
#include "electron/grit/electron_resources.h"
|
||||
#include "mojo/public/cpp/bindings/binder_map.h"
|
||||
|
|
@ -97,6 +97,7 @@
|
|||
#include "shell/common/options_switches.h"
|
||||
#include "shell/common/platform_util.h"
|
||||
#include "third_party/blink/public/common/loader/url_loader_throttle.h"
|
||||
#include "third_party/blink/public/common/web_preferences/web_preferences.h"
|
||||
#include "third_party/blink/public/mojom/badging/badging.mojom.h"
|
||||
#include "ui/base/resource/resource_bundle.h"
|
||||
#include "ui/native_theme/native_theme.h"
|
||||
|
|
@ -180,6 +181,15 @@
|
|||
#include "components/crash/core/app/crashpad.h" // nogncheck
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(ENABLE_PICTURE_IN_PICTURE) && defined(OS_WIN)
|
||||
#include "chrome/browser/ui/views/overlay/overlay_window_views.h"
|
||||
#include "shell/browser/browser.h"
|
||||
#include "ui/aura/window.h"
|
||||
#include "ui/aura/window_tree_host.h"
|
||||
#include "ui/base/win/shell.h"
|
||||
#include "ui/views/widget/widget.h"
|
||||
#endif
|
||||
|
||||
using content::BrowserThread;
|
||||
|
||||
namespace electron {
|
||||
|
|
@ -575,7 +585,7 @@ content::TtsPlatform* ElectronBrowserClient::GetTtsPlatform() {
|
|||
|
||||
void ElectronBrowserClient::OverrideWebkitPrefs(
|
||||
content::RenderViewHost* host,
|
||||
content::WebPreferences* prefs) {
|
||||
blink::web_pref::WebPreferences* prefs) {
|
||||
prefs->javascript_enabled = true;
|
||||
prefs->web_security_enabled = true;
|
||||
prefs->plugins_enabled = true;
|
||||
|
|
@ -915,7 +925,19 @@ bool ElectronBrowserClient::CanCreateWindow(
|
|||
std::unique_ptr<content::OverlayWindow>
|
||||
ElectronBrowserClient::CreateWindowForPictureInPicture(
|
||||
content::PictureInPictureWindowController* controller) {
|
||||
return content::OverlayWindow::Create(controller);
|
||||
auto overlay_window = content::OverlayWindow::Create(controller);
|
||||
#if defined(OS_WIN)
|
||||
base::string16 app_user_model_id = Browser::Get()->GetAppUserModelID();
|
||||
if (!app_user_model_id.empty()) {
|
||||
OverlayWindowViews* overlay_window_view =
|
||||
static_cast<OverlayWindowViews*>(overlay_window.get());
|
||||
ui::win::SetAppIdForWindow(app_user_model_id,
|
||||
overlay_window_view->GetNativeWindow()
|
||||
->GetHost()
|
||||
->GetAcceleratedWidget());
|
||||
}
|
||||
#endif
|
||||
return overlay_window;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -1271,12 +1293,13 @@ void ElectronBrowserClient::SetUserAgent(const std::string& user_agent) {
|
|||
void ElectronBrowserClient::RegisterNonNetworkNavigationURLLoaderFactories(
|
||||
int frame_tree_node_id,
|
||||
base::UkmSourceId ukm_source_id,
|
||||
NonNetworkURLLoaderFactoryDeprecatedMap* uniquely_owned_factories,
|
||||
NonNetworkURLLoaderFactoryMap* factories) {
|
||||
content::WebContents* web_contents =
|
||||
content::WebContents::FromFrameTreeNodeId(frame_tree_node_id);
|
||||
content::BrowserContext* context = web_contents->GetBrowserContext();
|
||||
#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
|
||||
factories->emplace(
|
||||
uniquely_owned_factories->emplace(
|
||||
extensions::kExtensionScheme,
|
||||
extensions::CreateExtensionNavigationURLLoaderFactory(
|
||||
context, ukm_source_id,
|
||||
|
|
@ -1302,11 +1325,28 @@ namespace {
|
|||
|
||||
// The FileURLLoaderFactory provided to the extension background pages.
|
||||
// Checks with the ChildProcessSecurityPolicy to validate the file access.
|
||||
class FileURLLoaderFactory : public network::mojom::URLLoaderFactory {
|
||||
class FileURLLoaderFactory : public content::NonNetworkURLLoaderFactoryBase {
|
||||
public:
|
||||
explicit FileURLLoaderFactory(int child_id) : child_id_(child_id) {}
|
||||
static mojo::PendingRemote<network::mojom::URLLoaderFactory> Create(
|
||||
int child_id) {
|
||||
mojo::PendingRemote<network::mojom::URLLoaderFactory> pending_remote;
|
||||
|
||||
// The FileURLLoaderFactory will delete itself when there are no more
|
||||
// receivers - see the NonNetworkURLLoaderFactoryBase::OnDisconnect method.
|
||||
new FileURLLoaderFactory(child_id,
|
||||
pending_remote.InitWithNewPipeAndPassReceiver());
|
||||
|
||||
return pending_remote;
|
||||
}
|
||||
|
||||
private:
|
||||
explicit FileURLLoaderFactory(
|
||||
int child_id,
|
||||
mojo::PendingReceiver<network::mojom::URLLoaderFactory> factory_receiver)
|
||||
: content::NonNetworkURLLoaderFactoryBase(std::move(factory_receiver)),
|
||||
child_id_(child_id) {}
|
||||
~FileURLLoaderFactory() override = default;
|
||||
|
||||
// network::mojom::URLLoaderFactory:
|
||||
void CreateLoaderAndStart(
|
||||
mojo::PendingReceiver<network::mojom::URLLoader> loader,
|
||||
|
|
@ -1330,13 +1370,8 @@ class FileURLLoaderFactory : public network::mojom::URLLoaderFactory {
|
|||
/* allow_directory_listing */ true);
|
||||
}
|
||||
|
||||
void Clone(
|
||||
mojo::PendingReceiver<network::mojom::URLLoaderFactory> loader) override {
|
||||
receivers_.Add(this, std::move(loader));
|
||||
}
|
||||
|
||||
int child_id_;
|
||||
mojo::ReceiverSet<network::mojom::URLLoaderFactory> receivers_;
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(FileURLLoaderFactory);
|
||||
};
|
||||
|
||||
|
|
@ -1346,6 +1381,7 @@ class FileURLLoaderFactory : public network::mojom::URLLoaderFactory {
|
|||
void ElectronBrowserClient::RegisterNonNetworkSubresourceURLLoaderFactories(
|
||||
int render_process_id,
|
||||
int render_frame_id,
|
||||
NonNetworkURLLoaderFactoryDeprecatedMap* uniquely_owned_factories,
|
||||
NonNetworkURLLoaderFactoryMap* factories) {
|
||||
content::RenderFrameHost* frame_host =
|
||||
content::RenderFrameHost::FromID(render_process_id, render_frame_id);
|
||||
|
|
@ -1361,7 +1397,8 @@ void ElectronBrowserClient::RegisterNonNetworkSubresourceURLLoaderFactories(
|
|||
auto factory = extensions::CreateExtensionURLLoaderFactory(render_process_id,
|
||||
render_frame_id);
|
||||
if (factory)
|
||||
factories->emplace(extensions::kExtensionScheme, std::move(factory));
|
||||
uniquely_owned_factories->emplace(extensions::kExtensionScheme,
|
||||
std::move(factory));
|
||||
|
||||
if (!web_contents)
|
||||
return;
|
||||
|
|
@ -1385,10 +1422,10 @@ void ElectronBrowserClient::RegisterNonNetworkSubresourceURLLoaderFactories(
|
|||
extensions::Manifest::IsComponentLocation(extension->location())) {
|
||||
// Components of chrome that are implemented as extensions or platform apps
|
||||
// are allowed to use chrome://resources/ and chrome://theme/ URLs.
|
||||
factories->emplace(
|
||||
content::kChromeUIScheme,
|
||||
content::CreateWebUIURLLoader(frame_host, content::kChromeUIScheme,
|
||||
{content::kChromeUIResourcesHost}));
|
||||
factories->emplace(content::kChromeUIScheme,
|
||||
content::CreateWebUIURLLoaderFactory(
|
||||
frame_host, content::kChromeUIScheme,
|
||||
{content::kChromeUIResourcesHost}));
|
||||
}
|
||||
|
||||
// Extension with a background page get file access that gets approval from
|
||||
|
|
@ -1397,8 +1434,8 @@ void ElectronBrowserClient::RegisterNonNetworkSubresourceURLLoaderFactories(
|
|||
extensions::ProcessManager::Get(web_contents->GetBrowserContext())
|
||||
->GetBackgroundHostForExtension(extension->id());
|
||||
if (host) {
|
||||
factories->emplace(url::kFileScheme, std::make_unique<FileURLLoaderFactory>(
|
||||
render_process_id));
|
||||
factories->emplace(url::kFileScheme,
|
||||
FileURLLoaderFactory::Create(render_process_id));
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1496,10 +1533,10 @@ bool ElectronBrowserClient::WillCreateURLLoaderFactory(
|
|||
ProtocolRegistry::FromBrowserContext(browser_context);
|
||||
new ProxyingURLLoaderFactory(
|
||||
web_request.get(), protocol_registry->intercept_handlers(),
|
||||
browser_context, render_process_id, &next_id_,
|
||||
std::move(navigation_ui_data), std::move(navigation_id),
|
||||
std::move(proxied_receiver), std::move(target_factory_remote),
|
||||
std::move(header_client_receiver), type);
|
||||
render_process_id, &next_id_, std::move(navigation_ui_data),
|
||||
std::move(navigation_id), std::move(proxied_receiver),
|
||||
std::move(target_factory_remote), std::move(header_client_receiver),
|
||||
type);
|
||||
|
||||
if (bypass_redirect_checks)
|
||||
*bypass_redirect_checks = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue