mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 76.0.3809.0 (#665002)
OSR tests will be fixed by a follow-up merge of Viz support (see issue #2575).
This commit is contained in:
committed by
Marshall Greenblatt
parent
5892ffc382
commit
cc0db5f166
@@ -249,7 +249,7 @@ base::string16 CefContentClient::GetLocalizedString(
|
||||
int message_id,
|
||||
const base::string16& replacement) const {
|
||||
base::string16 value = l10n_util::GetStringFUTF16(message_id, replacement);
|
||||
if (value.empty())
|
||||
if (value.empty())
|
||||
LOG(ERROR) << "No localized string available for id " << message_id;
|
||||
|
||||
return value;
|
||||
@@ -278,6 +278,10 @@ base::RefCountedMemory* CefContentClient::GetDataResourceBytes(
|
||||
return value;
|
||||
}
|
||||
|
||||
bool CefContentClient::IsDataResourceGzipped(int resource_id) const {
|
||||
return ui::ResourceBundle::GetSharedInstance().IsGzipped(resource_id);
|
||||
}
|
||||
|
||||
gfx::Image& CefContentClient::GetNativeImageNamed(int resource_id) const {
|
||||
gfx::Image& value =
|
||||
ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
|
||||
|
@@ -45,6 +45,7 @@ class CefContentClient : public content::ContentClient,
|
||||
int resource_id,
|
||||
ui::ScaleFactor scale_factor) const override;
|
||||
base::RefCountedMemory* GetDataResourceBytes(int resource_id) const override;
|
||||
bool IsDataResourceGzipped(int resource_id) const override;
|
||||
gfx::Image& GetNativeImageNamed(int resource_id) const override;
|
||||
|
||||
// Values are registered with all processes (url/url_util.h) and with Blink
|
||||
|
@@ -80,12 +80,6 @@ bool CefExtensionsClient::IsScriptableURL(const GURL& url,
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CefExtensionsClient::ShouldSuppressFatalErrors() const {
|
||||
return true;
|
||||
}
|
||||
|
||||
void CefExtensionsClient::RecordDidSuppressFatalError() {}
|
||||
|
||||
const GURL& CefExtensionsClient::GetWebstoreBaseURL() const {
|
||||
return webstore_base_url_;
|
||||
}
|
||||
|
@@ -35,8 +35,6 @@ class CefExtensionsClient : public ExtensionsClient {
|
||||
const Extension* extension,
|
||||
const APIPermissionSet& api_permissions) const override;
|
||||
bool IsScriptableURL(const GURL& url, std::string* error) const override;
|
||||
bool ShouldSuppressFatalErrors() const override;
|
||||
void RecordDidSuppressFatalError() override;
|
||||
const GURL& GetWebstoreBaseURL() const override;
|
||||
const GURL& GetWebstoreUpdateURL() const override;
|
||||
bool IsBlacklistUpdateURL(const GURL& url) const override;
|
||||
|
@@ -46,6 +46,7 @@
|
||||
#include "extensions/common/constants.h"
|
||||
#include "ipc/ipc_buildflags.h"
|
||||
#include "pdf/pdf_ppapi.h"
|
||||
#include "services/network/public/cpp/features.h"
|
||||
#include "services/service_manager/sandbox/switches.h"
|
||||
#include "ui/base/layout.h"
|
||||
#include "ui/base/resource/resource_bundle.h"
|
||||
@@ -566,6 +567,12 @@ bool CefMainDelegate::BasicStartupComplete(int* exit_code) {
|
||||
}
|
||||
}
|
||||
|
||||
if (network::features::kOutOfBlinkCors.default_state ==
|
||||
base::FEATURE_ENABLED_BY_DEFAULT) {
|
||||
// TODO: Add support for out-of-Blink CORS (see issue #2716)
|
||||
disable_features.push_back(network::features::kOutOfBlinkCors.name);
|
||||
}
|
||||
|
||||
if (!disable_features.empty()) {
|
||||
DCHECK(!base::FeatureList::GetInstance());
|
||||
std::string disable_features_str =
|
||||
|
@@ -130,7 +130,8 @@ CefString CefURIDecode(const CefString& text,
|
||||
const net::UnescapeRule::Type type =
|
||||
static_cast<net::UnescapeRule::Type>(unescape_rule);
|
||||
if (convert_to_utf8)
|
||||
return net::UnescapeAndDecodeUTF8URLComponent(text.ToString(), type);
|
||||
return net::UnescapeAndDecodeUTF8URLComponentWithAdjustments(
|
||||
text.ToString(), type, NULL);
|
||||
else
|
||||
return net::UnescapeURLComponent(text.ToString(), type);
|
||||
}
|
||||
|
@@ -2,7 +2,7 @@
|
||||
// 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_packaged_service_manifests.h"
|
||||
#include "libcef/common/service_manifests/builtin_service_manifests.h"
|
||||
|
||||
#include "base/no_destructor.h"
|
||||
#include "build/build_config.h"
|
||||
@@ -28,13 +28,16 @@ const service_manager::Manifest& GetCefManifest() {
|
||||
service_manager::ManifestBuilder()
|
||||
.WithServiceName(chrome::mojom::kServiceName)
|
||||
.WithDisplayName("CEF")
|
||||
.WithOptions(service_manager::ManifestOptionsBuilder()
|
||||
.WithInstanceSharingPolicy(
|
||||
service_manager::Manifest::InstanceSharingPolicy::
|
||||
kSharedAcrossGroups)
|
||||
.CanConnectToInstancesWithAnyId(true)
|
||||
.CanRegisterOtherServiceInstances(true)
|
||||
.Build())
|
||||
.WithOptions(
|
||||
service_manager::ManifestOptionsBuilder()
|
||||
.WithExecutionMode(
|
||||
service_manager::Manifest::ExecutionMode::kInProcessBuiltin)
|
||||
.WithInstanceSharingPolicy(
|
||||
service_manager::Manifest::InstanceSharingPolicy::
|
||||
kSharedAcrossGroups)
|
||||
.CanConnectToInstancesWithAnyId(true)
|
||||
.CanRegisterOtherServiceInstances(true)
|
||||
.Build())
|
||||
.ExposeCapability("renderer",
|
||||
service_manager::Manifest::InterfaceList<
|
||||
#if defined(OS_MACOSX)
|
||||
@@ -50,7 +53,7 @@ const service_manager::Manifest& GetCefManifest() {
|
||||
|
||||
} // namespace
|
||||
|
||||
const std::vector<service_manager::Manifest>& GetCefPackagedServiceManifests() {
|
||||
const std::vector<service_manager::Manifest>& GetBuiltinServiceManifests() {
|
||||
static base::NoDestructor<std::vector<service_manager::Manifest>> manifests{{
|
||||
GetCefManifest(),
|
||||
proxy_resolver::GetManifest(),
|
@@ -12,6 +12,6 @@
|
||||
// Returns manifests for all shared (i.e. cross-profile) services packaged by
|
||||
// CEF but not packaged by Content. This includes both in- and out-of-process
|
||||
// services.
|
||||
const std::vector<service_manager::Manifest>& GetCefPackagedServiceManifests();
|
||||
const std::vector<service_manager::Manifest>& GetBuiltinServiceManifests();
|
||||
|
||||
#endif // CEF_LIBCEF_COMMON_SERVICE_MANIFESTS_CEF_PACKAGED_SERVICE_MANIFESTS_H_
|
Reference in New Issue
Block a user