Update to Chromium version 124.0.6367.60
This commit is contained in:
parent
e461d8f247
commit
ccc63c9e55
|
@ -7,6 +7,6 @@
|
||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/124.0.6367.29',
|
'chromium_checkout': 'refs/tags/124.0.6367.60',
|
||||||
'depot_tools_checkout': 'a46e95ea68'
|
'depot_tools_checkout': 'a46e95ea68'
|
||||||
}
|
}
|
||||||
|
|
|
@ -152,10 +152,10 @@ index 3594bc7a25c95..198eed029d65d 100644
|
||||||
base::BindRepeating(&RenderThreadImpl::OnRendererInterfaceReceiver,
|
base::BindRepeating(&RenderThreadImpl::OnRendererInterfaceReceiver,
|
||||||
base::Unretained(this)));
|
base::Unretained(this)));
|
||||||
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
|
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
|
||||||
index 033169bbdd94d..f8bd867f76eba 100644
|
index 81b4ff933b5d9..859ad94d4c224 100644
|
||||||
--- content/renderer/renderer_blink_platform_impl.cc
|
--- content/renderer/renderer_blink_platform_impl.cc
|
||||||
+++ content/renderer/renderer_blink_platform_impl.cc
|
+++ content/renderer/renderer_blink_platform_impl.cc
|
||||||
@@ -1009,6 +1009,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
|
@@ -1001,6 +1001,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -172,10 +172,10 @@ index 033169bbdd94d..f8bd867f76eba 100644
|
||||||
RendererBlinkPlatformImpl::CreateWebV8ValueConverter() {
|
RendererBlinkPlatformImpl::CreateWebV8ValueConverter() {
|
||||||
return std::make_unique<V8ValueConverterImpl>();
|
return std::make_unique<V8ValueConverterImpl>();
|
||||||
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
|
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
|
||||||
index 89fd49fe34afa..98f9b71b7c259 100644
|
index d5ab3967f21cc..b6494070f6840 100644
|
||||||
--- content/renderer/renderer_blink_platform_impl.h
|
--- content/renderer/renderer_blink_platform_impl.h
|
||||||
+++ content/renderer/renderer_blink_platform_impl.h
|
+++ content/renderer/renderer_blink_platform_impl.h
|
||||||
@@ -237,6 +237,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
@@ -236,6 +236,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
||||||
InertAndMinimumIntervalOfUserLevelMemoryPressureSignal() override;
|
InertAndMinimumIntervalOfUserLevelMemoryPressureSignal() override;
|
||||||
#endif // BUILDFLAG(IS_ANDROID)
|
#endif // BUILDFLAG(IS_ANDROID)
|
||||||
|
|
||||||
|
|
|
@ -262,10 +262,10 @@ index a604df7a5ea6a..618fbde10a65c 100644
|
||||||
|
|
||||||
} // namespace crash_reporter
|
} // namespace crash_reporter
|
||||||
diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc
|
diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc
|
||||||
index a18afed5b55c1..fabb36a299cd9 100644
|
index 7378f6f7b0414..bd07125847234 100644
|
||||||
--- components/crash/core/app/crashpad.cc
|
--- components/crash/core/app/crashpad.cc
|
||||||
+++ components/crash/core/app/crashpad.cc
|
+++ components/crash/core/app/crashpad.cc
|
||||||
@@ -129,7 +129,8 @@ bool InitializeCrashpadImpl(bool initial_client,
|
@@ -136,7 +136,8 @@ bool InitializeCrashpadImpl(bool initial_client,
|
||||||
// fallback. Forwarding is turned off for debug-mode builds even for the
|
// fallback. Forwarding is turned off for debug-mode builds even for the
|
||||||
// browser process, because the system's crash reporter can take a very long
|
// browser process, because the system's crash reporter can take a very long
|
||||||
// time to chew on symbols.
|
// time to chew on symbols.
|
||||||
|
|
|
@ -3,9 +3,9 @@ index 5649f120ccefa..c6c1a676a24cf 100644
|
||||||
--- content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
--- content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
||||||
+++ content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
+++ content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
||||||
@@ -164,6 +164,13 @@ void ExtractUnderlines(NSAttributedString* string,
|
@@ -164,6 +164,13 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||||
|
|
||||||
// RenderWidgetHostViewCocoa ---------------------------------------------------
|
// RenderWidgetHostViewCocoa ---------------------------------------------------
|
||||||
|
|
||||||
+@interface NSWindow (CefCustomMethods)
|
+@interface NSWindow (CefCustomMethods)
|
||||||
+- (int)acceptsFirstMouse;
|
+- (int)acceptsFirstMouse;
|
||||||
+@end
|
+@end
|
||||||
|
@ -15,10 +15,10 @@ index 5649f120ccefa..c6c1a676a24cf 100644
|
||||||
+
|
+
|
||||||
// Private methods:
|
// Private methods:
|
||||||
@interface RenderWidgetHostViewCocoa ()
|
@interface RenderWidgetHostViewCocoa ()
|
||||||
|
|
||||||
@@ -744,6 +751,14 @@ void ExtractUnderlines(NSAttributedString* string,
|
@@ -744,6 +751,14 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||||
}
|
}
|
||||||
|
|
||||||
- (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
|
- (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
|
||||||
+ if ([self.window respondsToSelector:@selector(acceptsFirstMouse)]) {
|
+ if ([self.window respondsToSelector:@selector(acceptsFirstMouse)]) {
|
||||||
+ const auto mode = [self.window acceptsFirstMouse];
|
+ const auto mode = [self.window acceptsFirstMouse];
|
||||||
|
@ -30,4 +30,4 @@ index 5649f120ccefa..c6c1a676a24cf 100644
|
||||||
+ }
|
+ }
|
||||||
return [self acceptsMouseEventsWhenInactive];
|
return [self acceptsMouseEventsWhenInactive];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
|
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||||
index e065ce0700764..9c68e224c050f 100644
|
index 58310ec382696..1078675eead1a 100644
|
||||||
--- content/browser/renderer_host/render_widget_host_view_aura.cc
|
--- content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||||
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
|
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||||
@@ -6,6 +6,7 @@
|
@@ -6,6 +6,7 @@
|
||||||
|
@ -18,7 +18,7 @@ index e065ce0700764..9c68e224c050f 100644
|
||||||
#include "content/public/common/page_visibility_state.h"
|
#include "content/public/common/page_visibility_state.h"
|
||||||
#include "services/service_manager/public/cpp/interface_provider.h"
|
#include "services/service_manager/public/cpp/interface_provider.h"
|
||||||
#include "third_party/blink/public/common/input/web_input_event.h"
|
#include "third_party/blink/public/common/input/web_input_event.h"
|
||||||
@@ -724,10 +726,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
|
@@ -723,10 +725,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
|
||||||
void RenderWidgetHostViewAura::UpdateBackgroundColor() {
|
void RenderWidgetHostViewAura::UpdateBackgroundColor() {
|
||||||
DCHECK(GetBackgroundColor());
|
DCHECK(GetBackgroundColor());
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ index e065ce0700764..9c68e224c050f 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
#if BUILDFLAG(IS_WIN)
|
#if BUILDFLAG(IS_WIN)
|
||||||
@@ -2352,6 +2356,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
|
@@ -2351,6 +2355,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
|
||||||
window_->layer()->SetColor(GetBackgroundColor() ? *GetBackgroundColor()
|
window_->layer()->SetColor(GetBackgroundColor() ? *GetBackgroundColor()
|
||||||
: SK_ColorWHITE);
|
: SK_ColorWHITE);
|
||||||
UpdateFrameSinkIdRegistration();
|
UpdateFrameSinkIdRegistration();
|
||||||
|
|
|
@ -150,10 +150,10 @@ index 796ae2688436e..37a3406790210 100644
|
||||||
|
|
||||||
TRACE_EVENT_ASYNC_BEGIN0("viz", "SoftwareOutputDeviceWinProxy::Draw", this);
|
TRACE_EVENT_ASYNC_BEGIN0("viz", "SoftwareOutputDeviceWinProxy::Draw", this);
|
||||||
diff --git content/browser/compositor/viz_process_transport_factory.cc content/browser/compositor/viz_process_transport_factory.cc
|
diff --git content/browser/compositor/viz_process_transport_factory.cc content/browser/compositor/viz_process_transport_factory.cc
|
||||||
index 65401cc364494..7a1c98588ac5c 100644
|
index 3634618a687b3..3a568135f6a0f 100644
|
||||||
--- content/browser/compositor/viz_process_transport_factory.cc
|
--- content/browser/compositor/viz_process_transport_factory.cc
|
||||||
+++ content/browser/compositor/viz_process_transport_factory.cc
|
+++ content/browser/compositor/viz_process_transport_factory.cc
|
||||||
@@ -383,8 +383,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
|
@@ -385,8 +385,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
|
||||||
mojo::AssociatedRemote<viz::mojom::DisplayPrivate> display_private;
|
mojo::AssociatedRemote<viz::mojom::DisplayPrivate> display_private;
|
||||||
root_params->display_private =
|
root_params->display_private =
|
||||||
display_private.BindNewEndpointAndPassReceiver();
|
display_private.BindNewEndpointAndPassReceiver();
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
|
diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
|
||||||
index 165bd4eae9e1b..dd4d7af0a561d 100644
|
index 38c079e1f9c37..6a029e131a870 100644
|
||||||
--- third_party/blink/public/platform/platform.h
|
--- third_party/blink/public/platform/platform.h
|
||||||
+++ third_party/blink/public/platform/platform.h
|
+++ third_party/blink/public/platform/platform.h
|
||||||
@@ -784,6 +784,11 @@ class BLINK_PLATFORM_EXPORT Platform {
|
@@ -780,6 +780,11 @@ class BLINK_PLATFORM_EXPORT Platform {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue