mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-15 11:40:49 +01:00
Update to Chromium version 132.0.6834.46
This commit is contained in:
parent
fd43a8bf44
commit
20f520fb28
@ -7,5 +7,5 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/132.0.6834.32'
|
'chromium_checkout': 'refs/tags/132.0.6834.46'
|
||||||
}
|
}
|
||||||
|
@ -34,10 +34,10 @@ index da9c9d7c0f458..a97fc4e019775 100644
|
|||||||
|
|
||||||
WebViewGuestDelegate* ChromeExtensionsAPIClient::CreateWebViewGuestDelegate(
|
WebViewGuestDelegate* ChromeExtensionsAPIClient::CreateWebViewGuestDelegate(
|
||||||
diff --git chrome/browser/extensions/api/tabs/tabs_api.cc chrome/browser/extensions/api/tabs/tabs_api.cc
|
diff --git chrome/browser/extensions/api/tabs/tabs_api.cc chrome/browser/extensions/api/tabs/tabs_api.cc
|
||||||
index f4fc8d090230a..0de22b5e1c0f1 100644
|
index 615e06c5e4086..826c4acfa32a7 100644
|
||||||
--- chrome/browser/extensions/api/tabs/tabs_api.cc
|
--- chrome/browser/extensions/api/tabs/tabs_api.cc
|
||||||
+++ chrome/browser/extensions/api/tabs/tabs_api.cc
|
+++ chrome/browser/extensions/api/tabs/tabs_api.cc
|
||||||
@@ -1646,7 +1646,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
|
@@ -1652,7 +1652,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
|
||||||
return RespondNow(Error(ExtensionTabUtil::kTabStripNotEditableError));
|
return RespondNow(Error(ExtensionTabUtil::kTabStripNotEditableError));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -46,7 +46,7 @@ index f4fc8d090230a..0de22b5e1c0f1 100644
|
|||||||
tab_strip->ActivateTabAt(tab_index);
|
tab_strip->ActivateTabAt(tab_index);
|
||||||
DCHECK_EQ(contents, tab_strip->GetActiveWebContents());
|
DCHECK_EQ(contents, tab_strip->GetActiveWebContents());
|
||||||
}
|
}
|
||||||
@@ -1660,7 +1660,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
|
@@ -1666,7 +1666,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool highlighted = *params->update_properties.highlighted;
|
bool highlighted = *params->update_properties.highlighted;
|
||||||
@ -55,7 +55,7 @@ index f4fc8d090230a..0de22b5e1c0f1 100644
|
|||||||
tab_strip->ToggleSelectionAt(tab_index);
|
tab_strip->ToggleSelectionAt(tab_index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1672,7 +1672,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
|
@@ -1678,7 +1678,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
|
||||||
kCannotUpdateMuteCaptured, base::NumberToString(tab_id))));
|
kCannotUpdateMuteCaptured, base::NumberToString(tab_id))));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -64,7 +64,7 @@ index f4fc8d090230a..0de22b5e1c0f1 100644
|
|||||||
int opener_id = *params->update_properties.opener_tab_id;
|
int opener_id = *params->update_properties.opener_tab_id;
|
||||||
WebContents* opener_contents = nullptr;
|
WebContents* opener_contents = nullptr;
|
||||||
if (opener_id == tab_id) {
|
if (opener_id == tab_id) {
|
||||||
@@ -1707,7 +1707,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
|
@@ -1713,7 +1713,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
|
||||||
->SetAutoDiscardable(state);
|
->SetAutoDiscardable(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -73,7 +73,7 @@ index f4fc8d090230a..0de22b5e1c0f1 100644
|
|||||||
// Bug fix for crbug.com/1197888. Don't let the extension update the tab if
|
// Bug fix for crbug.com/1197888. Don't let the extension update the tab if
|
||||||
// the user is dragging tabs.
|
// the user is dragging tabs.
|
||||||
if (!ExtensionTabUtil::IsTabStripEditable()) {
|
if (!ExtensionTabUtil::IsTabStripEditable()) {
|
||||||
@@ -1728,7 +1728,8 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
|
@@ -1734,7 +1734,8 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
|
||||||
// Navigate the tab to a new location if the url is different.
|
// Navigate the tab to a new location if the url is different.
|
||||||
if (params->update_properties.url) {
|
if (params->update_properties.url) {
|
||||||
std::string updated_url = *params->update_properties.url;
|
std::string updated_url = *params->update_properties.url;
|
||||||
@ -83,7 +83,7 @@ index f4fc8d090230a..0de22b5e1c0f1 100644
|
|||||||
!IsURLAllowedInIncognito(GURL(updated_url))) {
|
!IsURLAllowedInIncognito(GURL(updated_url))) {
|
||||||
return RespondNow(Error(ErrorUtils::FormatErrorMessage(
|
return RespondNow(Error(ErrorUtils::FormatErrorMessage(
|
||||||
tabs_constants::kURLsNotAllowedInIncognitoError, updated_url)));
|
tabs_constants::kURLsNotAllowedInIncognitoError, updated_url)));
|
||||||
@@ -1743,7 +1744,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
|
@@ -1749,7 +1750,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
|
||||||
return RespondNow(Error(std::move(error)));
|
return RespondNow(Error(std::move(error)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -93,7 +93,7 @@ index f4fc8d090230a..0de22b5e1c0f1 100644
|
|||||||
current_url, updated_url, js_callstack());
|
current_url, updated_url, js_callstack());
|
||||||
}
|
}
|
||||||
diff --git chrome/browser/extensions/extension_tab_util.cc chrome/browser/extensions/extension_tab_util.cc
|
diff --git chrome/browser/extensions/extension_tab_util.cc chrome/browser/extensions/extension_tab_util.cc
|
||||||
index 4d2c067a06041..6943da2585d22 100644
|
index d5de30544c734..b7a82553471a0 100644
|
||||||
--- chrome/browser/extensions/extension_tab_util.cc
|
--- chrome/browser/extensions/extension_tab_util.cc
|
||||||
+++ chrome/browser/extensions/extension_tab_util.cc
|
+++ chrome/browser/extensions/extension_tab_util.cc
|
||||||
@@ -20,6 +20,7 @@
|
@@ -20,6 +20,7 @@
|
||||||
@ -115,7 +115,7 @@ index 4d2c067a06041..6943da2585d22 100644
|
|||||||
using content::NavigationEntry;
|
using content::NavigationEntry;
|
||||||
using content::WebContents;
|
using content::WebContents;
|
||||||
using extensions::mojom::APIPermissionID;
|
using extensions::mojom::APIPermissionID;
|
||||||
@@ -714,6 +719,14 @@ bool ExtensionTabUtil::GetTabById(int tab_id,
|
@@ -720,6 +725,14 @@ bool ExtensionTabUtil::GetTabById(int tab_id,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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 95b2ad64c8336..bad7c4bcbe695 100644
|
index c77216fb7f109..c390b90c5bea7 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
|
||||||
@@ -9189,6 +9189,16 @@ void RenderFrameHostImpl::CreateNewWindow(
|
@@ -9169,6 +9169,16 @@ void RenderFrameHostImpl::CreateNewWindow(
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -19,7 +19,7 @@ index 95b2ad64c8336..bad7c4bcbe695 100644
|
|||||||
// Otherwise, consume user activation before we proceed. In particular, it is
|
// Otherwise, consume user activation before we proceed. In particular, it is
|
||||||
// important to do this before we return from the |opener_suppressed| case
|
// important to do this before we return from the |opener_suppressed| case
|
||||||
// below.
|
// below.
|
||||||
@@ -11567,6 +11577,7 @@ void RenderFrameHostImpl::CommitNavigation(
|
@@ -11547,6 +11557,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 &&
|
||||||
|
@ -80,10 +80,10 @@ index 06a85c11e6604..c1d0bcfac60d4 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 cae84c27a26d6..ce496fd4f97ea 100644
|
index f03bc67fbd156..998648ac775ec 100644
|
||||||
--- services/network/network_context.cc
|
--- services/network/network_context.cc
|
||||||
+++ services/network/network_context.cc
|
+++ services/network/network_context.cc
|
||||||
@@ -2640,17 +2640,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
@@ -2643,17 +2643,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
||||||
network_service_->network_quality_estimator());
|
network_service_->network_quality_estimator());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user