7e59d784a0
* chore: bump chromium in DEPS to 101.0.4911.0
* chore: bump chromium in DEPS to 101.0.4913.0
* chore: bump chromium in DEPS to 101.0.4915.0
* chore: bump chromium in DEPS to 101.0.4917.0
* chore: bump chromium in DEPS to 101.0.4919.0
* chore: bump chromium in DEPS to 101.0.4921.0
* chore: bump chromium in DEPS to 101.0.4923.0
* chore: bump chromium in DEPS to 101.0.4925.0
* chore: bump chromium in DEPS to 101.0.4927.0
* chore: bump chromium in DEPS to 101.0.4929.0
* chore: update patches
* chore: bump chromium in DEPS to 101.0.4931.0
* chore: update patches
* 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T>
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3475388
Actual fixes in 1824792: Migrate DisplayClient to the new Mojo types | https://chromium-review.googlesource.com/c/chromium/src/+/1824792
* 3503874: Remove base::size(), base::empty(), and base::data().
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874
* chore: reconcile patches with main rebase
* chore: bump chromium in DEPS to 101.0.4933.0
* chore: update patches
* 3329593: [Fenced Frame] Ensure to support external protocols in a fenced frame
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3329593
* 3503874: Remove base::size(), base::empty(), and base::data().
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874
* 3446451: Use forward decl of ImageSkiaRep in //ui/gfx/image/image_skia.h
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3446451
* 3499818: partition_alloc: Rename AllocFlags to AllocWithFlags
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3499818
* chore: bump chromium in DEPS to 101.0.4935.0
* chore: update patches
* 3463286: partition_alloc: Move PartitionAlloc into the own namespaces (15 of N)
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3463286
* 3506590: Reland "Support ChromeOS external protocol dialog for Fenced Frame navigations"
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3506590
* 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T>
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3475388
Actual fixes in 1880987: Convert URLLoaderReqeust from //content to new Mojo types | https://chromium-review.googlesource.com/c/chromium/src/+/1880987 The change in the roll started causing the legacy types to fail
* chore: missing SkRegion include
* 3499600: Introduce blink::WebCssOrigin
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3499600
* fixup!: 3503874: Remove base::size(), base::empty(), and base::data().
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874
* chore: bump chromium in DEPS to 101.0.4937.0
* chore: update patches
* 3500826: [locales] Refactor locales for ios
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3500826
* 3509531: Make some public Blink media files private
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3509531
* 3497377: bluetooth: Add BluetoothDevice.forget()
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3497377
* chore: bump chromium in DEPS to 101.0.4939.0
* chore: bump chromium in DEPS to 101.0.4941.0
* 3514804: Deprecate all existing uses of mojo_base.mojom.{Dictionary,List}Value.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3514804
* 3502592: Delete PPAPI init/shutdown code in //pdf.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3502592
* chore: update patches
* fixup! 3502592: Delete PPAPI init/shutdown code in //pdf.
* chore: bump chromium in DEPS to 101.0.4943.0
* chore: fix lint, remove unneeded headers
* fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T>
* update mojo calls in offscreen patch
* update hunspell filenames
* chore: bump chromium in DEPS to 101.0.4945.0
* chore: update patches
* fix offscreen patch again
* chore: bump chromium in DEPS to 101.0.4947.0
* chore: update patches
* chore: bump chromium in DEPS to 101.0.4949.0
* support unseasoned pdf
* update patches
* chore: update patches
* chore: [IWYU] include missing skia headers
* chore: bump chromium in DEPS to 101.0.4951.0
* chore: update patches
* 3457645: media: Remove IsKeySystemsUpdateNeeded()
https://chromium-review.googlesource.com/c/chromium/src/+/3457645
* chore: bump chromium in DEPS to 102.0.4952.2
* chore: update patches
* 3488672: Add documentId as a parameter in tabs.connect() and tabs.sendMessage().
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3488672
* 3508375: Fix an issue dangerous dialog is not shown for some apk download
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3508375
* chore: bump chromium in DEPS to 102.0.4953.0
* chore: update patches
* 3510189: Harden up drag and drop support across same-process boundaries.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3510189
* 3526815: Remove hardcoded colors from chrome/browser/ui/views/overlay/.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3526815
* chore: bump chromium in DEPS to 102.0.4955.0
* build: add af and ur locale to manifests
3498914 [locales] Add af and ur to desktop
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3498914
* fixup! build: add af and ur locale to manifests
* chore: bump chromium in DEPS to 102.0.4957.0
* 3529090: gin: set JS flags before v8 initialization
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3529090
chore: fix code shear in chromium/gin_enable_disable_v8_platform.patch
* chore: update patches
* 3536433: [network] Rename data_path and http_cache_path from _path to _directory.
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3536433
* 3111565: Relocated Page.printToPDF implementation to //components
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3111565
refactor: inject E args to PrintRequestedPages() and ScriptedPrintCallback
TODO: currently passes a placeholder for job_settings. We have other
code paths that inject settings from electron_api_web_contents.cc.
Should those be injected here as well? (CC @codebytere)
* fixup! 3111565: Relocated Page.printToPDF implementation to //components
* fixup! 3111565: Relocated Page.printToPDF implementation to //components
* 3520025: Make "libcxx_abi_unstable" not a gn arg
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3520025
build: since it is no longer a gn arg, patch it in
* chore: change usages of std::vector with const elements (#33373)
* chore: bump chromium in DEPS to 102.0.4959.0
* chore: update patches
* build: iwyu base/threading/platform_thread.h
* 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate.
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3525774
refactor: copy upstream impl of GetPermissionStatusForCurrentDocument into +ElectronPermissionManager
* use gclient_gn_args_from instead of hand-copying
* checkout mac on mac
* chore: update patches
* Revert "checkout mac on mac"
This reverts commit fe9ccf49ec6139868ccf2272c2016cefa3f32769.
* fixup! 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate.
* fixup! 3457645: media: Remove IsKeySystemsUpdateNeeded()
add nogncheck
* fix: set .eslintrc.json to root to avoid cascade to chromium eslintrc
* Xref: 6dfdf79b8c
Xref: https://reviews.llvm.org/D101458
Upstream added a CMakeLists.txt in an include dir ¯\_(ツ)_/¯ and
so it must be enumerated in filenames.libcxxabi.gni
* 3511268: Remove unused headers from cxx17_backports.h
https://chromium-review.googlesource.com/c/chromium/src/+/3511268
use std::size instead of base::size
* iwyu: SkPaint
3488428: [includes] Fix transitive includes of SkImageEncoder
* chore: [IWYU] include missing skia headers
* fixup! 3511268: Remove unused headers from cxx17_backports.h
* chore: bump chromium in DEPS to 102.0.4961.0
* chore: update patches
* fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T>
chore: remove unused #include
* fixup! 3510189: Harden up drag and drop support across same-process boundaries. | https://chromium-review.googlesource.com/c/chromium/src/+/3510189
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
259 lines
10 KiB
C++
259 lines
10 KiB
C++
// Copyright (c) 2014 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/app/electron_content_client.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/command_line.h"
|
|
#include "base/files/file_util.h"
|
|
#include "base/path_service.h"
|
|
#include "base/strings/string_split.h"
|
|
#include "base/strings/string_util.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "content/public/common/content_constants.h"
|
|
#include "content/public/common/content_switches.h"
|
|
#include "electron/buildflags/buildflags.h"
|
|
#include "extensions/common/constants.h"
|
|
#include "pdf/buildflags.h"
|
|
#include "ppapi/buildflags/buildflags.h"
|
|
#include "shell/common/electron_paths.h"
|
|
#include "shell/common/options_switches.h"
|
|
#include "ui/base/l10n/l10n_util.h"
|
|
#include "ui/base/resource/resource_bundle.h"
|
|
#include "url/url_constants.h"
|
|
// In SHARED_INTERMEDIATE_DIR.
|
|
#include "widevine_cdm_version.h" // NOLINT(build/include_directory)
|
|
|
|
#if defined(WIDEVINE_CDM_AVAILABLE)
|
|
#include "base/native_library.h"
|
|
#include "content/public/common/cdm_info.h"
|
|
#include "media/base/video_codecs.h"
|
|
#endif // defined(WIDEVINE_CDM_AVAILABLE)
|
|
|
|
#if BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
#include "components/pdf/renderer/internal_plugin_renderer_helpers.h"
|
|
#include "pdf/pdf.h" // nogncheck
|
|
#include "shell/common/electron_constants.h"
|
|
#endif // BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
|
|
#if BUILDFLAG(ENABLE_PLUGINS)
|
|
#include "content/public/browser/plugin_service.h"
|
|
#include "content/public/common/pepper_plugin_info.h"
|
|
#include "ppapi/shared_impl/ppapi_permissions.h"
|
|
#include "ppapi/shared_impl/ppapi_switches.h" // nogncheck crbug.com/1125897
|
|
#endif // BUILDFLAG(ENABLE_PLUGINS)
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
enum class WidevineCdmFileCheck {
|
|
kNotChecked,
|
|
kFound,
|
|
kNotFound,
|
|
};
|
|
|
|
#if defined(WIDEVINE_CDM_AVAILABLE)
|
|
bool IsWidevineAvailable(
|
|
base::FilePath* cdm_path,
|
|
std::vector<media::VideoCodec>* codecs_supported,
|
|
base::flat_set<media::CdmSessionType>* session_types_supported,
|
|
base::flat_set<media::EncryptionMode>* modes_supported) {
|
|
static WidevineCdmFileCheck widevine_cdm_file_check =
|
|
WidevineCdmFileCheck::kNotChecked;
|
|
|
|
if (widevine_cdm_file_check == WidevineCdmFileCheck::kNotChecked) {
|
|
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
|
*cdm_path = command_line->GetSwitchValuePath(switches::kWidevineCdmPath);
|
|
if (!cdm_path->empty()) {
|
|
*cdm_path = cdm_path->AppendASCII(
|
|
base::GetNativeLibraryName(kWidevineCdmLibraryName));
|
|
widevine_cdm_file_check = base::PathExists(*cdm_path)
|
|
? WidevineCdmFileCheck::kFound
|
|
: WidevineCdmFileCheck::kNotFound;
|
|
}
|
|
}
|
|
|
|
if (widevine_cdm_file_check == WidevineCdmFileCheck::kFound) {
|
|
// Add the supported codecs as if they came from the component manifest.
|
|
// This list must match the CDM that is being bundled with Chrome.
|
|
codecs_supported->push_back(media::VideoCodec::kCodecVP8);
|
|
codecs_supported->push_back(media::VideoCodec::kCodecVP9);
|
|
#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
|
codecs_supported->push_back(media::VideoCodec::kCodecH264);
|
|
#endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
|
|
|
|
// TODO(crbug.com/767941): Push persistent-license support info here once
|
|
// we check in a new CDM that supports it on Linux.
|
|
session_types_supported->insert(media::CdmSessionType::kTemporary);
|
|
#if BUILDFLAG(IS_CHROMEOS)
|
|
session_types_supported->insert(media::CdmSessionType::kPersistentLicense);
|
|
#endif // BUILDFLAG(IS_CHROMEOS)
|
|
|
|
modes_supported->insert(media::EncryptionMode::kCenc);
|
|
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
#endif // defined(WIDEVINE_CDM_AVAILABLE)
|
|
|
|
#if BUILDFLAG(ENABLE_PLUGINS)
|
|
void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
|
|
#if BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
// TODO(upstream/thestig): Figure out how to make the PDF Viewer work without
|
|
// this PPAPI plugin registration.
|
|
content::PepperPluginInfo pdf_info;
|
|
pdf_info.is_internal = true;
|
|
pdf_info.is_out_of_process = true;
|
|
pdf_info.name = "Chromium PDF Viewer";
|
|
pdf_info.description = "Portable Document Format";
|
|
// This isn't a real file path; it's just used as a unique identifier.
|
|
pdf_info.path = base::FilePath(kPdfPluginPath);
|
|
content::WebPluginMimeType pdf_mime_type(kPdfPluginMimeType, "pdf",
|
|
"Portable Document Format");
|
|
pdf_info.mime_types.push_back(pdf_mime_type);
|
|
plugins->push_back(pdf_info);
|
|
|
|
// NB. in Chrome, this plugin isn't registered until the PDF extension is
|
|
// loaded. However, in Electron, we load the PDF extension unconditionally
|
|
// when it is enabled in the build, so we're OK to load the plugin eagerly
|
|
// here.
|
|
content::WebPluginInfo info;
|
|
info.type = content::WebPluginInfo::PLUGIN_TYPE_BROWSER_PLUGIN;
|
|
info.name = u"Chromium PDF Viewer";
|
|
// This isn't a real file path; it's just used as a unique identifier.
|
|
info.path = base::FilePath::FromUTF8Unsafe(extension_misc::kPdfExtensionId);
|
|
info.background_color = content::WebPluginInfo::kDefaultBackgroundColor;
|
|
info.mime_types.emplace_back("application/pdf", "pdf",
|
|
"Portable Document Format");
|
|
content::PluginService::GetInstance()->RefreshPlugins();
|
|
content::PluginService::GetInstance()->RegisterInternalPlugin(info, true);
|
|
#endif // BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
}
|
|
#endif // BUILDFLAG(ENABLE_PLUGINS)
|
|
|
|
void AppendDelimitedSwitchToVector(const base::StringPiece cmd_switch,
|
|
std::vector<std::string>* append_me) {
|
|
auto* command_line = base::CommandLine::ForCurrentProcess();
|
|
auto switch_value = command_line->GetSwitchValueASCII(cmd_switch);
|
|
if (!switch_value.empty()) {
|
|
constexpr base::StringPiece delimiter(",", 1);
|
|
auto tokens =
|
|
base::SplitString(switch_value, delimiter, base::TRIM_WHITESPACE,
|
|
base::SPLIT_WANT_NONEMPTY);
|
|
append_me->reserve(append_me->size() + tokens.size());
|
|
std::move(std::begin(tokens), std::end(tokens),
|
|
std::back_inserter(*append_me));
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
ElectronContentClient::ElectronContentClient() = default;
|
|
|
|
ElectronContentClient::~ElectronContentClient() = default;
|
|
|
|
std::u16string ElectronContentClient::GetLocalizedString(int message_id) {
|
|
return l10n_util::GetStringUTF16(message_id);
|
|
}
|
|
|
|
base::StringPiece ElectronContentClient::GetDataResource(
|
|
int resource_id,
|
|
ui::ResourceScaleFactor scale_factor) {
|
|
return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
|
|
resource_id, scale_factor);
|
|
}
|
|
|
|
gfx::Image& ElectronContentClient::GetNativeImageNamed(int resource_id) {
|
|
return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
|
|
resource_id);
|
|
}
|
|
|
|
base::RefCountedMemory* ElectronContentClient::GetDataResourceBytes(
|
|
int resource_id) {
|
|
return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
|
|
resource_id);
|
|
}
|
|
|
|
void ElectronContentClient::AddAdditionalSchemes(Schemes* schemes) {
|
|
auto* command_line = base::CommandLine::ForCurrentProcess();
|
|
std::string process_type =
|
|
command_line->GetSwitchValueASCII(::switches::kProcessType);
|
|
// Browser Process registration happens in
|
|
// `api::Protocol::RegisterSchemesAsPrivileged`
|
|
//
|
|
// Renderer Process registration happens in `RendererClientBase`
|
|
//
|
|
// We use this for registration to network utility process
|
|
if (process_type == ::switches::kUtilityProcess) {
|
|
AppendDelimitedSwitchToVector(switches::kServiceWorkerSchemes,
|
|
&schemes->service_worker_schemes);
|
|
AppendDelimitedSwitchToVector(switches::kStandardSchemes,
|
|
&schemes->standard_schemes);
|
|
AppendDelimitedSwitchToVector(switches::kSecureSchemes,
|
|
&schemes->secure_schemes);
|
|
AppendDelimitedSwitchToVector(switches::kBypassCSPSchemes,
|
|
&schemes->csp_bypassing_schemes);
|
|
AppendDelimitedSwitchToVector(switches::kCORSSchemes,
|
|
&schemes->cors_enabled_schemes);
|
|
}
|
|
|
|
schemes->service_worker_schemes.emplace_back(url::kFileScheme);
|
|
|
|
#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
|
|
schemes->standard_schemes.push_back(extensions::kExtensionScheme);
|
|
schemes->savable_schemes.push_back(extensions::kExtensionScheme);
|
|
schemes->secure_schemes.push_back(extensions::kExtensionScheme);
|
|
schemes->service_worker_schemes.push_back(extensions::kExtensionScheme);
|
|
schemes->cors_enabled_schemes.push_back(extensions::kExtensionScheme);
|
|
schemes->csp_bypassing_schemes.push_back(extensions::kExtensionScheme);
|
|
#endif
|
|
}
|
|
|
|
void ElectronContentClient::AddPepperPlugins(
|
|
std::vector<content::PepperPluginInfo>* plugins) {
|
|
#if BUILDFLAG(ENABLE_PLUGINS)
|
|
ComputeBuiltInPlugins(plugins);
|
|
#endif // BUILDFLAG(ENABLE_PLUGINS)
|
|
}
|
|
|
|
void ElectronContentClient::AddContentDecryptionModules(
|
|
std::vector<content::CdmInfo>* cdms,
|
|
std::vector<media::CdmHostFilePath>* cdm_host_file_paths) {
|
|
if (cdms) {
|
|
#if defined(WIDEVINE_CDM_AVAILABLE)
|
|
base::FilePath cdm_path;
|
|
std::vector<media::VideoCodec> video_codecs_supported;
|
|
base::flat_set<media::CdmSessionType> session_types_supported;
|
|
base::flat_set<media::EncryptionMode> encryption_modes_supported;
|
|
if (IsWidevineAvailable(&cdm_path, &video_codecs_supported,
|
|
&session_types_supported,
|
|
&encryption_modes_supported)) {
|
|
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
|
auto cdm_version_string =
|
|
command_line->GetSwitchValueASCII(switches::kWidevineCdmVersion);
|
|
// CdmInfo needs |path| to be the actual Widevine library,
|
|
// not the adapter, so adjust as necessary. It will be in the
|
|
// same directory as the installed adapter.
|
|
const base::Version version(cdm_version_string);
|
|
DCHECK(version.IsValid());
|
|
|
|
content::CdmCapability capability(
|
|
video_codecs_supported, encryption_modes_supported,
|
|
session_types_supported, base::flat_set<media::CdmProxy::Protocol>());
|
|
|
|
cdms->push_back(content::CdmInfo(
|
|
kWidevineCdmDisplayName, kWidevineCdmGuid, version, cdm_path,
|
|
kWidevineCdmFileSystemId, capability, kWidevineKeySystem, false));
|
|
}
|
|
#endif // defined(WIDEVINE_CDM_AVAILABLE)
|
|
}
|
|
}
|
|
|
|
} // namespace electron
|