bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-01 11:57:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 96.0.4664.18

Browse Source
This commit is contained in:
Marshall Greenblatt 2021-10-21 19:53:33 -04:00
parent 6872dadd74
commit 30e2decbac
15 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -7,5 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{
'chromium_checkout': 'refs/tags/96.0.4664.0'
'chromium_checkout': 'refs/tags/96.0.4664.18',
'depot_tools_checkout': 'e023d44820'
}

4
patch/patches/browser_scheduler.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/scheduler/browser_task_executor.cc content/browser/scheduler/browser_task_executor.cc
index 3d56ff6e97575..1af9338f883fb 100644
index 8de3da087ea78..e902397694149 100644
--- content/browser/scheduler/browser_task_executor.cc
+++ content/browser/scheduler/browser_task_executor.cc
@@ -285,7 +285,7 @@ BrowserTaskExecutor::OnUserInputStart() {
@@ -300,7 +300,7 @@ BrowserTaskExecutor::OnUserInputStart() {
// static
void BrowserTaskExecutor::Shutdown() {

6
patch/patches/browser_security_policy_1081397.patch
View File

@ -20,10 +20,10 @@ index 4801a199a29d3..11a1d3b328142 100644
// TODO(wjmaclean): We should update the ProcessLock comparison API
diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
index 50bdac2c30caa..2546c845e756a 100644
index b09a22ea4c124..39968d123ebfb 100644
--- content/browser/renderer_host/navigation_request.cc
+++ content/browser/renderer_host/navigation_request.cc
@@ -5737,6 +5737,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
@@ -5759,6 +5759,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
network::mojom::WebSandboxFlags sandbox_flags) {
// Calculate an approximation of the origin. The sandbox/csp are ignored.
url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this);
@ -36,7 +36,7 @@ index 50bdac2c30caa..2546c845e756a 100644
// Apply sandbox flags.
// See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag
@@ -5770,6 +5776,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
@@ -5792,6 +5798,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
if (IsSameDocument() || IsPageActivation())
return GetRenderFrameHost()->GetLastCommittedOrigin();

2
patch/patches/chrome_browser.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 1f848e0760118..29bfa6e602430 100644
index 9572c236c2db5..60c0a8838cfe4 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -13,6 +13,7 @@ import("//build/config/features.gni")

12
patch/patches/chrome_browser_context_menus.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
index fa211d7a0d997..cea251366f5d9 100644
index 901a0baaca6cf..ca05eefd2232b 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -278,6 +278,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
@@ -283,6 +283,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
return callback.get();
}
@ -16,7 +16,7 @@ index fa211d7a0d997..cea251366f5d9 100644
enum class UmaEnumIdLookupType {
GeneralEnumId,
ContextSpecificEnumId,
@@ -491,6 +498,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
@@ -496,6 +503,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
if (ContextMenuMatcher::IsExtensionsCustomCommandId(id))
return 1;
@ -27,7 +27,7 @@ index fa211d7a0d997..cea251366f5d9 100644
id = CollapseCommandsForUMA(id);
const auto& map = GetIdcToUmaMap(type);
auto it = map.find(id);
@@ -673,6 +684,14 @@ RenderViewContextMenu::RenderViewContextMenu(
@@ -678,6 +689,14 @@ RenderViewContextMenu::RenderViewContextMenu(
system_app_ = GetBrowser() && GetBrowser()->app_controller()
? GetBrowser()->app_controller()->system_app()
: nullptr;
@ -42,7 +42,7 @@ index fa211d7a0d997..cea251366f5d9 100644
}
RenderViewContextMenu::~RenderViewContextMenu() = default;
@@ -1031,6 +1050,12 @@ void RenderViewContextMenu::InitMenu() {
@@ -1036,6 +1055,12 @@ void RenderViewContextMenu::InitMenu() {
// menu, meaning that each menu item added/removed in this function will cause
// it to visibly jump on the screen (see b/173569669).
AppendQuickAnswersItems();
@ -55,7 +55,7 @@ index fa211d7a0d997..cea251366f5d9 100644
}
Profile* RenderViewContextMenu::GetProfile() const {
@@ -2849,6 +2874,12 @@ void RenderViewContextMenu::RegisterMenuShownCallbackForTesting(
@@ -2860,6 +2885,12 @@ void RenderViewContextMenu::RegisterMenuShownCallbackForTesting(
*GetMenuShownCallback() = std::move(cb);
}

4
patch/patches/chrome_browser_net_export.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index e9a748c91f743..1b4cc72352e67 100644
index c08bcaa69e2cf..e9eab81f1c96f 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/features.gni")
@ -29,7 +29,7 @@ index e9a748c91f743..1b4cc72352e67 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -5053,6 +5059,7 @@ static_library("ui") {
@@ -5056,6 +5062,7 @@ static_library("ui") {
if (enable_basic_printing) {
deps += [
"//components/printing/browser",

12
patch/patches/chrome_plugins.patch
View File

@ -186,10 +186,10 @@ index 8c2547056ec26..2ab3252dca708 100644
// that the X-Frame-Options protection mechanism is set to either DENY or
// SAMEORIGIN.
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
index 5ff5939031672..01742ddfef449 100644
index b1753145c4c82..cb01f2e43b7fe 100644
--- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc
@@ -943,6 +943,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -946,6 +946,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
status == chrome::mojom::PluginStatus::kBlocked) &&
@ -197,7 +197,7 @@ index 5ff5939031672..01742ddfef449 100644
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
identifier)) {
status = chrome::mojom::PluginStatus::kAllowed;
@@ -1144,7 +1145,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1147,7 +1148,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
plugin_auth_host.BindNewEndpointAndPassReceiver());
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@ -207,7 +207,7 @@ index 5ff5939031672..01742ddfef449 100644
break;
}
case chrome::mojom::PluginStatus::kBlocked: {
@@ -1153,7 +1155,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1156,7 +1158,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
placeholder->AllowLoading();
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@ -217,7 +217,7 @@ index 5ff5939031672..01742ddfef449 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
@@ -1163,7 +1166,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1166,7 +1169,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
group_name));
RenderThread::Get()->RecordAction(
UserMetricsAction("Plugin_BlockedByPolicy"));
@ -227,7 +227,7 @@ index 5ff5939031672..01742ddfef449 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
@@ -1171,7 +1175,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1174,7 +1178,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
IDR_BLOCKED_PLUGIN_HTML,
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
group_name));

2
patch/patches/chrome_renderer.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn
index 0d6bbf294add1..8b438ff31e2a6 100644
index 7886a0d86b243..6e5d0f6d26f88 100644
--- chrome/renderer/BUILD.gn
+++ chrome/renderer/BUILD.gn
@@ -5,6 +5,7 @@

6
patch/patches/chrome_runtime.patch
View File

@ -211,7 +211,7 @@ index 0c8939e57e814..25c0a2acff7dd 100644
bool in_memory,
const base::FilePath& relative_partition_path,
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
index d5ed8faa24cfb..a30a0eed11278 100644
index 77e924414c443..4bc52e14a9722 100644
--- chrome/browser/prefs/browser_prefs.cc
+++ chrome/browser/prefs/browser_prefs.cc
@@ -11,6 +11,7 @@
@ -222,7 +222,7 @@ index d5ed8faa24cfb..a30a0eed11278 100644
#include "chrome/browser/about_flags.h"
#include "chrome/browser/accessibility/accessibility_labels_service.h"
#include "chrome/browser/accessibility/accessibility_ui.h"
@@ -167,6 +168,10 @@
@@ -168,6 +169,10 @@
#include "chrome/browser/background/background_mode_manager.h"
#endif
@ -233,7 +233,7 @@ index d5ed8faa24cfb..a30a0eed11278 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/accessibility/animation_policy_prefs.h"
#include "chrome/browser/apps/platform_apps/shortcut_manager.h"
@@ -1195,6 +1200,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1197,6 +1202,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
SessionDataService::RegisterProfilePrefs(registry);
#endif

6
patch/patches/chrome_runtime_views.patch
View File

@ -377,10 +377,10 @@ index 140c0df49ea46..7d4ac470dcc9a 100644
}
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
index 31e062d75daeb..c6d700e702e56 100644
index f887f0fd2db37..5b9a7fa0d2ee6 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -167,12 +167,13 @@ auto& GetViewCommandMap() {
@@ -166,12 +166,13 @@ auto& GetViewCommandMap() {
////////////////////////////////////////////////////////////////////////////////
// ToolbarView, public:
@ -396,7 +396,7 @@ index 31e062d75daeb..c6d700e702e56 100644
SetID(VIEW_ID_TOOLBAR);
UpgradeDetector::GetInstance()->AddObserver(this);
@@ -207,7 +208,7 @@ void ToolbarView::Init() {
@@ -206,7 +207,7 @@ void ToolbarView::Init() {
#endif
auto location_bar = std::make_unique<LocationBarView>(
browser_, browser_->profile(), browser_->command_controller(), this,

16
patch/patches/content_2015.patch
View File

@ -75,10 +75,10 @@ index 18b58f53a9df7..80452f68f24fb 100644
GetContentClient()->browser()->GetUserAgent());
version.SetString("V8-Version", V8_VERSION_STRING);
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
index 06517d7afaaa2..e368b300c5e30 100644
index 0cb9f2d42ed76..00cb95ee7702a 100644
--- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc
@@ -670,6 +670,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
@@ -677,6 +677,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
resource_request_->has_user_gesture, initiating_origin,
&loader_factory);
@ -92,7 +92,7 @@ index 06517d7afaaa2..e368b300c5e30 100644
if (loader_factory) {
factory = base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
std::move(loader_factory));
@@ -838,7 +845,7 @@ void NavigationURLLoaderImpl::CheckPluginAndContinueOnReceiveResponse(
@@ -845,7 +852,7 @@ void NavigationURLLoaderImpl::CheckPluginAndContinueOnReceiveResponse(
frame_tree_node->current_frame_host()->GetProcess()->GetID();
int routing_id = frame_tree_node->current_frame_host()->GetRoutingID();
bool has_plugin = PluginService::GetInstance()->GetPluginInfo(
@ -188,10 +188,10 @@ index 632ae86c6fd69..55b749ec12421 100644
const std::vector<WebPluginInfo>& all_plugins);
diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
index 6520b9b7e90aa..60af548b678cc 100644
index 10c5c18955e58..2b8fcbf204d7f 100644
--- content/browser/renderer_host/render_frame_host_impl.cc
+++ content/browser/renderer_host/render_frame_host_impl.cc
@@ -12341,6 +12341,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
@@ -12355,6 +12355,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
}
void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
@ -199,7 +199,7 @@ index 6520b9b7e90aa..60af548b678cc 100644
const url::Origin& main_frame_origin,
const std::string& mime_type,
GetPluginInfoCallback callback) {
@@ -12348,7 +12349,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
@@ -12362,7 +12363,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
WebPluginInfo info;
std::string actual_mime_type;
bool found = PluginServiceImpl::GetInstance()->GetPluginInfo(
@ -210,10 +210,10 @@ index 6520b9b7e90aa..60af548b678cc 100644
std::move(callback).Run(found, info, actual_mime_type);
}
diff --git content/browser/renderer_host/render_frame_host_impl.h content/browser/renderer_host/render_frame_host_impl.h
index 86666516a0131..c1e11fbfda6fb 100644
index e324c9c06e4ee..8dd3f6f10ed6e 100644
--- content/browser/renderer_host/render_frame_host_impl.h
+++ content/browser/renderer_host/render_frame_host_impl.h
@@ -2614,6 +2614,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -2617,6 +2617,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
int32_t plugin_child_id,
const base::FilePath& path) override;
void GetPluginInfo(const GURL& url,

8
patch/patches/print_preview_123.patch
View File

@ -314,10 +314,10 @@ index b3a6eaa270877..aa4e84fea1387 100644
base::FilePath GetSaveLocation() const;
diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
index 7695cf2a3a2e2..887e047b83b72 100644
index a72645a12ac07..bfe1e2dce3662 100644
--- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -29,6 +29,7 @@
@@ -23,6 +23,7 @@
#include "base/values.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@ -325,7 +325,7 @@ index 7695cf2a3a2e2..887e047b83b72 100644
#include "chrome/browser/browser_process.h"
#include "chrome/browser/pdf/pdf_extension_util.h"
#include "chrome/browser/printing/background_printing_manager.h"
@@ -102,6 +103,13 @@ const char16_t kBasicPrintShortcut[] = u"\u0028\u21e7\u2318\u0050\u0029";
@@ -98,6 +99,13 @@ const char16_t kBasicPrintShortcut[] = u"\u0028\u21e7\u2318\u0050\u0029";
const char16_t kBasicPrintShortcut[] = u"(Ctrl+Shift+P)";
#endif
@ -339,7 +339,7 @@ index 7695cf2a3a2e2..887e047b83b72 100644
constexpr char kInvalidArgsForDidStartPreview[] =
"Invalid arguments for DidStartPreview";
constexpr char kInvalidPageNumberForDidPreviewPage[] =
@@ -391,7 +399,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
@@ -344,7 +352,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
chrome::kCloudPrintCertificateErrorLearnMoreURL);
#if !defined(OS_CHROMEOS)

4
patch/patches/views_widget.patch
View File

@ -130,10 +130,10 @@ index 0cad4e1f9731b..94d9e189661af 100644
// Set the view's active state (i.e., tint state of controls).
virtual void SetActive(bool active) = 0;
diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc
index fc0efff4de309..dfe777e029869 100644
index 8ae1783e5aa2e..c683f5fb30e46 100644
--- ui/platform_window/x11/x11_window.cc
+++ ui/platform_window/x11/x11_window.cc
@@ -1680,7 +1680,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
@@ -1697,7 +1697,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
req.border_pixel = 0;
bounds_in_pixels_ = SanitizeBounds(bounds);

12
patch/patches/web_contents_1257_1565.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index e7e2e3d3163bb..e12381457f0bb 100644
index 818585d3aca6d..693fe42f3894b 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -2899,6 +2899,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2900,6 +2900,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
frame_tree_.Init(site_instance.get(), params.renderer_initiated_creation,
params.main_frame_name);
@ -15,7 +15,7 @@ index e7e2e3d3163bb..e12381457f0bb 100644
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -2909,6 +2915,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2910,6 +2916,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
view_.reset(CreateWebContentsView(this, delegate,
&render_view_host_delegate_view_));
}
@ -23,7 +23,7 @@ index e7e2e3d3163bb..e12381457f0bb 100644
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -3739,6 +3746,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -3743,6 +3750,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
// objects.
create_params.renderer_initiated_creation = !is_new_browsing_instance;
@ -39,7 +39,7 @@ index e7e2e3d3163bb..e12381457f0bb 100644
std::unique_ptr<WebContentsImpl> new_contents;
if (!is_guest) {
create_params.context = view_->GetNativeView();
@@ -7526,6 +7542,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
@@ -7530,6 +7546,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// This is an outermost WebContents.
SetAsFocusedWebContentsIfNecessary();
}
@ -62,7 +62,7 @@ index c7302d7af6d8b..d19be54f36d39 100644
creator_location(creator_location) {}
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
index bfa0e468e11e6..31061d5821e60 100644
index 370d9e11c78e7..7153d479b9f19 100644
--- content/public/browser/web_contents.h
+++ content/public/browser/web_contents.h
@@ -88,10 +88,12 @@ class BrowserContext;

4
patch/patches/webview_plugin_2020.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
index 84a68402edbd8..8545827ce5682 100644
index 48174dff2344d..64073cc402e6f 100644
--- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd
@@ -5372,7 +5372,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
@@ -5384,7 +5384,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message>
</if>
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">