mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 90.0.4430.0 (#857950)
- Linux ARM builds require use_vaapi=false (see https://crbug.com/1185348) - Windows official builds require use_thin_lto=false (see https://crbug.com/1177001)
This commit is contained in:
@@ -65,15 +65,15 @@ CefComponentExtensionResourceManager::GetTemplateReplacementsForExtension(
|
||||
}
|
||||
|
||||
void CefComponentExtensionResourceManager::AddComponentResourceEntries(
|
||||
const GritResourceMap* entries,
|
||||
const webui::ResourcePath* entries,
|
||||
size_t size) {
|
||||
for (size_t i = 0; i < size; ++i) {
|
||||
base::FilePath resource_path =
|
||||
base::FilePath().AppendASCII(entries[i].name);
|
||||
base::FilePath().AppendASCII(entries[i].path);
|
||||
resource_path = resource_path.NormalizePathSeparators();
|
||||
|
||||
DCHECK(!base::Contains(path_to_resource_info_, resource_path));
|
||||
path_to_resource_info_[resource_path] = entries[i].value;
|
||||
path_to_resource_info_[resource_path] = entries[i].id;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -11,7 +11,9 @@
|
||||
#include "base/macros.h"
|
||||
#include "extensions/browser/component_extension_resource_manager.h"
|
||||
|
||||
struct GritResourceMap;
|
||||
namespace webui {
|
||||
struct ResourcePath;
|
||||
}
|
||||
|
||||
namespace extensions {
|
||||
|
||||
@@ -29,7 +31,8 @@ class CefComponentExtensionResourceManager
|
||||
const std::string& extension_id) const override;
|
||||
|
||||
private:
|
||||
void AddComponentResourceEntries(const GritResourceMap* entries, size_t size);
|
||||
void AddComponentResourceEntries(const webui::ResourcePath* entries,
|
||||
size_t size);
|
||||
|
||||
// A map from a resource path to the resource ID. Used by
|
||||
// IsComponentExtensionResource.
|
||||
|
@@ -20,7 +20,7 @@ CefExtensionHostDelegate::~CefExtensionHostDelegate() {}
|
||||
void CefExtensionHostDelegate::OnExtensionHostCreated(
|
||||
content::WebContents* web_contents) {}
|
||||
|
||||
void CefExtensionHostDelegate::OnRenderViewCreatedForBackgroundPage(
|
||||
void CefExtensionHostDelegate::OnMainFrameCreatedForBackgroundPage(
|
||||
ExtensionHost* host) {}
|
||||
|
||||
content::JavaScriptDialogManager*
|
||||
|
@@ -19,7 +19,7 @@ class CefExtensionHostDelegate : public ExtensionHostDelegate {
|
||||
|
||||
// ExtensionHostDelegate implementation.
|
||||
void OnExtensionHostCreated(content::WebContents* web_contents) override;
|
||||
void OnRenderViewCreatedForBackgroundPage(ExtensionHost* host) override;
|
||||
void OnMainFrameCreatedForBackgroundPage(ExtensionHost* host) override;
|
||||
content::JavaScriptDialogManager* GetJavaScriptDialogManager() override;
|
||||
void CreateTab(std::unique_ptr<content::WebContents> web_contents,
|
||||
const std::string& extension_id,
|
||||
|
@@ -407,7 +407,7 @@ ServiceWorkerManager* CefExtensionSystem::service_worker_manager() {
|
||||
return service_worker_manager_.get();
|
||||
}
|
||||
|
||||
SharedUserScriptManager* CefExtensionSystem::shared_user_script_manager() {
|
||||
UserScriptManager* CefExtensionSystem::user_script_manager() {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
@@ -87,7 +87,7 @@ class CefExtensionSystem : public ExtensionSystem {
|
||||
RuntimeData* runtime_data() override;
|
||||
ManagementPolicy* management_policy() override;
|
||||
ServiceWorkerManager* service_worker_manager() override;
|
||||
SharedUserScriptManager* shared_user_script_manager() override;
|
||||
UserScriptManager* user_script_manager() override;
|
||||
StateStore* state_store() override;
|
||||
StateStore* rules_store() override;
|
||||
scoped_refptr<ValueStoreFactory> store_factory() override;
|
||||
|
Reference in New Issue
Block a user