bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 86.0.4240.0 (#800218)

Browse Source 
- CefURLRequest::Create is no longer supported in the renderer process
  (see https://crbug.com/891872). Use CefFrame::CreateURLRequest instead.
- Mac platform definitions have been changed from `MACOSX` to `MAC`
  (see https://crbug.com/1105907) and related CMake macro names have
  been updated. The old `OS_MACOSX` define is still set in code and CMake
  for backwards compatibility.
- Linux ARM build is currently broken (see https://crbug.com/1123214).
This commit is contained in:
Marshall Greenblatt
2020-08-28 18:39:23 -04:00
parent 6b1e5335bc
commit 24c2f2fa38
190 changed files with 1302 additions and 1354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libcef/common/alloy/alloy_main_delegate.cc
View File

@ -39,14 +39,14 @@
#include "ipc/ipc_buildflags.h"
#include "net/base/features.h"
#include "pdf/pdf_ppapi.h"
#include "sandbox/policy/switches.h"
#include "services/network/public/cpp/features.h"
#include "services/service_manager/sandbox/switches.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_features.h"
#include "ui/base/ui_base_paths.h"
#include "ui/base/ui_base_switches.h"
#if defined(OS_MACOSX)
#if defined(OS_MAC)
#include "libcef/common/util_mac.h"
#endif
@ -127,7 +127,7 @@ bool AlloyMainDelegate::BasicStartupComplete(int* exit_code) {
}
}
#if defined(OS_MACOSX)
#if defined(OS_MAC)
if (settings_->framework_dir_path.length > 0) {
base::FilePath file_path =
base::FilePath(CefString(&settings_->framework_dir_path));
@ -144,7 +144,7 @@ bool AlloyMainDelegate::BasicStartupComplete(int* exit_code) {
#endif
if (no_sandbox)
command_line->AppendSwitch(service_manager::switches::kNoSandbox);
command_line->AppendSwitch(sandbox::policy::switches::kNoSandbox);
if (settings_->user_agent.length > 0) {
command_line->AppendSwitchASCII(switches::kUserAgent,
@ -355,7 +355,7 @@ bool AlloyMainDelegate::BasicStartupComplete(int* exit_code) {
content::SetContentClient(&content_client_);
#if defined(OS_MACOSX)
#if defined(OS_MAC)
util_mac::BasicStartupComplete();
#endif
@ -370,7 +370,7 @@ void AlloyMainDelegate::PreSandboxStartup() {
if (process_type.empty()) {
// Only override these paths when executing the main process.
#if defined(OS_MACOSX)
#if defined(OS_MAC)
util_mac::PreSandboxStartup();
#endif

9
libcef/common/app_manager.cc
View File

@ -12,7 +12,6 @@
#include "base/logging.h"
#include "content/public/browser/child_process_security_policy.h"
#include "content/public/common/content_switches.h"
#include "third_party/blink/public/platform/platform.h"
#if defined(OS_WIN)
#include <windows.h>
@ -108,11 +107,3 @@ const wchar_t* CefAppManager::GetResourceDllName() {
return file_path;
}
#endif // defined(OS_WIN)
blink::WebURLLoaderFactory* CefAppManager::GetDefaultURLLoaderFactory() {
if (!default_url_loader_factory_) {
default_url_loader_factory_ =
blink::Platform::Current()->CreateDefaultURLLoaderFactory();
}
return default_url_loader_factory_.get();
}

12
libcef/common/app_manager.h
View File

@ -15,10 +15,6 @@
#include "build/build_config.h"
#include "content/public/common/content_client.h"
namespace blink {
class WebURLLoaderFactory;
}
class CefBrowserContext;
struct CefSchemeInfo;
@ -58,12 +54,6 @@ class CefAppManager {
const wchar_t* GetResourceDllName();
#endif
// The following methods are only available in the render process.
// Returns a factory that only supports unintercepted http(s) and blob
// requests. Used by CefRenderURLRequest.
blink::WebURLLoaderFactory* GetDefaultURLLoaderFactory();
protected:
CefAppManager();
virtual ~CefAppManager();
@ -73,8 +63,6 @@ class CefAppManager {
SchemeInfoList scheme_info_list_;
bool scheme_info_list_locked_ = false;
std::unique_ptr<blink::WebURLLoaderFactory> default_url_loader_factory_;
DISALLOW_COPY_AND_ASSIGN(CefAppManager);
};

2
libcef/common/cef_switches.cc
View File

@ -125,7 +125,7 @@ const char kDevToolsProtocolLogFile[] = "devtools-protocol-log-file";
// Enable use of the Chrome runtime in CEF. See issue #2969 for details.
const char kEnableChromeRuntime[] = "enable-chrome-runtime";
#if defined(OS_MACOSX)
#if defined(OS_MAC)
// Path to the framework directory.
const char kFrameworkDirPath[] = "framework-dir-path";
const char kMainBundlePath[] = "main-bundle-path";

2
libcef/common/cef_switches.h
View File

@ -56,7 +56,7 @@ extern const char kDisableNewBrowserInfoTimeout[];
extern const char kDevToolsProtocolLogFile[];
extern const char kEnableChromeRuntime[];
#if defined(OS_MACOSX)
#if defined(OS_MAC)
extern const char kFrameworkDirPath[];
extern const char kMainBundlePath[];
#endif

9
libcef/common/chrome/chrome_main_delegate_cef.cc
View File

@ -10,9 +10,10 @@
#include "libcef/common/crash_reporting.h"
#include "libcef/common/resource_util.h"
#include "base/command_line.h"
#include "content/public/common/content_switches.h"
#if defined(OS_MACOSX)
#if defined(OS_MAC)
#include "libcef/common/util_mac.h"
#endif
@ -42,7 +43,7 @@ bool ChromeMainDelegateCef::BasicStartupComplete(int* exit_code) {
base::CommandLine::ForCurrentProcess());
#endif
#if defined(OS_MACOSX)
#if defined(OS_MAC)
util_mac::BasicStartupComplete();
#endif
}
@ -56,11 +57,11 @@ void ChromeMainDelegateCef::PreSandboxStartup() {
const std::string& process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
#if defined(OS_MACOSX)
#if defined(OS_MAC)
if (process_type.empty()) {
util_mac::PreSandboxStartup();
}
#endif // defined(OS_MACOSX)
#endif // defined(OS_MAC)
// Since this may be configured via CefSettings we override the value on
// all platforms. We can't use the default implementation on macOS because

6
libcef/common/command_line_impl.cc
View File

@ -114,7 +114,11 @@ void CefCommandLineImpl::AppendSwitch(const CefString& name) {
void CefCommandLineImpl::AppendSwitchWithValue(const CefString& name,
const CefString& value) {
CEF_VALUE_VERIFY_RETURN_VOID(true);
mutable_value()->AppendSwitchNative(name, value);
#if defined(OS_WIN)
mutable_value()->AppendSwitchNative(name, value.ToWString());
#else
mutable_value()->AppendSwitchNative(name, value.ToString());
#endif
}
bool CefCommandLineImpl::HasArguments() {

20
libcef/common/crash_reporter_client.cc
View File

@ -23,7 +23,7 @@
#include "services/service_manager/embedder/switches.h"
#include "third_party/crashpad/crashpad/client/annotation.h"
#if defined(OS_MACOSX)
#if defined(OS_MAC)
#include "libcef/common/util_mac.h"
#endif
@ -39,7 +39,7 @@
#include "chrome/common/chrome_paths.h"
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX)
#if defined(OS_POSIX) && !defined(OS_MAC)
#include "content/public/common/content_switches.h"
#include "libcef/common/cef_crash_report_utils.h"
#endif
@ -79,7 +79,7 @@ PathString GetCrashConfigPath() {
#elif defined(OS_POSIX)
base::FilePath config_path;
#if defined(OS_MACOSX)
#if defined(OS_MAC)
// Start with the path to the main app Resources directory. May be empty if
// not running in an app bundle.
config_path = util_mac::GetMainResourcesDirectory();
@ -439,7 +439,7 @@ bool CefCrashReporterClient::ReadCrashConfigFile() {
app_name_ = val_str;
}
}
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
else if (name_str == "BrowserCrashForwardingEnabled") {
enable_browser_crash_forwarding_ = ParseBool(val_str);
}
@ -617,7 +617,7 @@ void CefCrashReporterClient::GetProductNameAndVersion(std::string* product_name,
*version = product_version_;
}
#if !defined(OS_MACOSX)
#if !defined(OS_MAC)
base::FilePath CefCrashReporterClient::GetReporterLogFilename() {
return base::FilePath(FILE_PATH_LITERAL("uploads.log"));
@ -631,7 +631,7 @@ bool CefCrashReporterClient::EnableBreakpadForProcess(
process_type == switches::kGpuProcess;
}
#endif // !defined(OS_MACOSX)
#endif // !defined(OS_MAC)
bool CefCrashReporterClient::GetCrashDumpLocation(base::FilePath* crash_dir) {
// By setting the BREAKPAD_DUMP_LOCATION environment variable, an alternate
@ -656,7 +656,7 @@ bool CefCrashReporterClient::GetCollectStatsInSample() {
return true;
}
#if defined(OS_WIN) || defined(OS_MACOSX)
#if defined(OS_WIN) || defined(OS_MAC)
bool CefCrashReporterClient::ReportingIsEnforcedByPolicy(
bool* crashpad_enabled) {
*crashpad_enabled = true;
@ -664,7 +664,7 @@ bool CefCrashReporterClient::ReportingIsEnforcedByPolicy(
}
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX)
#if defined(OS_POSIX) && !defined(OS_MAC)
bool CefCrashReporterClient::IsRunningUnattended() {
// Crash upload will only be enabled with Breakpad on Linux if this method
// returns false.
@ -717,13 +717,13 @@ bool CefCrashReporterClient::HasCrashExternalHandler() const {
#endif // defined(OS_WIN)
#if defined(OS_MACOSX)
#if defined(OS_MAC)
bool CefCrashReporterClient::EnableBrowserCrashForwarding() {
return enable_browser_crash_forwarding_;
}
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX)
#if defined(OS_POSIX) && !defined(OS_MAC)
CefCrashReporterClient::ParameterMap CefCrashReporterClient::FilterParameters(
const ParameterMap& parameters) {
return crash_report_utils::FilterParameters(parameters);

12
libcef/common/crash_reporter_client.h
View File

@ -57,7 +57,7 @@ class CefCrashReporterClient : public crash_reporter::CrashReporterClient {
void GetProductNameAndVersion(std::string* product_name,
std::string* version,
std::string* channel) override;
#if !defined(OS_MACOSX)
#if !defined(OS_MAC)
base::FilePath GetReporterLogFilename() override;
bool EnableBreakpadForProcess(const std::string& process_type) override;
#endif
@ -67,11 +67,11 @@ class CefCrashReporterClient : public crash_reporter::CrashReporterClient {
// All of these methods must return true to enable crash report upload.
bool GetCollectStatsConsent() override;
bool GetCollectStatsInSample() override;
#if defined(OS_WIN) || defined(OS_MACOSX)
#if defined(OS_WIN) || defined(OS_MAC)
bool ReportingIsEnforcedByPolicy(bool* crashpad_enabled) override;
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX)
#if defined(OS_POSIX) && !defined(OS_MAC)
bool IsRunningUnattended() override;
#endif
@ -84,11 +84,11 @@ class CefCrashReporterClient : public crash_reporter::CrashReporterClient {
bool HasCrashExternalHandler() const;
#endif
#if defined(OS_MACOSX)
#if defined(OS_MAC)
bool EnableBrowserCrashForwarding() override;
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX)
#if defined(OS_POSIX) && !defined(OS_MAC)
ParameterMap FilterParameters(const ParameterMap& parameters) override;
#endif
@ -123,7 +123,7 @@ class CefCrashReporterClient : public crash_reporter::CrashReporterClient {
std::string external_handler_;
#endif
#if defined(OS_MACOSX)
#if defined(OS_MAC)
bool enable_browser_crash_forwarding_ = false;
#endif

14
libcef/common/crash_reporting.cc
View File

@ -21,7 +21,7 @@
#include "content/public/common/content_switches.h"
#include "services/service_manager/embedder/switches.h"
#if defined(OS_MACOSX)
#if defined(OS_MAC)
#include "base/mac/foundation_util.h"
#include "components/crash/core/app/crashpad.h"
#include "components/crash/core/common/crash_keys.h"
@ -33,7 +33,7 @@
#include "libcef/common/crash_reporter_client.h"
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX)
#if defined(OS_POSIX) && !defined(OS_MAC)
#include "components/crash/core/app/breakpad_linux.h"
#include "v8/include/v8-wasm-trap-handler-posix.h"
#endif
@ -101,7 +101,7 @@ void InitCrashReporter(const base::CommandLine& command_line,
crash_reporter::SetCrashReporterClient(crash_client);
#if defined(OS_MACOSX)
#if defined(OS_MAC)
// TODO(mark): Right now, InitializeCrashpad() needs to be called after
// CommandLine::Init() and configuration of chrome::DIR_CRASH_DUMPS. Ideally,
// Crashpad initialization could occur sooner, preferably even before the
@ -131,7 +131,7 @@ void InitCrashReporter(const base::CommandLine& command_line,
}
g_crash_reporting_enabled = true;
#else // !defined(OS_MACOSX)
#else // !defined(OS_MAC)
if (process_type != service_manager::switches::kZygoteProcess) {
// Crash reporting for subprocesses created using the zygote will be
@ -140,7 +140,7 @@ void InitCrashReporter(const base::CommandLine& command_line,
g_crash_reporting_enabled = true;
}
#endif // !defined(OS_MACOSX)
#endif // !defined(OS_MAC)
}
#endif // defined(OS_POSIX)
@ -196,7 +196,7 @@ bool SetCrashKeyValue(const base::StringPiece& key,
void BasicStartupComplete(base::CommandLine* command_line) {
CefCrashReporterClient* crash_client = g_crash_reporter_client.Pointer();
if (crash_client->ReadCrashConfigFile()) {
#if !defined(OS_MACOSX)
#if !defined(OS_MAC)
// Breakpad requires this switch.
command_line->AppendSwitch(switches::kEnableCrashReporter);
@ -228,7 +228,7 @@ void PreSandboxStartup(const base::CommandLine& command_line,
crash_keys::SetSwitchesFromCommandLine(command_line, &IsBoringCEFSwitch);
}
#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MAC)
void ZygoteForked(base::CommandLine* command_line,
const std::string& process_type) {
CefCrashReporterClient* crash_client = g_crash_reporter_client.Pointer();

2
libcef/common/crash_reporting.h
View File

@ -29,7 +29,7 @@ void BasicStartupComplete(base::CommandLine* command_line);
void PreSandboxStartup(const base::CommandLine& command_line,
const std::string& process_type);
#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MAC)
void ZygoteForked(base::CommandLine* command_line,
const std::string& process_type);
#endif

14
libcef/common/extensions/extensions_client.cc
View File

@ -58,15 +58,15 @@ void CefExtensionsClient::FilterHostPermissions(
NOTIMPLEMENTED();
}
void CefExtensionsClient::SetScriptingWhitelist(
const ScriptingWhitelist& whitelist) {
scripting_whitelist_ = whitelist;
void CefExtensionsClient::SetScriptingAllowlist(
const ScriptingAllowlist& allowlist) {
scripting_allowlist_ = allowlist;
}
const ExtensionsClient::ScriptingWhitelist&
CefExtensionsClient::GetScriptingWhitelist() const {
// TODO(jamescook): Real whitelist.
return scripting_whitelist_;
const ExtensionsClient::ScriptingAllowlist&
CefExtensionsClient::GetScriptingAllowlist() const {
// TODO(jamescook): Real allowlist.
return scripting_allowlist_;
}
URLPatternSet CefExtensionsClient::GetPermittedChromeSchemeHosts(

6
libcef/common/extensions/extensions_client.h
View File

@ -29,8 +29,8 @@ class CefExtensionsClient : public ExtensionsClient {
void FilterHostPermissions(const URLPatternSet& hosts,
URLPatternSet* new_hosts,
PermissionIDSet* permissions) const override;
void SetScriptingWhitelist(const ScriptingWhitelist& whitelist) override;
const ScriptingWhitelist& GetScriptingWhitelist() const override;
void SetScriptingAllowlist(const ScriptingAllowlist& allowlist) override;
const ScriptingAllowlist& GetScriptingAllowlist() const override;
URLPatternSet GetPermittedChromeSchemeHosts(
const Extension* extension,
const APIPermissionSet& api_permissions) const override;
@ -42,7 +42,7 @@ class CefExtensionsClient : public ExtensionsClient {
private:
const ChromePermissionMessageProvider permission_message_provider_;
ScriptingWhitelist scripting_whitelist_;
ScriptingAllowlist scripting_allowlist_;
// Mutable to allow caching in a const method.
const GURL webstore_base_url_;

2
libcef/common/extensions/extensions_util.cc
View File

@ -25,7 +25,7 @@ bool PdfExtensionEnabled() {
}
bool PrintPreviewEnabled() {
#if defined(OS_MACOSX)
#if defined(OS_MAC)
// Not currently supported on macOS.
return false;
#else

6
libcef/common/file_util_impl.cc
View File

@ -74,7 +74,11 @@ bool CefDirectoryExists(const CefString& path) {
bool CefDeleteFile(const CefString& path, bool recursive) {
if (!AllowFileIO())
return false;
return base::DeleteFile(path, recursive);
if (recursive) {
return base::DeletePathRecursively(path);
} else {
return base::DeleteFile(path);
}
}
bool CefZipDirectory(const CefString& src_dir,

7
libcef/common/net_service/net_service_util.cc
View File

@ -19,6 +19,7 @@
#include "net/http/http_status_code.h"
#include "net/url_request/redirect_info.h"
#include "net/url_request/redirect_util.h"
#include "net/url_request/referrer_policy.h"
#include "net/url_request/url_request.h"
#include "services/network/public/cpp/resource_request.h"
@ -180,10 +181,10 @@ net::RedirectInfo MakeRedirectInfo(const network::ResourceRequest& request,
}
}
net::URLRequest::FirstPartyURLPolicy first_party_url_policy =
auto first_party_url_policy =
request.update_first_party_url_on_redirect
? net::URLRequest::UPDATE_FIRST_PARTY_URL_ON_REDIRECT
: net::URLRequest::NEVER_CHANGE_FIRST_PARTY_URL;
? net::RedirectInfo::FirstPartyURLPolicy::UPDATE_URL_ON_REDIRECT
: net::RedirectInfo::FirstPartyURLPolicy::NEVER_CHANGE_URL;
return net::RedirectInfo::ComputeRedirectInfo(
request.method, request.url, request.site_for_cookies,
first_party_url_policy, request.referrer_policy, request.referrer.spec(),

5
libcef/common/request_impl.cc
View File

@ -32,6 +32,7 @@
#include "net/http/http_request_headers.h"
#include "net/http/http_util.h"
#include "net/url_request/redirect_info.h"
#include "net/url_request/referrer_policy.h"
#include "services/network/public/cpp/data_element.h"
#include "services/network/public/cpp/network_switches.h"
#include "services/network/public/cpp/resource_request.h"
@ -241,7 +242,7 @@ CefRefPtr<CefRequest> CefRequest::Create() {
CefRequestImpl::CefRequestImpl() {
// Verify that our enum matches Chromium's values.
static_assert(static_cast<int>(REFERRER_POLICY_LAST_VALUE) ==
static_cast<int>(net::URLRequest::MAX_REFERRER_POLICY),
static_cast<int>(net::ReferrerPolicy::MAX),
"enum mismatch");
base::AutoLock lock_scope(lock_);
@ -498,7 +499,7 @@ void CefRequestImpl::Get(network::ResourceRequest* request,
if (ShouldSet(kChangedReferrer, changed_only)) {
request->referrer = referrer_url_;
request->referrer_policy =
static_cast<net::URLRequest::ReferrerPolicy>(referrer_policy_);
static_cast<net::ReferrerPolicy>(referrer_policy_);
}
if (ShouldSet(kChangedHeaderMap, changed_only)) {

20
libcef/common/resource_util.cc
View File

@ -19,7 +19,7 @@
#include "chrome/common/chrome_switches.h"
#include "ui/base/layout.h"
#if defined(OS_MACOSX)
#if defined(OS_MAC)
#include "base/mac/foundation_util.h"
#include "libcef/common/util_mac.h"
#endif
@ -55,7 +55,7 @@ bool GetSystemFlashFilename(base::FilePath* out_path) {
return true;
}
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
const base::FilePath::CharType kPepperFlashSystemBaseDirectory[] =
FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
@ -78,7 +78,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* result) {
return true;
}
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
// Based on chrome/common/chrome_paths_mac.mm.
bool GetDefaultUserDataDirectory(base::FilePath* result) {
@ -168,7 +168,7 @@ bool GetDefaultDownloadSafeDirectory(base::FilePath* result) {
} // namespace
#if defined(OS_MACOSX)
#if defined(OS_MAC)
base::FilePath GetResourcesDir() {
return util_mac::GetFrameworkResourcesDirectory();
@ -183,7 +183,7 @@ base::FilePath GetDefaultLogFilePath() {
.Append(FILE_PATH_LITERAL(exe_name + "_debug.log"));
}
#else // !defined(OS_MACOSX)
#else // !defined(OS_MAC)
base::FilePath GetResourcesDir() {
base::FilePath pak_dir;
@ -198,26 +198,26 @@ base::FilePath GetDefaultLogFilePath() {
return log_path.Append(FILE_PATH_LITERAL("debug.log"));
}
#endif // !defined(OS_MACOSX)
#endif // !defined(OS_MAC)
void OverridePepperFlashSystemPluginPath() {
#if defined(OS_WIN) || defined(OS_MACOSX)
#if defined(OS_WIN) || defined(OS_MAC)
base::FilePath plugin_filename;
#if defined(OS_WIN)
if (!GetSystemFlashFilename(&plugin_filename))
return;
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
if (!util_mac::GetLocalLibraryDirectory(&plugin_filename))
return;
plugin_filename = plugin_filename.Append(kPepperFlashSystemBaseDirectory)
.Append(chrome::kPepperFlashPluginFilename);
#endif // defined(OS_MACOSX)
#endif // defined(OS_MAC)
if (!plugin_filename.empty()) {
base::PathService::Override(chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN,
plugin_filename);
}
#else // !(defined(OS_WIN) || defined(OS_MACOSX))
#else // !(defined(OS_WIN) || defined(OS_MAC))
// A system plugin is not available on other platforms.
return;
#endif

34
libcef/common/service_manifests/cef_content_browser_overlay_manifest.cc
View File

@ -1,34 +0,0 @@
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "libcef/common/service_manifests/cef_content_browser_overlay_manifest.h"
#include "base/command_line.h"
#include "base/no_destructor.h"
#include "build/build_config.h"
#include "components/metrics/public/mojom/call_stack_profile_collector.mojom.h"
#include "extensions/buildflags/buildflags.h"
#include "services/service_manager/public/cpp/manifest_builder.h"
#if defined(OS_WIN)
#include "chrome/common/conflicts/module_event_sink_win.mojom.h"
#endif
const service_manager::Manifest& GetCefContentBrowserOverlayManifest() {
static base::NoDestructor<service_manager::Manifest> manifest {
service_manager::ManifestBuilder()
.ExposeCapability("gpu",
service_manager::Manifest::InterfaceList<
metrics::mojom::CallStackProfileCollector>())
.ExposeCapability("renderer",
service_manager::Manifest::InterfaceList<
#if defined(OS_WIN)
mojom::ModuleEventSink,
#endif
metrics::mojom::CallStackProfileCollector>())
.RequireCapability("chrome_printing", "converter")
.Build()
};
return *manifest;
}

16
libcef/common/service_manifests/cef_content_browser_overlay_manifest.h
View File

@ -1,16 +0,0 @@
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CEF_LIBCEF_COMMON_SERVICE_MANIFESTS_CEF_CONTENT_BROWSER_OVERLAY_MANIFEST_H_
#define CEF_LIBCEF_COMMON_SERVICE_MANIFESTS_CEF_CONTENT_BROWSER_OVERLAY_MANIFEST_H_
#include "services/service_manager/public/cpp/manifest.h"
// Returns the Manifest CEF amends to Content's content_browser service
// manifest. This allows CEF to extend the capabilities exposed and/or
// required by content_browser service instances, as well as declaring any
// additional in- and out-of-process per-profile packaged services.
const service_manager::Manifest& GetCefContentBrowserOverlayManifest();
#endif // CEF_LIBCEF_COMMON_SERVICE_MANIFESTS_CEF_CONTENT_BROWSER_OVERLAY_MANIFEST_H_

8
libcef/common/urlrequest_impl.cc
View File

@ -7,7 +7,6 @@
#include "libcef/common/app_manager.h"
#include "libcef/common/task_runner_impl.h"
#include "libcef/features/runtime_checks.h"
#include "libcef/renderer/render_urlrequest_impl.h"
#include "base/logging.h"
#include "base/notreached.h"
@ -39,13 +38,6 @@ CefRefPtr<CefURLRequest> CefURLRequest::Create(
if (impl->Start())
return impl.get();
return nullptr;
} else if (content_client->renderer()) {
// In the render process.
CefRefPtr<CefRenderURLRequest> impl =
new CefRenderURLRequest(nullptr, request, client);
if (impl->Start())
return impl.get();
return nullptr;
} else {
NOTREACHED() << "called in unsupported process";
return nullptr;

6
libcef/common/widevine_loader.cc
View File

@ -25,8 +25,8 @@
#include "content/public/common/content_switches.h"
#include "media/cdm/cdm_host_file.h"
#include "media/cdm/supported_cdm_versions.h"
#include "sandbox/policy/switches.h"
#include "services/service_manager/embedder/switches.h"
#include "services/service_manager/sandbox/switches.h"
#include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck
namespace {
@ -38,7 +38,7 @@ base::LazyInstance<CefWidevineLoader>::Leaky g_widevine_loader =
// Name of the Widevine CDM OS in the component manifest.
const char kWidevineCdmOs[] =
#if defined(OS_MACOSX)
#if defined(OS_MAC)
"mac";
#elif defined(OS_WIN)
"win";
@ -473,7 +473,7 @@ void CefWidevineLoader::AddContentDecryptionModules(
// load all plugins before initializing the sandbox.
if (command_line.GetSwitchValueASCII(switches::kProcessType) !=
service_manager::switches::kZygoteProcess ||
command_line.HasSwitch(service_manager::switches::kNoSandbox)) {
command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) {
return;
}