![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 134.0.6948.0 * chore: update can_create_window.patch https://chromium-review.googlesource.com/c/chromium/src/+/6151982 no patch code changes, but had to manually apply due to upstream context shear * chore: update proxy_config_monitor.patch no manual changes; patch applied with fuzz 2 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6126219 * chore: update build_add_electron_tracing_category.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6149256 * chore: update adjust_accessibility_ui_for_electron.patch https://chromium-review.googlesource.com/c/chromium/src/+/6105650 no patch code changes, but had to manually apply due to upstream context shear * chore: e patches all * chore: use fully-qualified path for all.gn Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6154997 * chore: do not use a variable when assigning rtc_use_h264 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6154997 * Move GlobalShortcutListenerLinux to //ui/base Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6097375 * [MPArch Guest View] Make WebPreferences queried per frame tree root Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6096390 * [Status Icons] Allow vector resources https://chromium-review.googlesource.com/c/chromium/src/+/6139403 * [Extensions] Move MatchOriginAsFallbackBehavior to Mojom Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6141793 * Remove StrongAlias::Hasher Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6132291 * Rename text-change and select-change methods and related stuff Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6148816 * [Code Health] Remove stale feature EnableWebUsbOnExtensionServiceWorker https://chromium-review.googlesource.com/c/chromium/src/+/6115161 * [Extensions Cleanup] Move creation of tab-based ports to factory method https://chromium-review.googlesource.com/c/chromium/src/+/6143725 * refactor: add StatusIconGtk::SetIcon() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6139403 copied from chrome/browser/status_icons/status_icon.cc * refactor: add TrayIconLinux::GetIcon() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6139403 * chore: update feat_allow_usage_of_sccontentsharingpicker_on_supported_platforms.patch remove unused filter_ field * chore: bump chromium in DEPS to 134.0.6950.0 * chore: bump chromium in DEPS to 134.0.6952.0 * chore: bump chromium in DEPS to 134.0.6954.0 * chore: bump chromium in DEPS to 134.0.6956.0 * chore: update Chromium patches * 6165749: Check scanout support in RenderableGpuMemoryBufferPool | https://chromium-review.googlesource.com/c/chromium/src/+/6165749 * 6106730: [Win] Use DXGI swapchains and DCOMP visuals in software mode | https://chromium-review.googlesource.com/c/chromium/src/+/6106730 * chore: update patches * chore: bump chromium in DEPS to 134.0.6958.0 * chore: bump chromium in DEPS to 134.0.6960.0 * chore: update chromium patches * 6168371: Remove extensions GlobalShortcutListener wrapper | https://chromium-review.googlesource.com/c/chromium/src/+/6168371 * chore: update patches * 6161637: WebUI: Leverage build_webui() in chrome://translate-internals | https://chromium-review.googlesource.com/c/chromium/src/+/6161637 * chore: bump chromium in DEPS to 134.0.6962.0 * 6177329: Remove policy.used_policy_certificates pref on ChromeOS | https://chromium-review.googlesource.com/c/chromium/src/+/6177329 * 6180524: Simplify logic in components/os_crypt/sync/BUILD.gn | https://chromium-review.googlesource.com/c/chromium/src/+/6180524 * 6144831: Enforce --disallow-v8-feature-flag-overrides in the renderer | https://chromium-review.googlesource.com/c/chromium/src/+/6144831 * chore: update patches * chore: bump chromium in DEPS to 134.0.6964.0 * 6181010: Ensure busy cursor does not show via LaunchWithoutSandbox | https://chromium-review.googlesource.com/c/chromium/src/+/6181010 * chore: update patches * chore: bump chromium in DEPS to 134.0.6966.0 * 6180598: [api] Remove Reallocate | https://chromium-review.googlesource.com/c/v8/v8/+/6180598 * 6170781: [Refactor] Move UninstallExtension to ExtensionRegistrar. | https://chromium-review.googlesource.com/c/chromium/src/+/6170781 * chore: update filenames.libcxx.gni * 6168207: cdm: Remove widevine_cdm_version.h | https://chromium-review.googlesource.com/c/chromium/src/+/6168207 * chore: bump chromium in DEPS to 134.0.6968.0 * 6030552: [macOS] Allow using vibrancy with NativeWidgetNSWindowBridge | https://chromium-review.googlesource.com/c/chromium/src/+/6030552 * fix: use explicit copy to replace realloc impl https://chromium-review.googlesource.com/c/v8/v8/+/6180598 https://issues.chromium.org/issues/331326406 As per recommendation, "File an issue with Node to explicitly copy,because they copy under the hood anyway" * fixup! 6106730: [Win] Use DXGI swapchains and DCOMP visuals in software mode | https://chromium-review.googlesource.com/c/chromium/src/+/6106730 * fix: undefine win32 StrCat https://chromium-review.googlesource.com/c/chromium/src/+/6172292 * fix: //device/vr:directx_helpers breaking the build https://chromium-review.googlesource.com/c/chromium/src/+/6064548 Upstreamed in https://chromium-review.googlesource.com/c/chromium/src/+/6186102 * fix: avoid calling ui::Layer::SetFillsBoundsOpaquely https://chromium-review.googlesource.com/c/chromium/src/+/6175787 The layer opacity is determined by the background color's alpha value * fix: build with proprietary_codecs The explicit setting of rtc_use_h264 is no longer needed since https://webrtc-review.googlesource.com/c/src/+/62380 * fix: increase empty trace file size threshold https://chromium-review.googlesource.com/c/chromium/src/+/6176642 Traces now contain a net-constants property to allow them to be converted to a net log. These contain ~1240 new properties with formatted JSON data. * fix: node tests missing resource management globals https://chromium-review.googlesource.com/c/chromium/src/+/6174695 * fixup! fix: use explicit copy to replace realloc impl * chore: disable focus handling test due to win32/ia32 regression --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org>
219 lines
8.2 KiB
C++
219 lines
8.2 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 <utility>
|
|
#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.is_out_of_process = 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
|