mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 117.0.5938.8
This commit is contained in:
@ -7,5 +7,6 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/117.0.5938.0'
|
'chromium_checkout': 'refs/tags/117.0.5938.8',
|
||||||
|
'depot_tools_checkout': 'd9011c559b'
|
||||||
}
|
}
|
||||||
|
@ -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 d2207552c449f..1acd7fda6147d 100644
|
index ff490f2ffb3f5..76b9309cd20f2 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")
|
||||||
|
@ -44,7 +44,7 @@ index 16107572d4d0d..409e9ea870482 100644
|
|||||||
base::FeatureList::IsEnabled(
|
base::FeatureList::IsEnabled(
|
||||||
features::kPeriodicSyncPermissionForDefaultSearchEngine) &&
|
features::kPeriodicSyncPermissionForDefaultSearchEngine) &&
|
||||||
diff --git chrome/browser/permissions/chrome_permissions_client.cc chrome/browser/permissions/chrome_permissions_client.cc
|
diff --git chrome/browser/permissions/chrome_permissions_client.cc chrome/browser/permissions/chrome_permissions_client.cc
|
||||||
index 18e2eec8f64ff..d36b3206aeb63 100644
|
index 4d895c857260c..4dbfba9b15cae 100644
|
||||||
--- chrome/browser/permissions/chrome_permissions_client.cc
|
--- chrome/browser/permissions/chrome_permissions_client.cc
|
||||||
+++ chrome/browser/permissions/chrome_permissions_client.cc
|
+++ chrome/browser/permissions/chrome_permissions_client.cc
|
||||||
@@ -14,6 +14,7 @@
|
@@ -14,6 +14,7 @@
|
||||||
@ -67,7 +67,7 @@ index 18e2eec8f64ff..d36b3206aeb63 100644
|
|||||||
->GetScore(origin);
|
->GetScore(origin);
|
||||||
@@ -338,8 +342,10 @@ ChromePermissionsClient::CreatePermissionUiSelectors(
|
@@ -338,8 +342,10 @@ ChromePermissionsClient::CreatePermissionUiSelectors(
|
||||||
std::make_unique<ContextualNotificationPermissionUiSelector>());
|
std::make_unique<ContextualNotificationPermissionUiSelector>());
|
||||||
selectors.emplace_back(std::make_unique<PrefNotificationPermissionUiSelector>(
|
selectors.emplace_back(std::make_unique<PrefBasedQuietPermissionUiSelector>(
|
||||||
Profile::FromBrowserContext(browser_context)));
|
Profile::FromBrowserContext(browser_context)));
|
||||||
+ if (!cef::IsAlloyRuntimeEnabled()) {
|
+ if (!cef::IsAlloyRuntimeEnabled()) {
|
||||||
selectors.emplace_back(std::make_unique<PredictionBasedPermissionUiSelector>(
|
selectors.emplace_back(std::make_unique<PredictionBasedPermissionUiSelector>(
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn
|
diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn
|
||||||
index 2731d7c8912a9..91206a1aaca39 100644
|
index 32a8fcc0633d5..5c661dca845b9 100644
|
||||||
--- chrome/browser/safe_browsing/BUILD.gn
|
--- chrome/browser/safe_browsing/BUILD.gn
|
||||||
+++ chrome/browser/safe_browsing/BUILD.gn
|
+++ chrome/browser/safe_browsing/BUILD.gn
|
||||||
@@ -32,6 +32,7 @@ static_library("safe_browsing") {
|
@@ -32,6 +32,7 @@ static_library("safe_browsing") {
|
||||||
|
@ -240,7 +240,7 @@ index 711dc633bffc2..0fa2626150de2 100644
|
|||||||
std::unique_ptr<SelectionController> selection_controller_;
|
std::unique_ptr<SelectionController> selection_controller_;
|
||||||
|
|
||||||
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
|
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
|
||||||
index 3f81597c41a3e..b281eb2e7ac65 100644
|
index b3207f7f32500..05018a895dbaf 100644
|
||||||
--- ui/views/controls/menu/menu_controller.cc
|
--- ui/views/controls/menu/menu_controller.cc
|
||||||
+++ ui/views/controls/menu/menu_controller.cc
|
+++ ui/views/controls/menu/menu_controller.cc
|
||||||
@@ -564,7 +564,8 @@ void MenuController::Run(Widget* parent,
|
@@ -564,7 +564,8 @@ void MenuController::Run(Widget* parent,
|
||||||
@ -269,7 +269,7 @@ index 3f81597c41a3e..b281eb2e7ac65 100644
|
|||||||
if (item->GetParentMenuItem()) {
|
if (item->GetParentMenuItem()) {
|
||||||
params.context = item->GetWidget();
|
params.context = item->GetWidget();
|
||||||
// (crbug.com/1414232) The item to be open is a submenu. Make sure
|
// (crbug.com/1414232) The item to be open is a submenu. Make sure
|
||||||
@@ -2936,8 +2939,13 @@ MenuItemView* MenuController::FindInitialSelectableMenuItem(
|
@@ -2927,8 +2930,13 @@ MenuItemView* MenuController::FindInitialSelectableMenuItem(
|
||||||
|
|
||||||
void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
||||||
MenuItemView* item = pending_state_.item;
|
MenuItemView* item = pending_state_.item;
|
||||||
@ -284,7 +284,7 @@ index 3f81597c41a3e..b281eb2e7ac65 100644
|
|||||||
|
|
||||||
// Show the sub-menu.
|
// Show the sub-menu.
|
||||||
SetSelection(item, SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY);
|
SetSelection(item, SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY);
|
||||||
@@ -2957,8 +2965,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
@@ -2948,8 +2956,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
||||||
void MenuController::CloseSubmenu() {
|
void MenuController::CloseSubmenu() {
|
||||||
MenuItemView* item = state_.item;
|
MenuItemView* item = state_.item;
|
||||||
DCHECK(item);
|
DCHECK(item);
|
||||||
@ -676,7 +676,7 @@ index cf696fbcf0714..5c48fd7410b88 100644
|
|||||||
|
|
||||||
// Hides and cancels the menu.
|
// Hides and cancels the menu.
|
||||||
diff --git ui/views/controls/menu/menu_scroll_view_container.cc ui/views/controls/menu/menu_scroll_view_container.cc
|
diff --git ui/views/controls/menu/menu_scroll_view_container.cc ui/views/controls/menu/menu_scroll_view_container.cc
|
||||||
index a80ff0b70cab9..b37fed46d6cbd 100644
|
index af45e941c3ee9..9f32d109cc44b 100644
|
||||||
--- ui/views/controls/menu/menu_scroll_view_container.cc
|
--- ui/views/controls/menu/menu_scroll_view_container.cc
|
||||||
+++ ui/views/controls/menu/menu_scroll_view_container.cc
|
+++ ui/views/controls/menu/menu_scroll_view_container.cc
|
||||||
@@ -246,6 +246,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
|
@@ -246,6 +246,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
|
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
|
||||||
index 1caf3d1f032c4..d561f8aad9386 100644
|
index b5bb5e16086d4..3e86382c3ce93 100644
|
||||||
--- content/browser/web_contents/web_contents_impl.cc
|
--- content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ content/browser/web_contents/web_contents_impl.cc
|
+++ content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -3323,6 +3323,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
@@ -3322,6 +3322,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||||
params.main_frame_name, GetOpener(), primary_main_frame_policy,
|
params.main_frame_name, GetOpener(), primary_main_frame_policy,
|
||||||
base::UnguessableToken::Create());
|
base::UnguessableToken::Create());
|
||||||
|
|
||||||
@ -15,7 +15,7 @@ index 1caf3d1f032c4..d561f8aad9386 100644
|
|||||||
std::unique_ptr<WebContentsViewDelegate> delegate =
|
std::unique_ptr<WebContentsViewDelegate> delegate =
|
||||||
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
||||||
|
|
||||||
@@ -3333,6 +3339,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
@@ -3332,6 +3338,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||||
view_ = CreateWebContentsView(this, std::move(delegate),
|
view_ = CreateWebContentsView(this, std::move(delegate),
|
||||||
&render_view_host_delegate_view_);
|
&render_view_host_delegate_view_);
|
||||||
}
|
}
|
||||||
@ -23,7 +23,7 @@ index 1caf3d1f032c4..d561f8aad9386 100644
|
|||||||
CHECK(render_view_host_delegate_view_);
|
CHECK(render_view_host_delegate_view_);
|
||||||
CHECK(view_.get());
|
CHECK(view_.get());
|
||||||
|
|
||||||
@@ -3522,6 +3529,9 @@ void WebContentsImpl::RenderWidgetCreated(
|
@@ -3521,6 +3528,9 @@ void WebContentsImpl::RenderWidgetCreated(
|
||||||
OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated",
|
OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated",
|
||||||
"render_widget_host", render_widget_host);
|
"render_widget_host", render_widget_host);
|
||||||
created_widgets_.insert(render_widget_host);
|
created_widgets_.insert(render_widget_host);
|
||||||
@ -33,7 +33,7 @@ index 1caf3d1f032c4..d561f8aad9386 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
void WebContentsImpl::RenderWidgetDeleted(
|
void WebContentsImpl::RenderWidgetDeleted(
|
||||||
@@ -4274,6 +4284,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
@@ -4273,6 +4283,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||||
create_params.picture_in_picture_options = *(params.pip_options);
|
create_params.picture_in_picture_options = *(params.pip_options);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -49,7 +49,7 @@ index 1caf3d1f032c4..d561f8aad9386 100644
|
|||||||
// Check whether there is an available prerendered page for this navigation if
|
// Check whether there is an available prerendered page for this navigation if
|
||||||
// this is not for guest. If it exists, take WebContents pre-created for
|
// this is not for guest. If it exists, take WebContents pre-created for
|
||||||
// hosting the prerendered page instead of creating new WebContents.
|
// hosting the prerendered page instead of creating new WebContents.
|
||||||
@@ -8231,6 +8250,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
|
@@ -8230,6 +8249,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
|
||||||
// frames).
|
// frames).
|
||||||
SetFocusedFrameTree(&node->frame_tree());
|
SetFocusedFrameTree(&node->frame_tree());
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user