mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-30 11:04:52 +01:00
Update to Chromium version 121.0.6167.16
This commit is contained in:
parent
206b7b1c95
commit
7a4b55f970
@ -7,5 +7,6 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/121.0.6167.0'
|
'chromium_checkout': 'refs/tags/121.0.6167.16',
|
||||||
|
'depot_tools_checkout': '6444de14d1'
|
||||||
}
|
}
|
||||||
|
@ -20,7 +20,7 @@ index 0f781fe1c2b2e..6456de7ad1c39 100644
|
|||||||
|
|
||||||
// Make an exception to allow most visited tiles to commit in
|
// Make an exception to allow most visited tiles to commit in
|
||||||
diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
|
diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
|
||||||
index 64248db4bfc64..ea5037256498f 100644
|
index b0375e9e27ed9..30d1c980e924e 100644
|
||||||
--- content/browser/renderer_host/navigation_request.cc
|
--- content/browser/renderer_host/navigation_request.cc
|
||||||
+++ content/browser/renderer_host/navigation_request.cc
|
+++ content/browser/renderer_host/navigation_request.cc
|
||||||
@@ -7610,10 +7610,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
|
@@ -7610,10 +7610,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||||
index 331f5dc64de39..803b471e9764a 100644
|
index c154e3a6a1c3f..3363daf574f77 100644
|
||||||
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||||
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||||
@@ -355,6 +355,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
|
@@ -355,6 +355,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
|
||||||
@ -55,7 +55,7 @@ index 331f5dc64de39..803b471e9764a 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
Profile* RenderViewContextMenu::GetProfile() const {
|
Profile* RenderViewContextMenu::GetProfile() const {
|
||||||
@@ -3452,6 +3477,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
|
@@ -3453,6 +3478,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
|
||||||
execute_plugin_action_callback_ = std::move(cb);
|
execute_plugin_action_callback_ = std::move(cb);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ index 5cb3cff75871c..51333ff7d85e2 100644
|
|||||||
#include "chrome/common/chrome_paths.h"
|
#include "chrome/common/chrome_paths.h"
|
||||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||||
|
|
||||||
@@ -47,11 +48,6 @@
|
@@ -47,11 +48,6 @@ const char kEnrollmentOptionsFilePath[] = FILE_PATH_LITERAL(
|
||||||
"/Library/Google/Chrome/CloudManagementEnrollmentOptions");
|
"/Library/Google/Chrome/CloudManagementEnrollmentOptions");
|
||||||
const char kEnrollmentMandatoryOption[] = "Mandatory";
|
const char kEnrollmentMandatoryOption[] = "Mandatory";
|
||||||
|
|
||||||
@ -304,7 +304,7 @@ index 1a2e78c3472ec..5d1bd95a15113 100644
|
|||||||
#include "components/policy/policy_constants.h"
|
#include "components/policy/policy_constants.h"
|
||||||
|
|
||||||
namespace policy::path_parser {
|
namespace policy::path_parser {
|
||||||
@@ -97,16 +98,12 @@
|
@@ -97,16 +98,12 @@ base::FilePath::StringType ExpandPathVariables(
|
||||||
void CheckUserDataDirPolicy(base::FilePath* user_data_dir) {
|
void CheckUserDataDirPolicy(base::FilePath* user_data_dir) {
|
||||||
// Since the configuration management infrastructure is not initialized when
|
// Since the configuration management infrastructure is not initialized when
|
||||||
// this code runs, read the policy preference directly.
|
// this code runs, read the policy preference directly.
|
||||||
|
@ -363,7 +363,7 @@ index 0c231b6ac5b01..6b5af98e18e42 100644
|
|||||||
BrowserFrame(const BrowserFrame&) = delete;
|
BrowserFrame(const BrowserFrame&) = delete;
|
||||||
BrowserFrame& operator=(const BrowserFrame&) = delete;
|
BrowserFrame& operator=(const BrowserFrame&) = delete;
|
||||||
diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
|
diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
|
||||||
index c74a820ce00ad..55267b61c15af 100644
|
index 79a1220f51d81..1f43f36cc2743 100644
|
||||||
--- chrome/browser/ui/views/frame/browser_view.cc
|
--- chrome/browser/ui/views/frame/browser_view.cc
|
||||||
+++ chrome/browser/ui/views/frame/browser_view.cc
|
+++ chrome/browser/ui/views/frame/browser_view.cc
|
||||||
@@ -342,11 +342,10 @@ using content::NativeWebKeyboardEvent;
|
@@ -342,11 +342,10 @@ using content::NativeWebKeyboardEvent;
|
||||||
@ -594,7 +594,7 @@ index c74a820ce00ad..55267b61c15af 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
|
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
|
||||||
@@ -5133,6 +5193,8 @@ Profile* BrowserView::GetProfile() {
|
@@ -5142,6 +5202,8 @@ Profile* BrowserView::GetProfile() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserView::UpdateUIForTabFullscreen() {
|
void BrowserView::UpdateUIForTabFullscreen() {
|
||||||
@ -603,7 +603,7 @@ index c74a820ce00ad..55267b61c15af 100644
|
|||||||
frame()->GetFrameView()->UpdateFullscreenTopUI();
|
frame()->GetFrameView()->UpdateFullscreenTopUI();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5155,6 +5217,8 @@ void BrowserView::HideDownloadShelf() {
|
@@ -5164,6 +5226,8 @@ void BrowserView::HideDownloadShelf() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool BrowserView::CanUserExitFullscreen() const {
|
bool BrowserView::CanUserExitFullscreen() const {
|
||||||
|
@ -10,10 +10,10 @@ index 17b1395583e24..9b41b21f42b1f 100644
|
|||||||
+// This load will not send any cookies. For CEF usage.
|
+// This load will not send any cookies. For CEF usage.
|
||||||
+LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 20)
|
+LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 20)
|
||||||
diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc
|
diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc
|
||||||
index dd14dce03cc93..eb25e13036d1a 100644
|
index 497e05acd9df5..6a821e88a2387 100644
|
||||||
--- net/url_request/url_request_http_job.cc
|
--- net/url_request/url_request_http_job.cc
|
||||||
+++ net/url_request/url_request_http_job.cc
|
+++ net/url_request/url_request_http_job.cc
|
||||||
@@ -1812,7 +1812,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const {
|
@@ -1821,7 +1821,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const {
|
||||||
// Read cookies whenever allow_credentials() is true, even if the PrivacyMode
|
// Read cookies whenever allow_credentials() is true, even if the PrivacyMode
|
||||||
// is being overridden by NetworkDelegate and will eventually block them, as
|
// is being overridden by NetworkDelegate and will eventually block them, as
|
||||||
// blocked cookies still need to be logged in that case.
|
// blocked cookies still need to be logged in that case.
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
|
diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
index 6377dafc2eeac..1e0062bd83343 100644
|
index 17683fab4f4d8..acfd14fcb3581 100644
|
||||||
--- content/browser/renderer_host/render_frame_host_impl.cc
|
--- content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
+++ content/browser/renderer_host/render_frame_host_impl.cc
|
+++ content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
@@ -10082,6 +10082,7 @@ void RenderFrameHostImpl::CommitNavigation(
|
@@ -10185,6 +10185,7 @@ void RenderFrameHostImpl::CommitNavigation(
|
||||||
auto browser_calc_origin_to_commit =
|
auto browser_calc_origin_to_commit =
|
||||||
navigation_request->GetOriginToCommitWithDebugInfo();
|
navigation_request->GetOriginToCommitWithDebugInfo();
|
||||||
if (!process_lock.is_error_page() && !is_mhtml_subframe &&
|
if (!process_lock.is_error_page() && !is_mhtml_subframe &&
|
||||||
|
@ -223,7 +223,7 @@ index 2f462f0deb5fc..695869b83cefa 100644
|
|||||||
+ Draw(gfx.mojom.Rect damage_rect) => ();
|
+ Draw(gfx.mojom.Rect damage_rect) => ();
|
||||||
};
|
};
|
||||||
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
|
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
|
||||||
index d2d3757f75a6b..a69f9af6c2c08 100644
|
index 64a305d0b2878..6e072a28ff71c 100644
|
||||||
--- ui/compositor/compositor.h
|
--- ui/compositor/compositor.h
|
||||||
+++ ui/compositor/compositor.h
|
+++ ui/compositor/compositor.h
|
||||||
@@ -33,7 +33,9 @@
|
@@ -33,7 +33,9 @@
|
||||||
@ -261,7 +261,7 @@ index d2d3757f75a6b..a69f9af6c2c08 100644
|
|||||||
// Sets the root of the layer tree drawn by this Compositor. The root layer
|
// Sets the root of the layer tree drawn by this Compositor. The root layer
|
||||||
// must have no parent. The compositor's root layer is reset if the root layer
|
// must have no parent. The compositor's root layer is reset if the root layer
|
||||||
// is destroyed. NULL can be passed to reset the root layer, in which case the
|
// is destroyed. NULL can be passed to reset the root layer, in which case the
|
||||||
@@ -543,6 +556,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
|
@@ -544,6 +557,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
|
||||||
|
|
||||||
std::unique_ptr<PendingBeginFrameArgs> pending_begin_frame_args_;
|
std::unique_ptr<PendingBeginFrameArgs> pending_begin_frame_args_;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user