mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-01 11:57:04 +01:00
Update to Chromium version 96.0.4664.93
This commit is contained in:
parent
89c902b54d
commit
20e2617051
@ -7,6 +7,6 @@
|
||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/96.0.4664.55',
|
||||
'chromium_checkout': 'refs/tags/96.0.4664.93',
|
||||
'depot_tools_checkout': 'e023d44820'
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
|
||||
index 12c161774914c..c681383e3a947 100644
|
||||
index 648ddac00186a..cbf25d45ddeef 100644
|
||||
--- chrome/browser/ui/browser_command_controller.cc
|
||||
+++ chrome/browser/ui/browser_command_controller.cc
|
||||
@@ -351,8 +351,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
|
||||
|
@ -188,7 +188,7 @@ index 632ae86c6fd69..55b749ec12421 100644
|
||||
const std::vector<WebPluginInfo>& all_plugins);
|
||||
|
||||
diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
|
||||
index cb2e3a09dece9..f2f8694fcf6b5 100644
|
||||
index 193bfd1abc5f9..e5480792fdf56 100644
|
||||
--- content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -12366,6 +12366,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
|
||||
|
@ -1,5 +1,5 @@
|
||||
diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc
|
||||
index 516504c2ce442..60899c8e4f7bf 100644
|
||||
index da052d0533802..543057ccb86bf 100644
|
||||
--- components/embedder_support/user_agent_utils.cc
|
||||
+++ components/embedder_support/user_agent_utils.cc
|
||||
@@ -14,6 +14,7 @@
|
||||
|
@ -130,10 +130,10 @@ index 0cad4e1f9731b..94d9e189661af 100644
|
||||
// Set the view's active state (i.e., tint state of controls).
|
||||
virtual void SetActive(bool active) = 0;
|
||||
diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc
|
||||
index 3ef183213bc60..f6739d9d0817c 100644
|
||||
index c3b68a6421b09..c6511f90f295f 100644
|
||||
--- ui/platform_window/x11/x11_window.cc
|
||||
+++ ui/platform_window/x11/x11_window.cc
|
||||
@@ -1704,7 +1704,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
|
||||
@@ -1719,7 +1719,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
|
||||
req.border_pixel = 0;
|
||||
|
||||
bounds_in_pixels_ = SanitizeBounds(bounds);
|
||||
@ -157,7 +157,7 @@ index 7c352dd0d992d..516623a91b0e1 100644
|
||||
return host ? host->GetAcceleratedWidget() : nullptr;
|
||||
}
|
||||
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
|
||||
index 9c3dec8dfdd32..a523cceb5aed3 100644
|
||||
index 80d1019a5661b..48073dd9540e4 100644
|
||||
--- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
|
||||
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
|
||||
@@ -231,6 +231,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
|
||||
@ -189,7 +189,7 @@ index 9c3dec8dfdd32..a523cceb5aed3 100644
|
||||
properties->x11_extension_delegate = this;
|
||||
}
|
||||
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
|
||||
index 5ac7051b4a002..84b8ceb053e75 100644
|
||||
index 35caab2f2f06a..f372ad1e4c672 100644
|
||||
--- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
|
||||
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
|
||||
@@ -87,6 +87,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
|
||||
@ -210,7 +210,7 @@ index 5ac7051b4a002..84b8ceb053e75 100644
|
||||
|
||||
// PlatformWindowDelegate:
|
||||
void DispatchEvent(ui::Event* event) override;
|
||||
@@ -152,6 +156,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
|
||||
@@ -153,6 +157,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
|
||||
// destroyed.
|
||||
static std::list<gfx::AcceleratedWidget>* open_windows_;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user