mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 136.0.7103.33
This commit is contained in:
@@ -7,5 +7,5 @@
|
||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/136.0.7103.17'
|
||||
'chromium_checkout': 'refs/tags/136.0.7103.33'
|
||||
}
|
||||
|
@@ -208,7 +208,7 @@ CEF_EXPORT int cef_get_min_log_level() {
|
||||
}
|
||||
|
||||
CEF_EXPORT int cef_get_vlog_level(const char* file_start, size_t N) {
|
||||
return logging::GetVlogLevelHelper(std::string_view(file_start, N));
|
||||
return logging::GetVlogLevelHelper(file_start, N);
|
||||
}
|
||||
|
||||
CEF_EXPORT void cef_log(const char* file,
|
||||
|
@@ -224,10 +224,6 @@ patches = [
|
||||
# See related documentation in
|
||||
# libcef/browser/chrome/views/chrome_browser_frame.h.
|
||||
# https://github.com/chromiumembedded/cef/issues/2969
|
||||
#
|
||||
# Properly disable 3-dot > "Open glic" menu item to avoid crash in
|
||||
# GlicKeyedService::ToggleUI.
|
||||
# https://issues.chromium.org/issues/408163318
|
||||
'name': 'chrome_runtime_views',
|
||||
},
|
||||
{
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git base/BUILD.gn base/BUILD.gn
|
||||
index 50893c5653a42..75dd03c3df9a8 100644
|
||||
index 57a6af0061615..d18a8a8a4559d 100644
|
||||
--- base/BUILD.gn
|
||||
+++ base/BUILD.gn
|
||||
@@ -41,6 +41,7 @@ import("//build/rust/rust_static_library.gni")
|
||||
@@ -10,7 +10,7 @@ index 50893c5653a42..75dd03c3df9a8 100644
|
||||
import("//testing/libfuzzer/fuzzer_test.gni")
|
||||
import("//testing/test.gni")
|
||||
|
||||
@@ -1518,7 +1519,13 @@ component("base") {
|
||||
@@ -1519,7 +1520,13 @@ component("base") {
|
||||
"hash/md5_constexpr_internal.h",
|
||||
"hash/sha1.h",
|
||||
]
|
||||
@@ -25,7 +25,7 @@ index 50893c5653a42..75dd03c3df9a8 100644
|
||||
sources += [
|
||||
"hash/md5_nacl.cc",
|
||||
"hash/md5_nacl.h",
|
||||
@@ -1968,6 +1975,12 @@ component("base") {
|
||||
@@ -1969,6 +1976,12 @@ component("base") {
|
||||
defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
|
||||
}
|
||||
|
||||
@@ -141,7 +141,7 @@ index 48a9b893d3f9d..a5a2223b2a0fa 100644
|
||||
#else
|
||||
return base::FeatureList::IsEnabled(base::features::kUseRustJsonParser);
|
||||
diff --git base/logging.cc base/logging.cc
|
||||
index 22aa478001fb5..e799d8da52589 100644
|
||||
index 26ba1a286e451..99b2ce6feb274 100644
|
||||
--- base/logging.cc
|
||||
+++ base/logging.cc
|
||||
@@ -51,6 +51,7 @@
|
||||
@@ -152,7 +152,7 @@ index 22aa478001fb5..e799d8da52589 100644
|
||||
#include "third_party/abseil-cpp/absl/base/internal/raw_logging.h"
|
||||
#include "third_party/abseil-cpp/absl/cleanup/cleanup.h"
|
||||
|
||||
@@ -538,7 +539,7 @@ bool BaseInitLoggingImpl(const LoggingSettings& settings) {
|
||||
@@ -530,7 +531,7 @@ bool BaseInitLoggingImpl(const LoggingSettings& settings) {
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||
index 2af2794b353d8..3bae40ac0fe9d 100644
|
||||
index a3623400c3548..f7fe8e6c6fc66 100644
|
||||
--- chrome/browser/BUILD.gn
|
||||
+++ chrome/browser/BUILD.gn
|
||||
@@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
|
||||
|
@@ -83,7 +83,7 @@ index 8e0717f34f37f..df852d4b2e69f 100644
|
||||
OverrideAndSyncDevToolsRendererPrefs();
|
||||
}
|
||||
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
|
||||
index 7151a2ff7d5f9..74ea94c6908e8 100644
|
||||
index ba0cba1897577..82bb0ac855dc2 100644
|
||||
--- chrome/browser/ui/BUILD.gn
|
||||
+++ chrome/browser/ui/BUILD.gn
|
||||
@@ -7,6 +7,7 @@ import("//build/config/compiler/compiler.gni")
|
||||
@@ -113,7 +113,7 @@ index 7151a2ff7d5f9..74ea94c6908e8 100644
|
||||
"//chrome:resources",
|
||||
"//chrome:strings",
|
||||
"//chrome/app:chrome_dll_resources",
|
||||
@@ -703,6 +709,13 @@ static_library("ui") {
|
||||
@@ -704,6 +710,13 @@ static_library("ui") {
|
||||
deps += [ "//components/plus_addresses/resources:vector_icons" ]
|
||||
}
|
||||
|
||||
@@ -127,7 +127,7 @@ index 7151a2ff7d5f9..74ea94c6908e8 100644
|
||||
# TODO(crbug.com/41437292): Remove this circular dependency.
|
||||
# Any circular includes must depend on the target "//chrome/browser:browser_public_dependencies".
|
||||
# These are all-platform circular includes.
|
||||
@@ -5503,6 +5516,7 @@ static_library("ui") {
|
||||
@@ -5504,6 +5517,7 @@ static_library("ui") {
|
||||
if (enable_printing) {
|
||||
deps += [
|
||||
"//components/printing/browser",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn
|
||||
index 50c6735fe6074..749fb1ff46146 100644
|
||||
index 093e7502bd54d..fe30827b95425 100644
|
||||
--- chrome/browser/safe_browsing/BUILD.gn
|
||||
+++ chrome/browser/safe_browsing/BUILD.gn
|
||||
@@ -37,6 +37,7 @@ static_library("safe_browsing") {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
|
||||
index 99056d7aff8c7..2741155416953 100644
|
||||
index 3fcd374a0223f..37a4d0a0b2fe4 100644
|
||||
--- chrome/browser/ui/browser_command_controller.cc
|
||||
+++ chrome/browser/ui/browser_command_controller.cc
|
||||
@@ -441,6 +441,7 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
|
||||
@@ -40,22 +40,6 @@ index 99056d7aff8c7..2741155416953 100644
|
||||
}
|
||||
|
||||
void BrowserCommandController::InitCommandState() {
|
||||
@@ -1523,11 +1533,12 @@ void BrowserCommandController::InitCommandState() {
|
||||
#if BUILDFLAG(ENABLE_GLIC)
|
||||
// Glic commands.
|
||||
command_updater_.UpdateCommandEnabled(
|
||||
- IDC_GLIC_TOGGLE_PIN, glic::GlicEnabling::IsProfileEligible(profile()));
|
||||
+ IDC_GLIC_TOGGLE_PIN, glic::GlicEnabling::IsEnabledForProfile(profile()));
|
||||
command_updater_.UpdateCommandEnabled(
|
||||
- IDC_OPEN_GLIC, glic::GlicEnabling::IsProfileEligible(profile()));
|
||||
+ IDC_OPEN_GLIC, glic::GlicEnabling::IsEnabledForProfile(profile()));
|
||||
command_updater_.UpdateCommandEnabled(
|
||||
- IDC_GLIC_TOGGLE_FOCUS, glic::GlicEnabling::IsProfileEligible(profile()));
|
||||
+ IDC_GLIC_TOGGLE_FOCUS,
|
||||
+ glic::GlicEnabling::IsEnabledForProfile(profile()));
|
||||
#endif
|
||||
|
||||
// Initialize other commands whose state changes based on various conditions.
|
||||
diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc
|
||||
index 3dc212eb62ae8..4191ffa5f52a8 100644
|
||||
--- chrome/browser/ui/toolbar/app_menu_model.cc
|
||||
@@ -776,7 +760,7 @@ index 7a2f7b5d43762..ef55ed7e6cd43 100644
|
||||
// Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate
|
||||
// interface to keep these two classes decoupled and testable.
|
||||
diff --git chrome/browser/ui/views/frame/browser_view_layout.cc chrome/browser/ui/views/frame/browser_view_layout.cc
|
||||
index 7cfadb577326f..5d97370b499c7 100644
|
||||
index 88b786fa68fa5..3d1136f57be04 100644
|
||||
--- chrome/browser/ui/views/frame/browser_view_layout.cc
|
||||
+++ chrome/browser/ui/views/frame/browser_view_layout.cc
|
||||
@@ -53,6 +53,10 @@
|
||||
@@ -1036,7 +1020,7 @@ index c0d519f033713..6df5e004f43d2 100644
|
||||
case PageActionIconType::kPaymentsOfferNotification:
|
||||
add_page_action_icon(
|
||||
diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
|
||||
index 9454a78b72cc3..e3aab475b2465 100644
|
||||
index ff62541aa946d..3c3258e36ad3f 100644
|
||||
--- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
|
||||
+++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
|
||||
@@ -698,29 +698,41 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
|
||||
@@ -1082,7 +1066,7 @@ index 9454a78b72cc3..e3aab475b2465 100644
|
||||
}
|
||||
|
||||
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
index af3d65c89950b..f04c923a37be9 100644
|
||||
index 62da5fee718a1..8a4a5a62d640f 100644
|
||||
--- chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
@@ -185,7 +185,7 @@ class TabstripLikeBackground : public views::Background {
|
||||
@@ -1144,7 +1128,7 @@ index af3d65c89950b..f04c923a37be9 100644
|
||||
// Make sure the toolbar shows by default.
|
||||
size_animation_.Reset(1);
|
||||
|
||||
@@ -350,7 +366,8 @@ void ToolbarView::Init() {
|
||||
@@ -354,7 +370,8 @@ void ToolbarView::Init() {
|
||||
}
|
||||
std::unique_ptr<media_router::CastToolbarButton> cast;
|
||||
if (!base::FeatureList::IsEnabled(features::kPinnedCastButton)) {
|
||||
@@ -1154,7 +1138,7 @@ index af3d65c89950b..f04c923a37be9 100644
|
||||
cast = media_router::CastToolbarButton::Create(browser_);
|
||||
}
|
||||
}
|
||||
@@ -814,7 +831,8 @@ void ToolbarView::Layout(PassKey) {
|
||||
@@ -818,7 +835,8 @@ void ToolbarView::Layout(PassKey) {
|
||||
|
||||
if (display_mode_ == DisplayMode::NORMAL) {
|
||||
LayoutCommon();
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git ui/gtk/gtk_ui.cc ui/gtk/gtk_ui.cc
|
||||
index aba9091667b74..6921c64b60cad 100644
|
||||
index c761f9de266f6..ca4c0b705f2ad 100644
|
||||
--- ui/gtk/gtk_ui.cc
|
||||
+++ ui/gtk/gtk_ui.cc
|
||||
@@ -31,6 +31,7 @@
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
|
||||
index 7d8baae182adb..a9b5cb4c8b43d 100644
|
||||
index d905ce52d71b2..167a1a40fab3c 100644
|
||||
--- content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -9654,6 +9654,16 @@ void RenderFrameHostImpl::CreateNewWindow(
|
||||
|
@@ -26,7 +26,7 @@ index d6598893c06a6..0b1adcf999dac 100644
|
||||
if (cpu != 'x64'):
|
||||
# x64 is default target CPU thus any other CPU requires a target set
|
||||
diff --git build/vs_toolchain.py build/vs_toolchain.py
|
||||
index e0f89a555492c..0f8dc1dbb3525 100755
|
||||
index 61b3229502571..6bb14f7cf7e28 100755
|
||||
--- build/vs_toolchain.py
|
||||
+++ build/vs_toolchain.py
|
||||
@@ -136,9 +136,16 @@ def SetEnvironmentAndGetRuntimeDllDirs():
|
||||
|
@@ -127,7 +127,7 @@ index 8014bb16d8108..bc8e80e9eb9c3 100644
|
||||
base::FilePath transport_security_persister_file_name;
|
||||
if (GetFullDataFilePath(params_->file_paths,
|
||||
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
|
||||
index a9c82bcf9a4eb..61afe5bf737ce 100644
|
||||
index feed273c8c77d..ca999f5ed75d5 100644
|
||||
--- services/network/public/mojom/network_context.mojom
|
||||
+++ services/network/public/mojom/network_context.mojom
|
||||
@@ -361,6 +361,9 @@ struct NetworkContextParams {
|
||||
|
@@ -500,10 +500,10 @@ index 2ee5e4b4673f4..62a6776b27ad9 100644
|
||||
// the implementation of ::ShowCursor() is based on a counter, so making this
|
||||
// member static ensures that ::ShowCursor() is always called exactly once
|
||||
diff --git ui/views/widget/native_widget_mac.mm ui/views/widget/native_widget_mac.mm
|
||||
index ac690f3f12836..9457f936fd96d 100644
|
||||
index 4aa1343bd447f..f0e7cf3988e9d 100644
|
||||
--- ui/views/widget/native_widget_mac.mm
|
||||
+++ ui/views/widget/native_widget_mac.mm
|
||||
@@ -718,6 +718,7 @@ void NativeWidgetMac::Show(ui::mojom::WindowShowState show_state,
|
||||
@@ -719,6 +719,7 @@ void NativeWidgetMac::Show(ui::mojom::WindowShowState show_state,
|
||||
break;
|
||||
case ui::mojom::WindowShowState::kMaximized:
|
||||
case ui::mojom::WindowShowState::kFullscreen:
|
||||
@@ -593,7 +593,7 @@ index b294759923814..719686b4db165 100644
|
||||
// focus when the window is restored.
|
||||
if (v) {
|
||||
diff --git ui/views/widget/widget.h ui/views/widget/widget.h
|
||||
index 4d1c7d95c338b..f2b45e10dc831 100644
|
||||
index 44c9248daecd6..db3ef6ebdf91a 100644
|
||||
--- ui/views/widget/widget.h
|
||||
+++ ui/views/widget/widget.h
|
||||
@@ -437,6 +437,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
|
||||
|
Reference in New Issue
Block a user