mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 107.0.5304.29
This commit is contained in:
committed by
Marshall Greenblatt
parent
92f0b8a971
commit
e2ebe99118
@@ -7,6 +7,6 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/107.0.5304.18',
|
'chromium_checkout': 'refs/tags/107.0.5304.29',
|
||||||
'depot_tools_checkout': 'e3ed6a8e01'
|
'depot_tools_checkout': 'e3ed6a8e01'
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||||
index 6256a29956a8c..9a70f9d6b1036 100644
|
index 8a745f6c29c0d..925acef4d38bb 100644
|
||||||
--- chrome/browser/BUILD.gn
|
--- chrome/browser/BUILD.gn
|
||||||
+++ chrome/browser/BUILD.gn
|
+++ chrome/browser/BUILD.gn
|
||||||
@@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
|
@@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
|
||||||
@@ -29,7 +29,7 @@ index 6256a29956a8c..9a70f9d6b1036 100644
|
|||||||
if (is_android) {
|
if (is_android) {
|
||||||
sources += [
|
sources += [
|
||||||
"after_startup_task_utils_android.cc",
|
"after_startup_task_utils_android.cc",
|
||||||
@@ -6353,8 +6359,6 @@ static_library("browser") {
|
@@ -6352,8 +6358,6 @@ static_library("browser") {
|
||||||
sources += [
|
sources += [
|
||||||
"enterprise/chrome_browser_main_extra_parts_enterprise.cc",
|
"enterprise/chrome_browser_main_extra_parts_enterprise.cc",
|
||||||
"enterprise/chrome_browser_main_extra_parts_enterprise.h",
|
"enterprise/chrome_browser_main_extra_parts_enterprise.h",
|
||||||
|
@@ -13,7 +13,7 @@ index af62c19be9db6..d58f033cffecc 100644
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
|
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
|
||||||
index 5924da48d273f..a62a08dd7a8b7 100644
|
index 0f07ad9591c2a..9e8a3365ceb31 100644
|
||||||
--- chrome/browser/ui/BUILD.gn
|
--- chrome/browser/ui/BUILD.gn
|
||||||
+++ chrome/browser/ui/BUILD.gn
|
+++ chrome/browser/ui/BUILD.gn
|
||||||
@@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni")
|
@@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni")
|
||||||
@@ -43,7 +43,7 @@ index 5924da48d273f..a62a08dd7a8b7 100644
|
|||||||
"//chrome:extra_resources",
|
"//chrome:extra_resources",
|
||||||
"//chrome:resources",
|
"//chrome:resources",
|
||||||
"//chrome:strings",
|
"//chrome:strings",
|
||||||
@@ -5671,6 +5677,7 @@ static_library("ui") {
|
@@ -5673,6 +5679,7 @@ static_library("ui") {
|
||||||
if (enable_basic_printing) {
|
if (enable_basic_printing) {
|
||||||
deps += [
|
deps += [
|
||||||
"//components/printing/browser",
|
"//components/printing/browser",
|
||||||
|
@@ -198,7 +198,7 @@ index 791b74ef57995..20cd406ff81bb 100644
|
|||||||
+#endif
|
+#endif
|
||||||
}
|
}
|
||||||
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
|
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
|
||||||
index 6f268f5937bd5..2152a26496ceb 100644
|
index 52e08d175a0a3..5e2511dfd3e8e 100644
|
||||||
--- chrome/browser/chrome_content_browser_client.cc
|
--- chrome/browser/chrome_content_browser_client.cc
|
||||||
+++ chrome/browser/chrome_content_browser_client.cc
|
+++ chrome/browser/chrome_content_browser_client.cc
|
||||||
@@ -31,6 +31,7 @@
|
@@ -31,6 +31,7 @@
|
||||||
@@ -260,7 +260,7 @@ index 6f268f5937bd5..2152a26496ceb 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::vector<base::FilePath>
|
std::vector<base::FilePath>
|
||||||
@@ -6623,10 +6635,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
|
@@ -6625,10 +6637,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
|
||||||
const auto now = base::TimeTicks::Now();
|
const auto now = base::TimeTicks::Now();
|
||||||
const auto timeout = GetKeepaliveTimerTimeout(context);
|
const auto timeout = GetKeepaliveTimerTimeout(context);
|
||||||
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
|
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
|
||||||
@@ -273,7 +273,7 @@ index 6f268f5937bd5..2152a26496ceb 100644
|
|||||||
FROM_HERE, keepalive_deadline_ - now,
|
FROM_HERE, keepalive_deadline_ - now,
|
||||||
base::BindOnce(
|
base::BindOnce(
|
||||||
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
|
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
|
||||||
@@ -6645,7 +6657,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
|
@@ -6647,7 +6659,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
|
||||||
--num_keepalive_requests_;
|
--num_keepalive_requests_;
|
||||||
if (num_keepalive_requests_ == 0) {
|
if (num_keepalive_requests_ == 0) {
|
||||||
DVLOG(1) << "Stopping the keepalive timer";
|
DVLOG(1) << "Stopping the keepalive timer";
|
||||||
@@ -283,7 +283,7 @@ index 6f268f5937bd5..2152a26496ceb 100644
|
|||||||
// This deletes the keep alive handle attached to the timer function and
|
// This deletes the keep alive handle attached to the timer function and
|
||||||
// unblock the shutdown sequence.
|
// unblock the shutdown sequence.
|
||||||
}
|
}
|
||||||
@@ -6777,7 +6790,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
|
@@ -6779,7 +6792,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
|
||||||
const auto now = base::TimeTicks::Now();
|
const auto now = base::TimeTicks::Now();
|
||||||
const auto then = keepalive_deadline_;
|
const auto then = keepalive_deadline_;
|
||||||
if (now < then) {
|
if (now < then) {
|
||||||
@@ -324,7 +324,7 @@ index cb93058f317e4..27215441c206c 100644
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
|
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
|
||||||
index 5b8477a22f9a0..e80b94c8822d5 100644
|
index bcdc111b9168a..a78f8696530d0 100644
|
||||||
--- chrome/browser/prefs/browser_prefs.cc
|
--- chrome/browser/prefs/browser_prefs.cc
|
||||||
+++ chrome/browser/prefs/browser_prefs.cc
|
+++ chrome/browser/prefs/browser_prefs.cc
|
||||||
@@ -11,6 +11,7 @@
|
@@ -11,6 +11,7 @@
|
||||||
|
@@ -179,7 +179,7 @@ index 195674a56169c..bee591ec8f2f3 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 60b252ed39816..a8d56495eb539 100644
|
index 092add8cc9349..791370d5b0558 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
|
||||||
@@ -306,11 +306,10 @@ using content::NativeWebKeyboardEvent;
|
@@ -306,11 +306,10 @@ using content::NativeWebKeyboardEvent;
|
||||||
@@ -247,7 +247,7 @@ index 60b252ed39816..a8d56495eb539 100644
|
|||||||
|
|
||||||
contents_separator_ =
|
contents_separator_ =
|
||||||
top_container_->AddChildView(std::make_unique<ContentsSeparator>());
|
top_container_->AddChildView(std::make_unique<ContentsSeparator>());
|
||||||
@@ -1842,6 +1858,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
|
@@ -1845,6 +1861,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
|
||||||
if (immersive_mode_controller_->IsEnabled())
|
if (immersive_mode_controller_->IsEnabled())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@@ -256,7 +256,7 @@ index 60b252ed39816..a8d56495eb539 100644
|
|||||||
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
|
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3204,7 +3222,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
|
@@ -3207,7 +3225,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
|
||||||
if (top_container()->parent() == this)
|
if (top_container()->parent() == this)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -266,7 +266,7 @@ index 60b252ed39816..a8d56495eb539 100644
|
|||||||
top_container()->DestroyLayer();
|
top_container()->DestroyLayer();
|
||||||
AddChildViewAt(top_container(), 0);
|
AddChildViewAt(top_container(), 0);
|
||||||
EnsureFocusOrder();
|
EnsureFocusOrder();
|
||||||
@@ -3749,8 +3768,10 @@ void BrowserView::Layout() {
|
@@ -3752,8 +3771,10 @@ void BrowserView::Layout() {
|
||||||
|
|
||||||
// TODO(jamescook): Why was this in the middle of layout code?
|
// TODO(jamescook): Why was this in the middle of layout code?
|
||||||
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
|
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
|
||||||
@@ -279,7 +279,7 @@ index 60b252ed39816..a8d56495eb539 100644
|
|||||||
|
|
||||||
// Some of the situations when the BrowserView is laid out are:
|
// Some of the situations when the BrowserView is laid out are:
|
||||||
// - Enter/exit immersive fullscreen mode.
|
// - Enter/exit immersive fullscreen mode.
|
||||||
@@ -3816,6 +3837,11 @@ void BrowserView::AddedToWidget() {
|
@@ -3819,6 +3840,11 @@ void BrowserView::AddedToWidget() {
|
||||||
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
|
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -291,7 +291,7 @@ index 60b252ed39816..a8d56495eb539 100644
|
|||||||
toolbar_->Init();
|
toolbar_->Init();
|
||||||
|
|
||||||
// TODO(pbos): Manage this either inside SidePanel or the corresponding button
|
// TODO(pbos): Manage this either inside SidePanel or the corresponding button
|
||||||
@@ -3876,13 +3902,9 @@ void BrowserView::AddedToWidget() {
|
@@ -3879,13 +3905,9 @@ void BrowserView::AddedToWidget() {
|
||||||
|
|
||||||
EnsureFocusOrder();
|
EnsureFocusOrder();
|
||||||
|
|
||||||
@@ -307,7 +307,7 @@ index 60b252ed39816..a8d56495eb539 100644
|
|||||||
using_native_frame_ = frame_->ShouldUseNativeFrame();
|
using_native_frame_ = frame_->ShouldUseNativeFrame();
|
||||||
|
|
||||||
MaybeInitializeWebUITabStrip();
|
MaybeInitializeWebUITabStrip();
|
||||||
@@ -4298,7 +4320,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
|
@@ -4301,7 +4323,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
|
||||||
// Undo our anti-jankiness hacks and force a re-layout.
|
// Undo our anti-jankiness hacks and force a re-layout.
|
||||||
in_process_fullscreen_ = false;
|
in_process_fullscreen_ = false;
|
||||||
ToolbarSizeChanged(false);
|
ToolbarSizeChanged(false);
|
||||||
@@ -317,7 +317,7 @@ index 60b252ed39816..a8d56495eb539 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
|
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
|
||||||
@@ -4640,6 +4663,8 @@ Profile* BrowserView::GetProfile() {
|
@@ -4643,6 +4666,8 @@ Profile* BrowserView::GetProfile() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void BrowserView::UpdateUIForTabFullscreen() {
|
void BrowserView::UpdateUIForTabFullscreen() {
|
||||||
@@ -326,7 +326,7 @@ index 60b252ed39816..a8d56495eb539 100644
|
|||||||
frame()->GetFrameView()->UpdateFullscreenTopUI();
|
frame()->GetFrameView()->UpdateFullscreenTopUI();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4662,6 +4687,8 @@ void BrowserView::HideDownloadShelf() {
|
@@ -4665,6 +4690,8 @@ void BrowserView::HideDownloadShelf() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool BrowserView::CanUserExitFullscreen() const {
|
bool BrowserView::CanUserExitFullscreen() const {
|
||||||
|
@@ -123,10 +123,10 @@ index 955126eed8968..cda1d55350d1e 100644
|
|||||||
|
|
||||||
void CookieManager::SetForceKeepSessionState() {
|
void CookieManager::SetForceKeepSessionState() {
|
||||||
diff --git services/network/network_context.cc services/network/network_context.cc
|
diff --git services/network/network_context.cc services/network/network_context.cc
|
||||||
index 757059958a1ea..6eeac7e1df7a6 100644
|
index f9acfee6133ec..dc978c3ff7156 100644
|
||||||
--- services/network/network_context.cc
|
--- services/network/network_context.cc
|
||||||
+++ services/network/network_context.cc
|
+++ services/network/network_context.cc
|
||||||
@@ -2385,17 +2385,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
@@ -2386,17 +2386,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
||||||
network_service_->network_quality_estimator());
|
network_service_->network_quality_estimator());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user