![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 140.0.7269.2 * chore: bump chromium in DEPS to 140.0.7270.0 * chore: bump chromium in DEPS to 140.0.7271.0 * chore: bump chromium in DEPS to 140.0.7273.0 * 6516731: [ExclusiveAccessForAndroid] remove unneeded includes & deps | https://chromium-review.googlesource.com/c/chromium/src/+/6516731 * 6694809: dbus: Ensure systemd scope is started before using any portal services | https://chromium-review.googlesource.com/c/chromium/src/+/6694809 * chore: patch chromium * chore: export patches * chore: bump chromium in DEPS to 140.0.7275.0 * 6677511: [pepper] More pepper removal | https://chromium-review.googlesource.com/c/chromium/src/+/6677511 * 6513641: [gin] Rename gin::Wrappable to gin::DeprecatedWrappable | https://chromium-review.googlesource.com/c/chromium/src/+/6513641 * chore: export chromium patches * 6513641: [gin] Rename gin::Wrappable to gin::DeprecatedWrappable | https://chromium-review.googlesource.com/c/chromium/src/+/6513641 * chore: bump chromium in DEPS to 140.0.7277.0 * chore: bump chromium in DEPS to 140.0.7279.0 * chore: bump chromium in DEPS to 140.0.7281.0 * 6677314: Plumb enabled client hints in the network requestion to network layer https://chromium-review.googlesource.com/c/chromium/src/+/6677314 * 6351556: [source-phase-imports] Support Wasm Source Phase Imports https://chromium-review.googlesource.com/c/chromium/src/+/6351556 * 6700077: [renderer] Avoid calls to deprecated GetIsolate methods https://chromium-review.googlesource.com/c/chromium/src/+/6700077 * 6692873: Reland "Reland "FSA: Only normalize the hardcoded rules once during initialization"" https://chromium-review.googlesource.com/c/chromium/src/+/6692873 * 6686234: [gin] Cleanup NamedPropertyInterceptor for Wrappable https://chromium-review.googlesource.com/c/chromium/src/+/6686234 * chore: export patches * 6667723: Remove content_enable_legacy_ipc GN arg. https://chromium-review.googlesource.com/c/chromium/src/+/6667723 * 6646566: ui: Move NativeWindowTracker to its own directory https://chromium-review.googlesource.com/c/chromium/src/+/6646566 * fix: add missing includes * 6580522: [WAR, DNR] Fix unsafe redirect error to web accessible resource https://chromium-review.googlesource.com/c/chromium/src/+/6580522 * 6680477: Implement `completeCode` endpoint and expose to DevTools https://chromium-review.googlesource.com/c/chromium/src/+/6680477 * 6677511: [pepper] More pepper removal https://chromium-review.googlesource.com/c/chromium/src/+/6677511 * 6696689: Rename views::WidgetFocusManager -> NativeViewFocusManager https://chromium-review.googlesource.com/c/chromium/src/+/6696689 * 6702812: Move wtf/text/string_impl*.* to "blink" namespace https://chromium-review.googlesource.com/c/chromium/src/+/6702812 * chore: fix dialog patch * 6702431: [animation-trigger] Parse timeline-trigger-name https://chromium-review.googlesource.com/c/chromium/src/+/6702431 * chore: fixup patch indices * feat: replace webFrame.routingId with webFrame.frameToken * feat: WebFrameMain.prototype.frameToken * test: refactor to use replacement APIs * chore: fixup pip patch * test: adjust webFrame tests for frameToken changes * 6703757: Reland "Enable -fsanitize=array-bounds in non-UBSan builds" https://chromium-review.googlesource.com/c/chromium/src/+/6703757 * test: switch to frameTokens * test: routingId is fine to test in the main process * docs: add routingId to breaking changes * docs: update plugin-crashed event * chore: fixup linux dialog patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: alice <alice@makenotion.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com>
217 lines
8.1 KiB
C++
217 lines
8.1 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 <string_view>
|
|
#include <vector>
|
|
|
|
#include "base/command_line.h"
|
|
#include "base/containers/extend.h"
|
|
#include "base/files/file_util.h"
|
|
#include "base/strings/string_split.h"
|
|
#include "content/public/common/content_constants.h"
|
|
#include "electron/buildflags/buildflags.h"
|
|
#include "electron/fuses.h"
|
|
#include "extensions/common/constants.h"
|
|
#include "pdf/buildflags.h"
|
|
#include "ppapi/buildflags/buildflags.h"
|
|
#include "shell/common/options_switches.h"
|
|
#include "shell/common/process_util.h"
|
|
#include "third_party/widevine/cdm/buildflags.h"
|
|
#include "ui/base/l10n/l10n_util.h"
|
|
#include "ui/base/resource/resource_bundle.h"
|
|
#include "url/url_constants.h"
|
|
|
|
#if BUILDFLAG(ENABLE_WIDEVINE)
|
|
#include "base/native_library.h"
|
|
#include "content/public/common/cdm_info.h"
|
|
#include "media/base/video_codecs.h"
|
|
#endif // BUILDFLAG(ENABLE_WIDEVINE)
|
|
|
|
#if BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
#include "components/pdf/common/constants.h" // nogncheck
|
|
#include "shell/common/electron_constants.h"
|
|
#endif // BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
|
|
#if BUILDFLAG(ENABLE_PLUGINS)
|
|
#include "content/public/common/content_plugin_info.h"
|
|
#endif // BUILDFLAG(ENABLE_PLUGINS)
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
enum class WidevineCdmFileCheck {
|
|
kNotChecked,
|
|
kFound,
|
|
kNotFound,
|
|
};
|
|
|
|
#if BUILDFLAG(ENABLE_WIDEVINE)
|
|
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 // BUILDFLAG(ENABLE_WIDEVINE)
|
|
|
|
} // namespace
|
|
|
|
ElectronContentClient::ElectronContentClient() = default;
|
|
|
|
ElectronContentClient::~ElectronContentClient() = default;
|
|
|
|
std::u16string ElectronContentClient::GetLocalizedString(int message_id) {
|
|
return l10n_util::GetStringUTF16(message_id);
|
|
}
|
|
|
|
std::string_view 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) {
|
|
// Browser Process registration happens in
|
|
// `api::Protocol::RegisterSchemesAsPrivileged`
|
|
//
|
|
// Renderer Process registration happens in `RendererClientBase`
|
|
//
|
|
// We use this for registration to network utility process
|
|
if (IsUtilityProcess()) {
|
|
const auto& cmd = *base::CommandLine::ForCurrentProcess();
|
|
auto append_cli_schemes = [&cmd](auto& appendme, const auto key) {
|
|
base::Extend(appendme, base::SplitString(cmd.GetSwitchValueASCII(key),
|
|
",", base::TRIM_WHITESPACE,
|
|
base::SPLIT_WANT_NONEMPTY));
|
|
};
|
|
|
|
using namespace switches;
|
|
append_cli_schemes(schemes->cors_enabled_schemes, kCORSSchemes);
|
|
append_cli_schemes(schemes->csp_bypassing_schemes, kBypassCSPSchemes);
|
|
append_cli_schemes(schemes->secure_schemes, kSecureSchemes);
|
|
append_cli_schemes(schemes->service_worker_schemes, kServiceWorkerSchemes);
|
|
append_cli_schemes(schemes->standard_schemes, kStandardSchemes);
|
|
}
|
|
|
|
if (electron::fuses::IsGrantFileProtocolExtraPrivilegesEnabled()) {
|
|
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::AddPlugins(
|
|
std::vector<content::ContentPluginInfo>* plugins) {
|
|
#if BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
static constexpr char kPDFPluginExtension[] = "pdf";
|
|
static constexpr char kPDFPluginDescription[] = "Portable Document Format";
|
|
|
|
content::ContentPluginInfo pdf_info;
|
|
pdf_info.is_internal = true;
|
|
pdf_info.name = kPDFInternalPluginName;
|
|
pdf_info.description = kPDFPluginDescription;
|
|
// This isn't a real file path; it's just used as a unique identifier.
|
|
static constexpr std::string_view kPdfPluginPath = "internal-pdf-viewer";
|
|
pdf_info.path = base::FilePath::FromASCII(kPdfPluginPath);
|
|
content::WebPluginMimeType pdf_mime_type(
|
|
pdf::kInternalPluginMimeType, kPDFPluginExtension, kPDFPluginDescription);
|
|
pdf_info.mime_types.push_back(pdf_mime_type);
|
|
plugins->push_back(pdf_info);
|
|
#endif // BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
}
|
|
|
|
void ElectronContentClient::AddContentDecryptionModules(
|
|
std::vector<content::CdmInfo>* cdms,
|
|
std::vector<media::CdmHostFilePath>* cdm_host_file_paths) {
|
|
if (cdms) {
|
|
#if BUILDFLAG(ENABLE_WIDEVINE)
|
|
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 // BUILDFLAG(ENABLE_WIDEVINE)
|
|
}
|
|
}
|
|
|
|
} // namespace electron
|