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 80.0.3987.0 (#722274)

Browse Source
This commit is contained in:
Alexander Guettler
2020-02-10 12:10:17 -05:00
committed by Marshall Greenblatt
parent ed39922f85
commit 71768ea6c3
131 changed files with 1620 additions and 1394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libcef/common/cef_messages.h
View File

@@ -10,7 +10,7 @@
#include "libcef/common/net/upload_data.h"
#include "base/memory/shared_memory.h"
#include "base/memory/shared_memory_mapping.h"
#include "base/values.h"
#include "content/public/common/common_param_traits.h"
#include "content/public/common/referrer.h"
@@ -188,9 +188,6 @@ IPC_SYNC_MESSAGE_CONTROL1_1(
// Sent by the renderer when the frame can begin receiving messages.
IPC_MESSAGE_ROUTED0(CefHostMsg_FrameAttached)
// Sent by the renderer when the frame becomes focused.
IPC_MESSAGE_ROUTED0(CefHostMsg_FrameFocused)
// Sent when a frame has finished loading. Based on ViewHostMsg_DidFinishLoad.
IPC_MESSAGE_ROUTED2(CefHostMsg_DidFinishLoad,
GURL /* validated_url */,

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

@@ -9,8 +9,6 @@
#include "build/build_config.h"
#include "components/metrics/public/mojom/call_stack_profile_collector.mojom.h"
#include "extensions/buildflags/buildflags.h"
#include "extensions/common/api/mime_handler.mojom.h" // nogncheck
#include "extensions/common/mojom/keep_alive.mojom.h" // nogncheck
#include "services/service_manager/public/cpp/manifest_builder.h"
#if defined(OS_WIN)
@@ -30,12 +28,6 @@ const service_manager::Manifest& GetCefContentBrowserOverlayManifest() {
#endif
metrics::mojom::CallStackProfileCollector>())
.RequireCapability("chrome_printing", "converter")
.ExposeInterfaceFilterCapability_Deprecated(
"navigation:frame", "renderer",
service_manager::Manifest::InterfaceList<
extensions::KeepAlive,
extensions::mime_handler::BeforeUnloadControl,
extensions::mime_handler::MimeHandlerService>())
.Build()
};
return *manifest;

29
libcef/common/service_manifests/cef_content_renderer_overlay_manifest.cc
View File

@@ -1,29 +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_renderer_overlay_manifest.h"
#include "base/no_destructor.h"
#include "build/build_config.h"
#include "components/subresource_filter/content/mojom/subresource_filter_agent.mojom.h"
#include "extensions/buildflags/buildflags.h"
#include "services/service_manager/public/cpp/manifest_builder.h"
#if defined(OS_MACOSX)
#include "components/spellcheck/common/spellcheck_panel.mojom.h"
#endif
const service_manager::Manifest& GetCefContentRendererOverlayManifest() {
static base::NoDestructor<service_manager::Manifest> manifest {
service_manager::ManifestBuilder()
#if defined(OS_MACOSX)
.ExposeInterfaceFilterCapability_Deprecated(
"navigation:frame", "browser",
service_manager::Manifest::InterfaceList<
spellcheck::mojom::SpellCheckPanel>())
#endif
.Build()
};
return *manifest;
}

15
libcef/common/service_manifests/cef_content_renderer_overlay_manifest.h
View File

@@ -1,15 +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_RENDERER_OVERLAY_MANIFEST_H_
#define CEF_LIBCEF_COMMON_SERVICE_MANIFESTS_CEF_CONTENT_RENDERER_OVERLAY_MANIFEST_H_
#include "services/service_manager/public/cpp/manifest.h"
// Returns the Manifest CEF amends to Content's content_renderer service
// manifest. This allows CEF to extend the set of capabilities exposed and/or
// required by content_renderer service instances.
const service_manager::Manifest& GetCefContentRendererOverlayManifest();
#endif // CEF_LIBCEF_COMMON_SERVICE_MANIFESTS_CEF_CONTENT_RENDERER_OVERLAY_MANIFEST_H_

10
libcef/common/widevine_loader.cc
View File

@@ -251,7 +251,7 @@ bool GetCodecs(const base::DictionaryValue& manifest,
// fail. Unrecognized values will be reported but otherwise ignored.
bool GetEncryptionSchemes(
const base::DictionaryValue& manifest,
base::flat_set<media::EncryptionMode>* encryption_schemes,
base::flat_set<media::EncryptionScheme>* encryption_schemes,
std::string* error_message) {
DCHECK(encryption_schemes);
@@ -260,7 +260,7 @@ bool GetEncryptionSchemes(
if (!value) {
// No manifest entry found, so assume only 'cenc' supported for backwards
// compatibility.
encryption_schemes->insert(media::EncryptionMode::kCenc);
encryption_schemes->insert(media::EncryptionScheme::kCenc);
return true;
}
@@ -273,7 +273,7 @@ bool GetEncryptionSchemes(
}
const base::span<const base::Value> list = value->GetList();
base::flat_set<media::EncryptionMode> result;
base::flat_set<media::EncryptionScheme> result;
for (const auto& item : list) {
if (!item.is_string()) {
std::stringstream ss;
@@ -285,9 +285,9 @@ bool GetEncryptionSchemes(
const std::string& scheme = item.GetString();
if (scheme == kCdmSupportedEncryptionSchemeCenc) {
result.insert(media::EncryptionMode::kCenc);
result.insert(media::EncryptionScheme::kCenc);
} else if (scheme == kCdmSupportedEncryptionSchemeCbcs) {
result.insert(media::EncryptionMode::kCbcs);
result.insert(media::EncryptionScheme::kCbcs);
} else {
std::stringstream ss;
ss << "Unrecognized encryption scheme " << scheme << " in manifest entry "