Update to Chromium version 105.0.5195.28

This commit is contained in:
Marshall Greenblatt
2022-08-11 13:55:45 +00:00
committed by Marshall Greenblatt
parent c9b8f03731
commit 5f52d3062e
10 changed files with 17 additions and 17 deletions

View File

@@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/105.0.5195.19', 'chromium_checkout': 'refs/tags/105.0.5195.28',
'depot_tools_checkout': '882f1e2a9a' 'depot_tools_checkout': '882f1e2a9a'
} }

View File

@@ -20,10 +20,10 @@ index d254be9911f39..76e28fe22d988 100644
// TODO(wjmaclean): We should update the ProcessLock comparison API // TODO(wjmaclean): We should update the ProcessLock comparison API
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 8dd5c0827940d..7487edfbc3827 100644 index d542f33b7c5ce..253ad9eb89fd7 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
@@ -6413,6 +6413,14 @@ std::pair<url::Origin, std::string> NavigationRequest:: @@ -6407,6 +6407,14 @@ std::pair<url::Origin, std::string> NavigationRequest::
origin_and_debug_info.second += ", error"; origin_and_debug_info.second += ", error";
} }
@@ -38,7 +38,7 @@ index 8dd5c0827940d..7487edfbc3827 100644
if (use_opaque_origin) { if (use_opaque_origin) {
origin_and_debug_info = origin_and_debug_info =
std::make_pair(origin_and_debug_info.first.DeriveNewOpaqueOrigin(), std::make_pair(origin_and_debug_info.first.DeriveNewOpaqueOrigin(),
@@ -6440,6 +6448,15 @@ std::pair<url::Origin, std::string> NavigationRequest:: @@ -6434,6 +6442,15 @@ std::pair<url::Origin, std::string> NavigationRequest::
GetOriginForURLLoaderFactoryWithoutFinalFrameHostWithDebugInfo( GetOriginForURLLoaderFactoryWithoutFinalFrameHostWithDebugInfo(
SandboxFlagsToCommit()); SandboxFlagsToCommit());

View File

@@ -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 ef07cd4a80a95..a30eab3a7cc52 100644 index a5d471c22e01c..1af6807f80c86 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")

View File

@@ -13,7 +13,7 @@ index 3285e422f76c1..5f35b91897b75 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 7612f95eed78e..e6da8824627b2 100644 index 3f4929cc5078c..b14d0244e88b1 100644
--- chrome/browser/ui/BUILD.gn --- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn
@@ -10,6 +10,7 @@ import("//build/config/compiler/compiler.gni") @@ -10,6 +10,7 @@ import("//build/config/compiler/compiler.gni")
@@ -43,7 +43,7 @@ index 7612f95eed78e..e6da8824627b2 100644
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
@@ -5528,6 +5534,7 @@ static_library("ui") { @@ -5531,6 +5537,7 @@ static_library("ui") {
if (enable_basic_printing) { if (enable_basic_printing) {
deps += [ deps += [
"//components/printing/browser", "//components/printing/browser",

View File

@@ -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 0dbc60e5bbd04..f8df1337b6c01 100644 index 7db1991010ce7..97811eec264bb 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
@@ -305,6 +305,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() { @@ -305,6 +305,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
@@ -55,7 +55,7 @@ index 0dbc60e5bbd04..f8df1337b6c01 100644
} }
Profile* RenderViewContextMenu::GetProfile() const { Profile* RenderViewContextMenu::GetProfile() const {
@@ -2981,6 +3006,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( @@ -2979,6 +3004,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
execute_plugin_action_callback_ = std::move(cb); execute_plugin_action_callback_ = std::move(cb);
} }

View File

@@ -1,5 +1,5 @@
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 37280287267b4..1ea055a4172c5 100644 index 5b7804cfaab89..201d7651e8dab 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
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@

View File

@@ -300,7 +300,7 @@ index 00a4d7e9818c9..3691b1e5d929f 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 b5c7f1d328446..50a676519853c 100644 index e6350b369e417..66b2266ba66e6 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 @@

View File

@@ -189,7 +189,7 @@ index 9bd586697dece..80ef1f08cb463 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 4d7516e88120d..fe0d815b0764a 100644 index 3467ee16afade..dad39710f892c 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
@@ -304,11 +304,10 @@ using content::NativeWebKeyboardEvent; @@ -304,11 +304,10 @@ using content::NativeWebKeyboardEvent;

View File

@@ -1,8 +1,8 @@
diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm
index f927e86d6735f..14d418a70422d 100644 index 63bf21851004f..0ccf29adc6b09 100644
--- base/message_loop/message_pump_mac.mm --- base/message_loop/message_pump_mac.mm
+++ base/message_loop/message_pump_mac.mm +++ base/message_loop/message_pump_mac.mm
@@ -807,7 +807,8 @@ void MessagePumpUIApplication::Detach() { @@ -806,7 +806,8 @@ void MessagePumpUIApplication::Detach() {
#else #else
ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() { ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
@@ -12,7 +12,7 @@ index f927e86d6735f..14d418a70422d 100644
DCHECK_EQ(kNSApplicationModalSafeModeMask, g_app_pump->GetModeMask()); DCHECK_EQ(kNSApplicationModalSafeModeMask, g_app_pump->GetModeMask());
// Pumping events in private runloop modes is known to interact badly with // Pumping events in private runloop modes is known to interact badly with
// app modal windows like NSAlert. // app modal windows like NSAlert.
@@ -817,7 +818,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() { @@ -816,7 +817,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
} }
ScopedPumpMessagesInPrivateModes::~ScopedPumpMessagesInPrivateModes() { ScopedPumpMessagesInPrivateModes::~ScopedPumpMessagesInPrivateModes() {

View File

@@ -133,10 +133,10 @@ index 855e5ff668236..2bf32cabf159b 100644
if (host_ && set_focus_on_mouse_down_or_key_event_) { if (host_ && set_focus_on_mouse_down_or_key_event_) {
set_focus_on_mouse_down_or_key_event_ = false; set_focus_on_mouse_down_or_key_event_ = false;
diff --git content/public/browser/render_widget_host_view.h content/public/browser/render_widget_host_view.h diff --git content/public/browser/render_widget_host_view.h content/public/browser/render_widget_host_view.h
index c7842775225c7..1ecb68d349bd1 100644 index 5d291f223feba..1999fbc5bf67a 100644
--- content/public/browser/render_widget_host_view.h --- content/public/browser/render_widget_host_view.h
+++ content/public/browser/render_widget_host_view.h +++ content/public/browser/render_widget_host_view.h
@@ -256,6 +256,14 @@ class CONTENT_EXPORT RenderWidgetHostView { @@ -257,6 +257,14 @@ class CONTENT_EXPORT RenderWidgetHostView {
// This must always return the same device scale factor as GetScreenInfo. // This must always return the same device scale factor as GetScreenInfo.
virtual float GetDeviceScaleFactor() const = 0; virtual float GetDeviceScaleFactor() const = 0;