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

chore: bump chromium to 121.0.6104.0 (main) (#40418)

Browse source 
* chore: bump chromium in DEPS to 121.0.6101.0

* chore: update patches

* Explictly use python3 to check patch diff

* chore: bump chromium in DEPS to 121.0.6102.0

* chore: update patches

* 4995136: [extensions] Enable Extension Mojo messaging

4995136

* Bind the components interfaces to a RenderFrame

4985961
Also:
3986427: Create RendererHost mojom interface for Extensions | 3986427

* 4997024: Enum modernisation for resources_private.idl

4997024

* 4997025: Enum modernisation for scripting.idl

4997025

* chore: bump chromium in DEPS to 121.0.6103.0

* chore: update patches

* chore: bump chromium in DEPS to 121.0.6104.0

* chore: update patches

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
electron-roller[bot] 2023-11-03 15:37:55 -04:00 • committed by GitHub
parent 5b18d90597
commit ee108903a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 203 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

16
shell/browser/electron_browser_client.cc
View file

@ -144,7 +144,9 @@
#endif // BUILDFLAG(OVERRIDE_LOCATION_PROVIDER)
#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
#include "base/functional/bind.h"
#include "chrome/common/webui_url_constants.h"
#include "components/guest_view/common/guest_view.mojom.h"
#include "content/public/browser/child_process_security_policy.h"
#include "content/public/browser/file_url_loader.h"
#include "content/public/browser/web_ui_url_loader_factory.h"
@ -164,11 +166,15 @@
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
#include "extensions/browser/process_manager.h"
#include "extensions/browser/process_map.h"
#include "extensions/browser/renderer_startup_helper.h"
#include "extensions/browser/service_worker/service_worker_host.h"
#include "extensions/browser/url_loader_factory_manager.h"
#include "extensions/common/api/mime_handler.mojom.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
#include "extensions/common/mojom/event_router.mojom.h"
#include "extensions/common/mojom/guest_view.mojom.h"
#include "extensions/common/mojom/renderer_host.mojom.h"
#include "extensions/common/switches.h"
#include "shell/browser/extensions/electron_extension_message_filter.h"
#include "shell/browser/extensions/electron_extension_system.h"
@ -1484,6 +1490,12 @@ void ElectronBrowserClient::
std::move(receiver), render_frame_host);
},
&render_frame_host));
associated_registry.AddInterface<guest_view::mojom::GuestViewHost>(
base::BindRepeating(&extensions::ExtensionsGuestView::CreateForComponents,
render_frame_host.GetGlobalId()));
associated_registry.AddInterface<extensions::mojom::GuestView>(
base::BindRepeating(&extensions::ExtensionsGuestView::CreateForExtensions,
render_frame_host.GetGlobalId()));
#endif
#if BUILDFLAG(ENABLE_PDF_VIEWER)
associated_registry.AddInterface<pdf::mojom::PdfService>(base::BindRepeating(
@ -1559,8 +1571,8 @@ void ElectronBrowserClient::ExposeInterfacesToRenderer(
associated_registry->AddInterface<extensions::mojom::EventRouter>(
base::BindRepeating(&extensions::EventRouter::BindForRenderer,
render_process_host->GetID()));
associated_registry->AddInterface<extensions::mojom::GuestView>(
base::BindRepeating(&extensions::ExtensionsGuestView::CreateForExtensions,
associated_registry->AddInterface<extensions::mojom::RendererHost>(
base::BindRepeating(&extensions::RendererStartupHelper::BindForRenderer,
render_process_host->GetID()));
associated_registry->AddInterface<extensions::mojom::ServiceWorkerHost>(
base::BindRepeating(&extensions::ServiceWorkerHost::BindReceiver,

6
shell/browser/extensions/api/resources_private/resources_private_api.cc
View file

@ -47,17 +47,17 @@ ExtensionFunction::ResponseAction ResourcesPrivateGetStringsFunction::Run() {
api::resources_private::Component component = params->component;
switch (component) {
case api::resources_private::COMPONENT_PDF:
case api::resources_private::Component::kPdf:
#if BUILDFLAG(ENABLE_PDF_VIEWER)
pdf_extension_util::AddStrings(
pdf_extension_util::PdfViewerContext::kPdfViewer, &dict);
pdf_extension_util::AddAdditionalData(true, false, &dict);
#endif
break;
case api::resources_private::COMPONENT_IDENTITY:
case api::resources_private::Component::kIdentity:
NOTREACHED();
break;
case api::resources_private::COMPONENT_NONE:
case api::resources_private::Component::kNone:
NOTREACHED();
break;
}

18
shell/browser/extensions/api/scripting/scripting_api.cc
View file

@ -65,11 +65,11 @@ mojom::CSSOrigin ConvertStyleOriginToCSSOrigin(
api::scripting::StyleOrigin style_origin) {
mojom::CSSOrigin css_origin = mojom::CSSOrigin::kAuthor;
switch (style_origin) {
case api::scripting::STYLE_ORIGIN_NONE:
case api::scripting::STYLE_ORIGIN_AUTHOR:
case api::scripting::StyleOrigin::kNone:
case api::scripting::StyleOrigin::kAuthor:
css_origin = mojom::CSSOrigin::kAuthor;
break;
case api::scripting::STYLE_ORIGIN_USER:
case api::scripting::StyleOrigin::kUser:
css_origin = mojom::CSSOrigin::kUser;
break;
}
@ -81,10 +81,10 @@ mojom::ExecutionWorld ConvertExecutionWorld(
api::scripting::ExecutionWorld world) {
mojom::ExecutionWorld execution_world = mojom::ExecutionWorld::kIsolated;
switch (world) {
case api::scripting::EXECUTION_WORLD_NONE:
case api::scripting::EXECUTION_WORLD_ISOLATED:
case api::scripting::ExecutionWorld::kNone:
case api::scripting::ExecutionWorld::kIsolated:
break; // Default to mojom::ExecutionWorld::kIsolated.
case api::scripting::EXECUTION_WORLD_MAIN:
case api::scripting::ExecutionWorld::kMain:
execution_world = mojom::ExecutionWorld::kMain;
}
@ -95,15 +95,15 @@ api::scripting::ExecutionWorld ConvertExecutionWorldForAPI(
mojom::ExecutionWorld world) {
switch (world) {
case mojom::ExecutionWorld::kIsolated:
return api::scripting::EXECUTION_WORLD_ISOLATED;
return api::scripting::ExecutionWorld::kIsolated;
case mojom::ExecutionWorld::kMain:
return api::scripting::EXECUTION_WORLD_MAIN;
return api::scripting::ExecutionWorld::kMain;
case mojom::ExecutionWorld::kUserScript:
NOTREACHED() << "UserScript worlds are not supported in this API.";
}
NOTREACHED();
return api::scripting::EXECUTION_WORLD_ISOLATED;
return api::scripting::ExecutionWorld::kIsolated;
}
std::string InjectionKeyForCode(const mojom::HostID& host_id,

1
shell/common/extensions/api/resources_private.idl
View file

@ -3,6 +3,7 @@
// found in the LICENSE file.
// resourcesPrivate.
[modernised_enums]
namespace resourcesPrivate {
enum Component { identity, pdf };

1
shell/common/extensions/api/scripting.idl
View file

@ -4,6 +4,7 @@
// Use the <code>chrome.scripting</code> API to execute script in different
// contexts.
[modernised_enums]
namespace scripting {
callback InjectedFunction = void();